From a3774c11612ba32829be400b2b76cd948e8236ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 23:08:07 +0000 Subject: [PATCH 1/2] Bump android-embedded_fcm_distributor from 2.0.0 to 2.1.1 Bumps [android-embedded_fcm_distributor](https://github.com/UnifiedPush/android-embedded_fcm_distributor) from 2.0.0 to 2.1.1. - [Release notes](https://github.com/UnifiedPush/android-embedded_fcm_distributor/releases) - [Commits](https://github.com/UnifiedPush/android-embedded_fcm_distributor/compare/2.0.0...2.1.1) --- updated-dependencies: - dependency-name: com.github.UnifiedPush:android-embedded_fcm_distributor dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vector/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index 8d704141e5..735c953db7 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -465,7 +465,7 @@ dependencies { // UnifiedPush implementation 'com.github.UnifiedPush:android-connector:2.0.0' // UnifiedPush gplay flavor only - gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.0.0') { + gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.1') { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' From ba0898831b75a9482860a7b22e9c233d0ae151fb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 17 Jun 2022 17:22:31 +0200 Subject: [PATCH 2/2] Fix compilation issue --- .../gplay/features/settings/troubleshoot/TestPlayServices.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt index f1ea4a4153..e78132908d 100644 --- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt @@ -46,7 +46,7 @@ class TestPlayServices @Inject constructor( if (apiAvailability.isUserResolvableError(resultCode)) { quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_play_services_quickfix) { override fun doFix() { - apiAvailability.getErrorDialog(context, resultCode, 9000 /*hey does the magic number*/).show() + apiAvailability.getErrorDialog(context, resultCode, 9000 /*hey does the magic number*/)?.show() } } Timber.e("Play Services apk error $resultCode -> ${apiAvailability.getErrorString(resultCode)}.")