Feat: Add Unifiedpush support

app/build.gradle.kts

@@ -177,6 +177,21 @@ configurations.configureEach {
     exclude(group = "com.google.firebase", module = "firebase-analytics")
     exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
     exclude(group = "org.jetbrains", module = "annotations-java5") // via prism4j, already using annotations explicitly
+
+    // com.google.crypto.tink (pulled in by org.unifiedpush.android:connector) transitively depends on
+    // protobuf-java, which conflicts with protobuf-javalite used by com.google.mediapipe:tasks-core,
+    // pulled by com.google.mediapipe:tasks-vision
+    //
+    // To analyse the dependencies:
+    // `./gradlew :app:dependencyInsight --configuration genericDebugRuntimeClasspath --dependency com.google.protobuf:protobuf-java`
+    val protobufJava = "com.google.protobuf:protobuf-java:4.28.2"
+    resolutionStrategy {
+        force(protobufJava)
+        dependencySubstitution {
+            substitute(module("com.google.protobuf:protobuf-javalite"))
+                .using(module(protobufJava))
+        }
+    }
 }
 
 dependencies {
@@ -323,6 +338,8 @@ dependencies {
     "gplayImplementation"("com.google.android.gms:play-services-base:18.10.0")
     "gplayImplementation"("com.google.firebase:firebase-messaging:25.0.1")
 
+    implementation("org.unifiedpush.android:connector:3.3.2")
+
     // compose
     implementation(platform("androidx.compose:compose-bom:2026.04.01"))
     implementation("androidx.compose.ui:ui")

app/src/main/AndroidManifest.xml

@@ -336,6 +336,13 @@
             android:exported="false"
             android:foregroundServiceType="microphone|camera" />
 
+        <service android:name=".services.UnifiedPushService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
+            </intent-filter>
+        </service>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"

app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -39,9 +39,11 @@ import com.nextcloud.talk.jobs.WebsocketConnectionsWorker
 import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall
 import com.nextcloud.talk.models.json.generic.Status
 import com.nextcloud.talk.models.json.userprofile.UserProfileOverall
+import com.nextcloud.talk.ui.dialog.IntroduceUnifiedPushDialog
 import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.ClosedInterfaceImpl
+import com.nextcloud.talk.utils.UnifiedPushUtils
 import com.nextcloud.talk.utils.UriUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_BASE_URL
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
@@ -58,6 +60,7 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.unifiedpush.android.connector.UnifiedPush
 import java.net.CookieManager
 import javax.inject.Inject
 
@@ -260,18 +263,7 @@ class AccountVerificationActivity : BaseActivity() {
                 @SuppressLint("SetTextI18n")
                 override fun onSuccess(user: User) {
                     internalAccountId = user.id!!
-                    if (ClosedInterfaceImpl().isGooglePlayServicesAvailable) {
-                        ClosedInterfaceImpl().setUpPushTokenRegistration()
-                    } else {
-                        Log.w(TAG, "Skipping push registration.")
-                        runOnUiThread {
-                            binding.progressText.text =
-                                """ ${binding.progressText.text}
-                                    ${resources!!.getString(R.string.nc_push_disabled)}
-                                """.trimIndent()
-                        }
-                        fetchAndStoreCapabilities()
-                    }
+                    eventBus.post(EventStatus(user.id!!, EventStatus.EventType.PROFILE_STORED, true))
                 }
 
                 @SuppressLint("SetTextI18n")
@@ -346,41 +338,129 @@ class AccountVerificationActivity : BaseActivity() {
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     fun onMessageEvent(eventStatus: EventStatus) {
         Log.d(TAG, "caught EventStatus of type " + eventStatus.eventType.toString())
-        if (eventStatus.eventType == EventStatus.EventType.PUSH_REGISTRATION) {
-            if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
-                runOnUiThread {
-                    binding.progressText.text =
-                        """
+        if (internalAccountId != eventStatus.userId) {
+            Log.d(TAG, "Event isn't for us. Aborting.")
+            return
+        }
+        // We do: PROFILE_STORED
+        // -> CAPABILITIES_FETCH
+        // -> PUSH_REGISTRATION
+        // -> SIGNALING_SETTINGS
+        when (eventStatus.eventType) {
+            EventStatus.EventType.PROFILE_STORED -> {
+                fetchAndStoreCapabilities()
+            }
+            EventStatus.EventType.CAPABILITIES_FETCH -> {
+                if (!eventStatus.isAllGood) {
+                    runOnUiThread {
+                        binding.progressText.text =
+                            """
                             ${binding.progressText.text}
-                            ${resources!!.getString(R.string.nc_push_disabled)}
-                        """.trimIndent()
+                            ${resources!!.getString(R.string.nc_capabilities_failed)}
+                            """.trimIndent()
+                    }
+                    abortVerification()
+                } else {
+                    setupPushNotifications()
                 }
             }
-            fetchAndStoreCapabilities()
-        } else if (eventStatus.eventType == EventStatus.EventType.CAPABILITIES_FETCH) {
-            if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
-                runOnUiThread {
-                    binding.progressText.text =
-                        """
+            EventStatus.EventType.PUSH_REGISTRATION -> {
+                if (!eventStatus.isAllGood) {
+                    runOnUiThread {
+                        binding.progressText.text =
+                            """
                             ${binding.progressText.text}
-                            ${resources!!.getString(R.string.nc_capabilities_failed)}
-                        """.trimIndent()
+                            ${resources!!.getString(R.string.nc_push_disabled)}
+                            """.trimIndent()
+                    }
                 }
-                abortVerification()
-            } else if (internalAccountId == eventStatus.userId && eventStatus.isAllGood) {
                 fetchAndStoreExternalSignalingSettings()
             }
-        } else if (eventStatus.eventType == EventStatus.EventType.SIGNALING_SETTINGS) {
-            if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
-                runOnUiThread {
-                    binding.progressText.text =
-                        """
+            EventStatus.EventType.SIGNALING_SETTINGS -> {
+                if (!eventStatus.isAllGood) {
+                    runOnUiThread {
+                        binding.progressText.text =
+                            """
                             ${binding.progressText.text}
                             ${resources!!.getString(R.string.nc_external_server_failed)}
-                        """.trimIndent()
+                            """.trimIndent()
+                    }
+                }
+                proceedWithLogin()
+            }
+            else -> {}
+        }
+    }
+
+    private fun setupPushNotifications() {
+        // This isn't a first account, and UnifiedPush is enabled.
+        if (appPreferences.useUnifiedPush) {
+            if (userManager.getUserWithId(internalAccountId).blockingGet().hasWebPushCapability) {
+                UnifiedPushUtils.registerWithCurrentDistributor(context)
+                eventBus.post(EventStatus(internalAccountId, EventStatus.EventType.PUSH_REGISTRATION, true))
+                return
+            } else {
+                Log.w(TAG, "Warning: disabling UnifiedPush, user server doesn't support web push.")
+                appPreferences.useUnifiedPush = false
+            }
+        }
+
+        // - By default, use the Play Services if available
+        // - If this is a first user, and we have an External UnifiedPush distributor,
+        //    and the server supports it: we use it
+        // - Else we skip push registrations
+        if (ClosedInterfaceImpl().isGooglePlayServicesAvailable) {
+            ClosedInterfaceImpl().setUpPushTokenRegistration()
+            eventBus.post(EventStatus(internalAccountId, EventStatus.EventType.PUSH_REGISTRATION, true))
+        } else if (userManager.users.blockingGet().size == 1 &&
+            UnifiedPush.getDistributors(context).isNotEmpty() &&
+            userManager.getUserWithId(internalAccountId).blockingGet().hasWebPushCapability
+        ) {
+            useUnifiedPushIntroduced()
+        } else {
+            Log.w(TAG, "Skipping push registration.")
+            eventBus.post(EventStatus(internalAccountId, EventStatus.EventType.PUSH_REGISTRATION, false))
+        }
+    }
+
+    /**
+     * Show a dialog if the user has to select their distributor
+     *
+     * Most of the time, nothing will be shown, as most users have
+     * a single distributor, or already selected their default one
+     */
+    private fun useUnifiedPushIntroduced() {
+        if (UnifiedPushUtils.usingDefaultDistributorNeedsIntro(context)) {
+            dialogForUnifiedPush { res ->
+                if (res) {
+                    useUnifiedPush()
+                }
+            }
+        } else {
+            useUnifiedPush()
+        }
+    }
+
+    private fun useUnifiedPush() {
+        UnifiedPushUtils.useDefaultDistributor(this) { distrib ->
+            distrib?.let {
+                Log.d(TAG, "UnifiedPush registered with $distrib")
+                appPreferences.useUnifiedPush = true
+                eventBus.post(EventStatus(internalAccountId, EventStatus.EventType.PUSH_REGISTRATION, true))
+            } ?: run {
+                Log.d(TAG, "No UnifiedPush distrib selected")
+                eventBus.post(EventStatus(internalAccountId, EventStatus.EventType.PUSH_REGISTRATION, false))
+            }
+        }
+    }
+
+    private fun dialogForUnifiedPush(onResponse: (Boolean) -> Unit) {
+        binding.genericComposeView.apply {
+            setContent {
+                IntroduceUnifiedPushDialog { res ->
+                    onResponse(res)
                 }
             }
-            proceedWithLogin()
         }
     }
 

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -38,6 +38,7 @@ import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.ClosedInterfaceImpl
 import com.nextcloud.talk.utils.SecurityUtils
