From b55954380db108fc8e4f61b593b8df5bdb157374 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 8 Nov 2022 10:25:15 -0500 Subject: [PATCH] Bump various Google Play Services dependencies. --- .../changenumber/ChangeNumberRepository.kt | 2 + .../ChangeNumberVerifyFragment.kt | 1 + dependencies.gradle | 8 +- gradle/verification-metadata.xml | 115 ++++++++++++++++++ 4 files changed, 122 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt index 62df9e4cb..3470912e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt @@ -44,6 +44,7 @@ import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevic import java.io.IOException import java.security.MessageDigest import java.security.SecureRandom +import java.util.concurrent.TimeUnit import java.util.concurrent.locks.ReentrantLock private val TAG: String = Log.tag(ChangeNumberRepository::class.java) @@ -90,6 +91,7 @@ class ChangeNumberRepository( emitter.onComplete() } }.subscribeOn(Schedulers.single()) + .timeout(15, TimeUnit.SECONDS) } fun changeNumber(code: String, newE164: String, pniUpdateMode: Boolean = false): Single> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt index 72cad36b9..c5fd14b09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt @@ -50,6 +50,7 @@ class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phon private fun requestCode() { lifecycleDisposable += viewModel .ensureDecryptionsDrained() + .onErrorComplete() .andThen(viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER)) .observeOn(AndroidSchedulers.mainThread()) .subscribe { processor -> diff --git a/dependencies.gradle b/dependencies.gradle index a84df6b03..6118d96aa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -66,9 +66,9 @@ dependencyResolutionManagement { // Google alias('google-protobuf-javalite').to('com.google.protobuf:protobuf-javalite:3.11.4') alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.54') - alias('google-play-services-maps').to('com.google.android.gms:play-services-maps:16.1.0') - alias('google-play-services-auth').to('com.google.android.gms:play-services-auth:16.0.1') - alias('google-play-services-wallet').to('com.google.android.gms:play-services-wallet:18.1.3') + alias('google-play-services-maps').to('com.google.android.gms:play-services-maps:18.1.0') + alias('google-play-services-auth').to('com.google.android.gms:play-services-auth:20.3.0') + alias('google-play-services-wallet').to('com.google.android.gms:play-services-wallet:19.1.0') alias('google-zxing-android-integration').to('com.google.zxing:android-integration:3.3.0') 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') @@ -83,7 +83,7 @@ dependencyResolutionManagement { bundle('exoplayer', ['exoplayer-core', 'exoplayer-ui', 'exoplayer-extension-mediasession']) // Firebase - alias('firebase-messaging').to('com.google.firebase:firebase-messaging:22.0.0') + alias('firebase-messaging').to('com.google.firebase:firebase-messaging:23.1.0') // 1st Party alias('libsignal-client').to('org.signal', 'libsignal-client').versionRef('libsignal-client') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 69d887763..16d9c97f7 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1663,11 +1663,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1745,16 +1755,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + @@ -1765,6 +1790,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1775,16 +1805,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + @@ -1795,11 +1845,26 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + @@ -1810,11 +1875,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1903,21 +1978,41 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + @@ -1928,6 +2023,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1938,16 +2038,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + +