Refactor v1 and v2

libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt

@@ -8,8 +8,8 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import org.session.libsession.messaging.jobs.Job.Companion.MAX_BUFFER_SIZE
 
-import org.session.libsession.messaging.sending_receiving.notifications.LegacyGroupsPushManager
-import org.session.libsession.messaging.sending_receiving.notifications.LegacyGroupsPushManager.server
+import org.session.libsession.messaging.sending_receiving.notifications.PushManagerV1
+import org.session.libsession.messaging.sending_receiving.notifications.PushManagerV1.server
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.SnodeMessage
 import org.session.libsession.snode.OnionRequestAPI
@@ -41,7 +41,7 @@ class NotifyPNServerJob(val message: SnodeMessage) : Job {
             OnionRequestAPI.sendOnionRequest(
                 request,
                 server,
-                LegacyGroupsPushManager.serverPublicKey,
+                PushManagerV1.serverPublicKey,
                 Version.V2
             ) success { response ->
                 when (response.info["code"]) {

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt

@@ -8,7 +8,7 @@ import nl.komponents.kovenant.deferred
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender.Error
-import org.session.libsession.messaging.sending_receiving.notifications.LegacyGroupsPushManager
+import org.session.libsession.messaging.sending_receiving.notifications.PushManagerV1
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
@@ -83,7 +83,7 @@ fun MessageSender.create(name: String, members: Collection<String>): Promise<Str
         }
 
         // Notify the PN server
-        LegacyGroupsPushManager.register(publicKey = userPublicKey)
+        PushManagerV1.register(publicKey = userPublicKey)
         // Start polling
         ClosedGroupPollerV2.shared.startPolling(groupPublicKey)
         // Fulfill the promise

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -23,7 +23,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
-import org.session.libsession.messaging.sending_receiving.notifications.LegacyGroupsPushManager
+import org.session.libsession.messaging.sending_receiving.notifications.PushManagerV1
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
 import org.session.libsession.messaging.utilities.SessionId
@@ -479,7 +479,7 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
     // Set expiration timer
     storage.setExpirationTimer(groupID, expireTimer)
     // Notify the PN server
-    LegacyGroupsPushManager.register(publicKey = userPublicKey)
+    PushManagerV1.register(publicKey = userPublicKey)
     // Notify the user
     if (userPublicKey == sender && !groupExists) {
         val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
@@ -772,7 +772,7 @@ fun MessageReceiver.disableLocalGroupAndUnsubscribe(groupPublicKey: String, grou
     storage.setActive(groupID, false)
     storage.removeMember(groupID, Address.fromSerialized(userPublicKey))
     // Notify the PN server
-    LegacyGroupsPushManager.register(publicKey = userPublicKey)
+    PushManagerV1.register(publicKey = userPublicKey)
     // Stop polling
     ClosedGroupPollerV2.shared.stopPolling(groupPublicKey)
 }

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushManagerV1.kt

@@ -2,7 +2,6 @@ package org.session.libsession.messaging.sending_receiving.notifications
 
 import android.annotation.SuppressLint
 import nl.komponents.kovenant.Promise
-import nl.komponents.kovenant.all
 import nl.komponents.kovenant.functional.map
 import okhttp3.MediaType
 import okhttp3.Request
@@ -17,8 +16,8 @@ import org.session.libsignal.utilities.emptyPromise
 import org.session.libsignal.utilities.retryIfNeeded
 
 @SuppressLint("StaticFieldLeak")
-object LegacyGroupsPushManager {
-    private const val TAG = "LegacyGroupsPushManager"
+object PushManagerV1 {
+    private const val TAG = "PushManagerV1"
 
     val context = MessagingModuleConfiguration.shared.context
     const val server = "https://push.getsession.org"
@@ -31,29 +30,46 @@ object LegacyGroupsPushManager {
         token: String? = TextSecurePreferences.getFCMToken(context),
         publicKey: String? = TextSecurePreferences.getLocalNumber(context),
         legacyGroupPublicKeys: Collection<String> = MessagingModuleConfiguration.shared.storage.getAllClosedGroupPublicKeys()
-    ): Promise<Unit, Exception> =
+    ): Promise<*, Exception> =
         retryIfNeeded(maxRetryCount) {
-            Log.d(TAG, "register() called")
-
-            val parameters = mapOf(
-                "token" to token!!,
-                "pubKey" to publicKey!!,
-                "legacyGroupPublicKeys" to legacyGroupPublicKeys.takeIf { it.isNotEmpty() }!!
-            )
-            val url = "$legacyServer/register_legacy_groups_only"
-            val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters))
-            val request = Request.Builder().url(url).post(body).build()
-
-            OnionRequestAPI.sendOnionRequest(request, legacyServer, legacyServerPublicKey, Version.V2).map { response ->
-                when (response.info["code"]) {
-                    null, 0 -> throw Exception("error: ${response.info["message"]}.")
-                    else -> Log.d(TAG, "register() success!!")
-                }
-            }
+            doRegister(token, publicKey, legacyGroupPublicKeys)
         } fail { exception ->
             Log.d(TAG, "Couldn't register for FCM due to error: ${exception}.")
+        } success {
+            Log.d(TAG, "register success!!")
         }
 
+    private fun doRegister(token: String?, publicKey: String?, legacyGroupPublicKeys: Collection<String>): Promise<*, Exception> {
+        Log.d(TAG, "doRegister() called $token, $publicKey, $legacyGroupPublicKeys")
+
+        token ?: return emptyPromise()
+        publicKey ?: return emptyPromise()
+        legacyGroupPublicKeys.takeIf { it.isNotEmpty() } ?: return emptyPromise()
+
+        Log.d(TAG, "actually registering...")
+
+        val parameters = mapOf(
+            "token" to token,
+            "pubKey" to publicKey,
+            "legacyGroupPublicKeys" to legacyGroupPublicKeys
+        )
+
+        val url = "$legacyServer/register_legacy_groups_only"
+        val body = RequestBody.create(MediaType.get("application/json"), JsonUtil.toJson(parameters))
+        val request = Request.Builder().url(url).post(body).build()
+
+        return OnionRequestAPI.sendOnionRequest(request, legacyServer, legacyServerPublicKey, Version.V2).map { response ->
+            when (response.info["code"]) {
+                null, 0 -> throw Exception("error: ${response.info["message"]}.")
+                else -> Log.d(TAG, "register() success!!")
+            }
+        } success {
+            Log.d(TAG, "onion request success")
+        } fail {
+            Log.d(TAG, "onion fail: $it")
+        }
+    }
+
     /**
      * Unregister push notifications for 1-1 conversations as this is now done in FirebasePushManager.
      */
@@ -74,7 +90,7 @@ object LegacyGroupsPushManager {
                 legacyServerPublicKey,
                 Version.V2
             ) success {
-                android.util.Log.d(TAG, "unregister() success!!")
+                Log.d(TAG, "unregister() success!!")
 
                 when (it.info["code"]) {
                     null, 0 -> throw Exception("error: ${it.info["message"]}.")