Upgrade android-connector to 2.3.1

mollyim · Jan 14, 2024 · e76ee35 · e76ee35
1 parent a51ca9a
commit e76ee35
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -420,7 +420,7 @@ dependencies {
     implementation libs.androidx.asynclayoutinflater.appcompat
     implementation libs.androidx.webkit
 
-    implementation 'com.github.UnifiedPush:android-connector:2.1.1'
+    implementation 'com.github.UnifiedPush:android-connector:2.3.1'
 
     gmsImplementation (libs.firebase.messaging) {
         exclude group: 'com.google.firebase', module: 'firebase-core'

diff --git a/...m/molly/unifiedpush/components/settings/app/notifications/UnifiedPushSettingsViewModel.kt b/...m/molly/unifiedpush/components/settings/app/notifications/UnifiedPushSettingsViewModel.kt
@@ -38,7 +38,7 @@ class UnifiedPushSettingsViewModel(private val application: Application) : ViewM
 
   private fun getState(): UnifiedPushSettingsState {
     status ?: run { status = SignalStore.unifiedpush().status }
-    val distributor = UnifiedPush.getDistributor(application)
+    val distributor = UnifiedPush.getAckDistributor(application)
     var count = -1
     var selected = -1
 

diff --git a/app/src/unifiedpush/java/im/molly/unifiedpush/util/UnifiedPushHelper.kt b/app/src/unifiedpush/java/im/molly/unifiedpush/util/UnifiedPushHelper.kt
@@ -52,8 +52,6 @@ object UnifiedPushHelper {
   }
 
   fun checkDistributorPresence(context: Context) {
-    if (UnifiedPush.getDistributor(context).isEmpty()) {
-      SignalStore.unifiedpush().endpoint = null
-    }
+    UnifiedPush.getAckDistributor(context) ?: run { SignalStore.unifiedpush().endpoint = null }
   }
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -2808,16 +2808,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2758d4994b8339668a67857211981d93b903596fd06fd73e8b35abb31534f2ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.UnifiedPush" name="android-connector" version="2.3.1">
+         <artifact name="android-connector-2.3.1.aar">
+            <sha256 value="529243515c1fc198b185830b8d5ac0ff899809d758a865185d24de61825b2a76" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-connector-2.3.1.module">
+            <sha256 value="bc43d0213afaf06b9387835b57f1ae8a640ae3bb2fe2243ab35fe7b66a6431b6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.15.1">
+         <artifact name="annotations-4.14.2.module">
+            <sha256 value="6ec1255219b1532ad3c3eb508227cbc5a1a946900ab7bf87d0961de83d105323" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="annotations-4.15.1.jar">
             <sha256 value="c331e74f28d573319d6863bfbef3691cd3775580ff4a33b95ed3f227cc339b0d" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="annotations-4.15.1.module">
             <sha256 value="162bc02c4673421ea0128927881c3fea7aa7a10d5738ac37d2bda91f48e8ebad" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-4.14.2.module">
-            <sha256 value="6ec1255219b1532ad3c3eb508227cbc5a1a946900ab7bf87d0961de83d105323" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="com.github.bumptech.glide" name="compiler" version="4.15.1">
          <artifact name="compiler-4.15.1.jar">
@@ -5064,6 +5072,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="03a5c3965cc37051128e64e46748e394b6bd4c97fa81c6de6fc72bfd44e3421b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.22">
+         <artifact name="kotlin-stdlib-1.9.22-all.jar">
+            <sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.22.jar">
+            <sha256 value="6abe146c27864138b874ccccfe5f534e3eb923c99a1b7b5d45494ee5694f3e0a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.22.module">
+            <sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.21">
          <artifact name="kotlin-stdlib-common-1.4.21.jar">
             <sha256 value="812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff" origin="Generated by Gradle"/>
@@ -5109,6 +5128,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d0c2365e2437ef70f34586d50f055743f79716bcfe65e4bc7239cdd2669ef7c5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.22">
+         <artifact name="kotlin-stdlib-common-1.9.22.module">
+            <sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.10">
          <artifact name="kotlin-stdlib-jdk7-1.4.10.jar">
             <sha256 value="f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b" origin="Generated by Gradle"/>