Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #218

Merged
merged 32 commits into from
Mar 10, 2024
Merged

Dev #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c9c567d
- update: fixed issues with E.016 numbers
sherlockwisdom Feb 26, 2024
a926964
- update: fixed issues with E.016 numbers
sherlockwisdom Feb 26, 2024
c756811
Merge branch 'staging' into dev
sherlockwisdom Feb 26, 2024
6b1ec23
- update: changed method of retrieving threads. Should work for phone…
sherlockwisdom Feb 27, 2024
3a80c4e
- update: changed method of retrieving threads. Should work for phone…
sherlockwisdom Feb 27, 2024
40aaa93
- update: changed method of retrieving threads. Should work for phone…
sherlockwisdom Feb 27, 2024
463dbd8
- update: preparing Gateway clients to have the ready counts
sherlockwisdom Feb 28, 2024
66f94f0
- update: began testing self messaging
sherlockwisdom Mar 3, 2024
932e476
- update: test passes for self end to end encryption
sherlockwisdom Mar 4, 2024
58212ca
- update: can work with out of order messages, now to implement the s…
sherlockwisdom Mar 4, 2024
08948ce
- update: can self encrypt and decrypt, should have some bugs but sho…
sherlockwisdom Mar 5, 2024
f37484d
- update: can self encrypt and decrypt, should have some bugs but sho…
sherlockwisdom Mar 5, 2024
eee93fb
- update: can now encrypt and talk to self in a single ratchet. Shoul…
sherlockwisdom Mar 5, 2024
ae70a1d
- update: can now encrypt and talk to self in a single ratchet. Shoul…
sherlockwisdom Mar 5, 2024
1765511
- update: migrated database to 13, added some params to database but …
sherlockwisdom Mar 5, 2024
3ac6234
- update: self encrypted messaging works better now
sherlockwisdom Mar 5, 2024
cee650a
- update: fixed first messaging thing
sherlockwisdom Mar 6, 2024
7515fbf
- update: improved UX for key exchange
sherlockwisdom Mar 7, 2024
026390c
- update: added functionality to secure modal
sherlockwisdom Mar 9, 2024
98f0709
- update: modal dismisses allowing for secured conversation, tried wi…
sherlockwisdom Mar 9, 2024
4d63cec
- update: now have the ability to send messages, but encryption seems…
sherlockwisdom Mar 9, 2024
b3219f7
- update: have threads now sending messages back and forth, issue how…
sherlockwisdom Mar 10, 2024
282d6d1
- update: works with both being decrypted, but the UX is not the best…
sherlockwisdom Mar 10, 2024
b6c1b51
- update: adding more central points of truths
sherlockwisdom Mar 10, 2024
5e1565a
- update: catching and fixing date breaks
sherlockwisdom Mar 10, 2024
3100526
- update: migrated mark as read, freeing up resume
sherlockwisdom Mar 10, 2024
2ae6ac0
- update: migrated mark as read, freeing up resume
sherlockwisdom Mar 10, 2024
2bca37c
- update: fixed some things to look better with m3
sherlockwisdom Mar 10, 2024
d2fbfa3
- update: UI improvements and attaining logo uniformity
sherlockwisdom Mar 10, 2024
664b0be
- update: everything back to being stable
sherlockwisdom Mar 10, 2024
dcf1cbf
- update: everything back to being stable
sherlockwisdom Mar 10, 2024
f848274
- update: everything back to being stable
sherlockwisdom Mar 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,14 @@ android {
resourceConfigurations += ["en", "fr"]
}

// androidResources {
// generateLocaleConfig true
// buildFeatures {
// compose true
// }

// composeOptions {
// kotlinCompilerExtensionVersion = "1.1.1"
// }

sourceSets {
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())

Expand Down Expand Up @@ -128,6 +133,7 @@ dependencies {
implementation project(':smswithoutborders_libsignal-doubleratchet')
implementation 'androidx.room:room-testing:2.6.1'
def paging_version = "3.2.1"
def m3 = "1.2.1"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand All @@ -146,7 +152,6 @@ dependencies {
implementation "androidx.work:work-multiprocess:2.9.0"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.android.volley:volley:1.2.1'
Expand Down Expand Up @@ -188,5 +193,8 @@ dependencies {

implementation 'com.budiyev.android:code-scanner:2.1.0'

implementation 'com.google.android.material:material:1.11.0'

implementation "androidx.compose.material3:material3:$m3"
}

Loading