empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Clean out witness verification metadata.

Browse source
This commit is contained in:
Alex Hart 2022-09-14 09:18:10 -03:00 • committed by Greyson Parrelli
parent 26bebb9811
commit a8706f65d5
8 changed files with 113 additions and 1051 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -578,7 +578,7 @@ dependencies {
implementation libs.rxjava3.rxkotlin
implementation libs.rxdogtag
androidTestUtil 'androidx.test:orchestrator:1.4.1'
androidTestUtil testLibs.androidx.test.orchestrator
}
def getLastCommitTimestamp() {

5
app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
View file

@ -25,14 +25,19 @@ import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.testing.Put
import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
import org.thoughtcrime.securesms.testing.SignalActivityRule
import org.thoughtcrime.securesms.testing.SignalDatabaseRule
import org.thoughtcrime.securesms.testing.assertIs
import org.thoughtcrime.securesms.testing.assertIsNotNull
import org.thoughtcrime.securesms.testing.assertIsNull
import org.thoughtcrime.securesms.testing.success
import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
import java.util.Optional
import java.util.concurrent.TimeUnit
@RunWith(AndroidJUnit4::class)

3
contacts/app/build.gradle
View file

@ -37,8 +37,7 @@ ktlint {
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation "androidx.activity:activity-ktx:1.2.2"
implementation libs.androidx.activity.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout

7
dependencies.gradle
View file

@ -43,6 +43,7 @@ dependencyResolutionManagement {
alias('androidx-navigation-fragment-ktx').to('androidx.navigation', 'navigation-fragment-ktx').versionRef('androidx-navigation')
alias('androidx-navigation-ui-ktx').to('androidx.navigation', 'navigation-ui-ktx').versionRef('androidx-navigation')
alias('androidx-lifecycle-viewmodel-ktx').to('androidx.lifecycle', 'lifecycle-viewmodel-ktx').versionRef('androidx-lifecycle')
alias('androidx-lifecycle-livedata-core').to('androidx.lifecycle', 'lifecycle-livedata').versionRef('androidx-lifecycle')
alias('androidx-lifecycle-livedata-ktx').to('androidx.lifecycle', 'lifecycle-livedata-ktx').versionRef('androidx-lifecycle')
alias('androidx-lifecycle-process').to('androidx.lifecycle', 'lifecycle-process').versionRef('androidx-lifecycle')
alias('androidx-lifecycle-viewmodel-savedstate').to('androidx.lifecycle', 'lifecycle-viewmodel-savedstate').versionRef('androidx-lifecycle')
@ -72,6 +73,7 @@ dependencyResolutionManagement {
alias('google-zxing-core').to('com.google.zxing:core:3.4.1')
alias('google-ez-vcard').to('com.googlecode.ez-vcard:ez-vcard:0.9.11')
alias('google-jsr305').to('com.google.code.findbugs:jsr305:3.0.2')
alias('google-guava-android').to('com.google.guava:guava:30.0-android')
// Exoplayer
alias('exoplayer-core').to('com.google.android.exoplayer', 'exoplayer-core').versionRef('exoplayer')
@ -123,6 +125,10 @@ dependencyResolutionManagement {
alias('lottie').to('com.airbnb.android:lottie:3.6.0')
alias('stickyheadergrid').to('com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4')
alias('dnsjava').to('dnsjava:dnsjava:2.1.9')
alias('nanohttpd-webserver').to('org.nanohttpd:nanohttpd-webserver:2.3.1')
// Can't use the newest version because it hits some weird NoClassDefFoundException
alias('jknack-handlebars').to('com.github.jknack:handlebars:4.0.7')
// Mp4Parser
alias('mp4parser-isoparser').to('org.mp4parser', 'isoparser').versionRef('mp4parser')
@ -141,6 +147,7 @@ dependencyResolutionManagement {
alias('androidx-test-core-ktx').to('androidx.test', 'core-ktx').versionRef('androidx-test')
alias('androidx-test-ext-junit').to('androidx.test.ext', 'junit').versionRef('androidx-test-ext-junit')
alias('androidx-test-ext-junit-ktx').to('androidx.test.ext', 'junit-ktx').versionRef('androidx-test-ext-junit')
alias('androidx-test-orchestrator').to('androidx.test:orchestrator:1.4.1')
alias('espresso-core').to('androidx.test.espresso:espresso-core:3.4.0')
alias('mockito-core').to('org.mockito:mockito-inline:4.6.1')
alias('mockito-kotlin').to('org.mockito.kotlin:mockito-kotlin:4.0.0')

1133
gradle/verification-metadata.xml
View file

File diff suppressed because it is too large Load diff

6
qr/lib/build.gradle
View file

@ -6,13 +6,11 @@ dependencies {
implementation libs.androidx.camera.lifecycle
implementation libs.androidx.camera.view
implementation libs.androidx.lifecycle.common.java8
implementation libs.androidx.lifecycle.livedata.core
implementation libs.google.guava.android
implementation libs.google.zxing.android.integration
implementation libs.google.zxing.core
implementation libs.rxjava3.rxjava
// Included to force proper versions for verification and match main app
implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
implementation 'com.google.guava:guava:30.0-android'
}

3
spinner/app/build.gradle
View file

@ -46,9 +46,8 @@ android {
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation "androidx.activity:activity-ktx:1.2.2"
implementation libs.androidx.core.ktx
implementation libs.androidx.activity.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout

5
spinner/lib/build.gradle
View file

@ -29,8 +29,7 @@ ktlint {
}
dependencies {
// Can't use the newest version because it hits some weird NoClassDefFoundException
implementation 'com.github.jknack:handlebars:4.0.7'
implementation libs.jknack.handlebars
implementation libs.androidx.appcompat
implementation libs.material.material
@ -38,5 +37,5 @@ dependencies {
implementation project(':core-util')
testImplementation testLibs.junit.junit
implementation 'org.nanohttpd:nanohttpd-webserver:2.3.1'
implementation libs.nanohttpd.webserver
}