Migrates FDroid's push system to match Play services

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -29,6 +29,8 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateDMChannel
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateZapChannel
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent
 import kotlinx.coroutines.CancellationException
@@ -89,7 +91,8 @@ class PushMessageReceiver : MessagingReceiver() {
             Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
             pushHandler.setEndpoint(sanitizedEndpoint)
             scope.launch(Dispatchers.IO) {
-                RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+                val okHttpClient = HttpClientManager.getHttpClient(TorManager.isSocksReady())
+                PushNotificationUtils.checkAndInit(sanitizedEndpoint, LocalPreferences.allSavedAccounts(), okHttpClient)
                 notificationManager().getOrCreateZapChannel(appContext)
                 notificationManager().getOrCreateDMChannel(appContext)
             }

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -20,28 +20,53 @@
  */
 package com.vitorpamplona.amethyst.service.notifications
 
-import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
-import kotlinx.coroutines.CancellationException
+import com.vitorpamplona.amethyst.service.retryIfException
+import kotlinx.coroutines.Dispatchers
+import okhttp3.OkHttpClient
 
 object PushNotificationUtils {
-    var hasInit: Boolean = false
+    var lastToken: String? = null
+    var hasInit: List<AccountInfo>? = null
+
     private val pushHandler = PushDistributorHandler
 
-    suspend fun init(accounts: List<AccountInfo>) {
+    suspend fun checkAndInit(
-        if (hasInit) {
+        accounts: List<AccountInfo>,
-            return
+        okHttpClient: OkHttpClient,
-        }
+    ) = with(Dispatchers.IO) {
-        try {
+        if (!pushHandler.savedDistributorExists()) return
-            if (pushHandler.savedDistributorExists()) {
+
         val currentDistributor = PushDistributorHandler.getSavedDistributor()
         PushDistributorHandler.saveDistributor(currentDistributor)
+        val token = pushHandler.getSavedEndpoint()
 
-                RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
+        if (hasInit?.equals(accounts) == true && lastToken == token) {
-            }
+            return@with
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
         }
+
+        registerToken(token, accounts, okHttpClient)
+    }
+
+    suspend fun checkAndInit(
+        token: String,
+        accounts: List<AccountInfo>,
+        okHttpClient: OkHttpClient,
+    ) = with(Dispatchers.IO) {
+        // initializes if the accounts are different or if the token has changed
+        if (hasInit?.equals(accounts) == true && lastToken == token) {
+            return@with
+        }
+        registerToken(token, accounts, okHttpClient)
+    }
+
+    private suspend fun registerToken(
+        token: String,
+        accounts: List<AccountInfo>,
+        okHttpClient: OkHttpClient,
+    ) = retryIfException("RegisterAccounts") {
+        RegisterAccounts(accounts, okHttpClient).go(token)
+        lastToken = token
+        hasInit = accounts.toList()
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CoroutinesExt.kt

@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.delay
+
+suspend fun <T> retryIfException(
+    debugTag: String = "RetryIfException",
+    maxRetries: Int = 10,
+    delayMs: Long = 1000,
+    func: suspend () -> T,
+) {
+    var tentative = 0
+    var currentDelay = delayMs
+    while (tentative < maxRetries) {
+        try {
+            func()
+
+            // if it works, finishes.
+            return
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            Log.e(debugTag, "Tentative $tentative failed", e)
+
+            delay(currentDelay)
+            tentative++
+            currentDelay = currentDelay * 2
+        }
+    }
+    // gives up
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/playerPool/MediaSessionPool.kt

@@ -83,7 +83,7 @@ class MediaSessionPool(
             }
         }
 
-    @UnstableApi
+    @OptIn(UnstableApi::class)
     fun newSession(
         id: String,
         context: Context,

amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -20,12 +20,10 @@
  */
 package com.vitorpamplona.amethyst.service.notifications
 
-import android.util.Log
 import com.google.firebase.messaging.FirebaseMessaging
 import com.vitorpamplona.amethyst.AccountInfo
-import kotlinx.coroutines.CancellationException
+import com.vitorpamplona.amethyst.service.retryIfException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.tasks.await
 import okhttp3.OkHttpClient
 
@@ -67,29 +65,3 @@ object PushNotificationUtils {
         hasInit = accounts.toList()
     }
 }
-
-suspend fun <T> retryIfException(
-    debugTag: String = "RetryIfException",
-    maxRetries: Int = 10,
-    delayMs: Long = 1000,
-    func: suspend () -> T,
-) {
-    var tentative = 0
-    var currentDelay = delayMs
-    while (tentative < maxRetries) {
-        try {
-            func()
-
-            // if it works, finishes.
-            return
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            Log.e(debugTag, "Tentative $tentative failed", e)
-
-            delay(currentDelay)
-            tentative++
-            currentDelay = currentDelay * 2
-        }
-    }
-    // gives up
-}