[Push] Support UnifiedPush Connector 3.x, VAPID, Encryption, Google FCM

app/build.gradle.kts

@@ -196,7 +196,13 @@ dependencies {
     implementation(libs.okhttp.brotli)
     implementation(libs.okhttp.logging)
     implementation(libs.openid.appauth)
-    implementation(libs.unifiedpush)
+    implementation(libs.unifiedpush) {
+        // UnifiedPush connector seems to be using a workaround by importing this library.
+        // Will be removed after https://github.com/tink-crypto/tink-java-apps/pull/5 is merged.
+        // See: https://codeberg.org/UnifiedPush/android-connector/src/commit/28cb0d622ed0a972996041ab9cc85b701abc48c6/connector/build.gradle#L56-L59
+        exclude(group = "com.google.crypto.tink", module = "tink")
+    }
+    implementation(libs.unifiedpush.fcm)
 
     // force some versions for compatibility with our minSdk level (see version catalog for details)
     implementation(libs.commons.codec)

app/src/androidTest/kotlin/at/bitfire/davdroid/TestModules.kt

@@ -4,27 +4,13 @@
 
 package at.bitfire.davdroid
 
-import at.bitfire.davdroid.push.PushRegistrationWorkerManager
-import at.bitfire.davdroid.repository.DavCollectionRepository
 import at.bitfire.davdroid.startup.StartupPlugin
 import at.bitfire.davdroid.startup.TasksAppWatcher
 import dagger.Module
 import dagger.hilt.components.SingletonComponent
 import dagger.hilt.testing.TestInstallIn
 import dagger.multibindings.Multibinds
 
-// remove PushRegistrationWorkerModule from Android tests
-@Module
-@TestInstallIn(
-    components = [SingletonComponent::class],
-    replaces = [PushRegistrationWorkerManager.PushRegistrationWorkerModule::class]
-)
-abstract class TestPushRegistrationWorkerModule {
-    // provides empty set of listeners
-    @Multibinds
-    abstract fun empty(): Set<DavCollectionRepository.OnChangeListener>
-}
-
 // remove TasksAppWatcherModule from Android tests
 @Module
 @TestInstallIn(

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/CollectionListRefresherTest.kt

@@ -19,6 +19,7 @@ import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit4.MockKRule
+import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -142,7 +143,7 @@ class CollectionListRefresherTest {
                 displayName = "My Contacts",
                 description = "My Contacts Description"
             ),
-            db.collectionDao().getByService(service.id).first()
+            runBlocking { db.collectionDao().getByService(service.id).first() }
         )
     }
 

app/src/main/AndroidManifest.xml

@@ -268,15 +268,12 @@
                 android:resource="@xml/debug_paths" />
         </provider>
 
-        <!-- UnifiedPush receiver -->
-        <receiver android:exported="true"  android:enabled="true"  android:name=".push.UnifiedPushReceiver" tools:ignore="ExportedReceiver">
+        <!-- UnifiedPush -->
+        <service android:exported="false" android:name=".push.UnifiedPushService">
             <intent-filter>
-                <action android:name="org.unifiedpush.android.connector.MESSAGE"/>
-                <action android:name="org.unifiedpush.android.connector.UNREGISTERED"/>
-                <action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT"/>
-                <action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED"/>
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
             </intent-filter>
-        </receiver>
+        </service>
 
         <!-- Widgets -->
         <receiver android:name=".ui.widget.SyncButtonWidgetReceiver"

app/src/main/kotlin/at/bitfire/davdroid/db/CollectionDao.kt

@@ -24,7 +24,7 @@ interface CollectionDao {
     fun getFlow(id: Long): Flow<Collection?>
 
     @Query("SELECT * FROM collection WHERE serviceId=:serviceId")
-    fun getByService(serviceId: Long): List<Collection>
+    suspend fun getByService(serviceId: Long): List<Collection>
 
     @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND homeSetId IS :homeSetId")
     fun getByServiceAndHomeset(serviceId: Long, homeSetId: Long?): List<Collection>
@@ -35,6 +35,9 @@ interface CollectionDao {
     @Query("SELECT * FROM collection WHERE pushTopic=:topic AND sync")
     fun getSyncableByPushTopic(topic: String): Collection?
 
+    @Query("SELECT pushVapidKey FROM collection WHERE serviceId=:serviceId AND pushVapidKey IS NOT NULL LIMIT 1")
+    suspend fun getFirstVapidKey(serviceId: Long): String?
+
     @Query("SELECT COUNT(*) FROM collection WHERE serviceId=:serviceId AND type=:type")
     suspend fun anyOfType(serviceId: Long, @CollectionType type: String): Boolean
 
@@ -72,11 +75,14 @@ interface CollectionDao {
      * Get a list of collections that are both sync enabled and push capable (supportsWebPush and
      * pushTopic is available).
      */
-    @Query("SELECT * FROM collection WHERE sync AND supportsWebPush AND pushTopic IS NOT NULL")
-    suspend fun getPushCapableSyncCollections(): List<Collection>
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND sync AND supportsWebPush AND pushTopic IS NOT NULL")
+    suspend fun getPushCapableSyncCollections(serviceId: Long): List<Collection>
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND pushSubscription IS NOT NULL")
+    suspend fun getPushRegistered(serviceId: Long): List<Collection>
 
-    @Query("SELECT * FROM collection WHERE pushSubscription IS NOT NULL AND NOT sync")
-    suspend fun getPushRegisteredAndNotSyncable(): List<Collection>
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND pushSubscription IS NOT NULL AND NOT sync")
+    suspend fun getPushRegisteredAndNotSyncable(serviceId: Long): List<Collection>
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun insert(collection: Collection): Long
@@ -116,4 +122,4 @@ interface CollectionDao {
     @Delete
     fun delete(collection: Collection)
 
-}
+}

app/src/main/kotlin/at/bitfire/davdroid/db/ServiceDao.kt

@@ -25,6 +25,9 @@ interface ServiceDao {
     @Query("SELECT * FROM service WHERE id=:id")
     fun get(id: Long): Service?
 
+    @Query("SELECT * FROM service")
+    suspend fun getAll(): List<Service>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertOrReplace(service: Service): Long