+import com.nextcloud.talk.utils.UnifiedPushUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
 import io.reactivex.Observer
@@ -260,7 +261,11 @@ class MainActivity :
 
                 override fun onSuccess(users: List<User>) {
                     if (users.isNotEmpty()) {
-                        ClosedInterfaceImpl().setUpPushTokenRegistration()
+                        if (appPreferences.useUnifiedPush) {
+                            UnifiedPushUtils.setPeriodicPushRegistrationWorker(this@MainActivity)
+                        } else {
+                            ClosedInterfaceImpl().setUpPushTokenRegistration()
+                        }
                         runOnUiThread {
                             openConversationList()
                         }

app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -27,6 +27,7 @@
 import com.nextcloud.talk.models.json.participants.ParticipantsOverall;
 import com.nextcloud.talk.models.json.participants.TalkBanOverall;
 import com.nextcloud.talk.models.json.push.PushRegistrationOverall;
+import com.nextcloud.talk.models.json.push.VapidOverall;
 import com.nextcloud.talk.models.json.reactions.ReactionsOverall;
 import com.nextcloud.talk.models.json.reminder.ReminderOverall;
 import com.nextcloud.talk.models.json.search.ContactsByNumberOverall;
@@ -270,6 +271,32 @@ Observable<GenericOverall> setUserData(@Header("Authorization") String authoriza
     @GET
     Observable<Status> getServerStatus(@Url String url);
 
+    @GET
+    Observable<VapidOverall> getVapidKey(
+        @Header("Authorization") String authorization,
+        @Url String url);
+
+    @FormUrlEncoded
+    @POST
+    Observable<Response<GenericOverall>> registerWebPush(
+        @Header("Authorization") String authorization,
+        @Url String url,
+        @Field("endpoint") String endpoint,
+        @Field("uaPublicKey") String uaPublicKey,
+        @Field("auth") String auth,
+        @Field("appTypes") String appTypes);
+
+    @FormUrlEncoded
+    @POST
+    Observable<Response<GenericOverall>> activateWebPush(
+        @Header("Authorization") String authorization,
+        @Url String url,
+        @Field("activationToken") String activationToken);
+
+    @DELETE
+    Observable<GenericOverall> unregisterWebPush(
+        @Header("Authorization") String authorization,
+        @Url String url);
 
     /*
         QueryMap items are as follows:

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -305,7 +305,10 @@ class ConversationsListActivity : BaseActivity() {
         // handle notification permission on API level >= 33
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             !platformPermissionUtil.isPostNotificationsPermissionGranted() &&
-            ClosedInterfaceImpl().isGooglePlayServicesAvailable
+            (
+                ClosedInterfaceImpl().isGooglePlayServicesAvailable ||
+                    appPreferences.useUnifiedPush
+                )
         ) {
             requestPermissions(
                 arrayOf(Manifest.permission.POST_NOTIFICATIONS),

app/src/main/java/com/nextcloud/talk/data/user/model/User.kt

@@ -35,6 +35,9 @@ data class User(
     var scheduledForDeletion: Boolean = FALSE
 ) : Parcelable {
 
+    val hasWebPushCapability: Boolean
+        get() = capabilities?.notificationsCapability?.push?.contains("webpush") == true
+
     fun getCredentials(): String = ApiUtils.getCredentials(username, token)!!
 
     fun hasSpreedFeatureCapability(capabilityName: String): Boolean {