update unified push connector to 3.0.7 and prepare for using push payload directly

app/build.gradle

@@ -187,8 +187,7 @@ dependencies {
 
     implementation libs.bundles.filemojicompat
 
-    implementation libs.bouncycastle
-    implementation libs.unified.push
+    implementation libs.bundles.unifiedpush
 
     implementation libs.bundles.xmldiff
 

app/proguard-rules.pro

@@ -26,10 +26,6 @@
 -keepattributes SourceFile,LineNumberTable
 -renamesourcefileattribute SourceFile
 
-# Bouncy Castle -- Keep EC
--keep class org.bouncycastle.jcajce.provider.asymmetric.EC$* { *; }
--keep class org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi$EC
-
 # Preference fragments can be referenced by name, ensure they remain
 # https://github.com/tuskyapp/Tusky/issues/3161
 -keep class * extends androidx.preference.PreferenceFragmentCompat

app/src/main/AndroidManifest.xml

@@ -159,19 +159,12 @@
             android:name=".receiver.SendStatusBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
-        <receiver
-            android:exported="true"
-            android:enabled="true"
-            android:name=".receiver.UnifiedPushBroadcastReceiver"
-            tools:ignore="ExportedReceiver">
+        <service android:name=".receiver.UnifiedPushService"
+            android:exported="false">
             <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.REGISTRATION_REFUSED"/>
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
             </intent-filter>
-        </receiver>
+        </service>
         <receiver
             android:exported="true"
             android:enabled="true"

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -82,7 +82,7 @@ import com.keylesspalace.tusky.components.login.LoginActivity
 import com.keylesspalace.tusky.components.preference.PreferencesActivity
 import com.keylesspalace.tusky.components.scheduled.ScheduledStatusActivity
 import com.keylesspalace.tusky.components.search.SearchActivity
-import com.keylesspalace.tusky.components.systemnotifications.NotificationService
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.components.trending.TrendingActivity
 import com.keylesspalace.tusky.databinding.ActivityMainBinding
 import com.keylesspalace.tusky.db.DraftsAlert
@@ -137,7 +137,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
     lateinit var eventHub: EventHub
 
     @Inject
-    lateinit var notificationService: NotificationService
+    lateinit var notificationHelper: NotificationHelper
 
     @Inject
     lateinit var cacheUpdater: CacheUpdater

app/src/main/java/com/keylesspalace/tusky/MainViewModel.kt

@@ -24,7 +24,7 @@ import com.keylesspalace.tusky.appstore.ConversationsLoadingEvent
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.NewNotificationsEvent
 import com.keylesspalace.tusky.appstore.NotificationsLoadingEvent
-import com.keylesspalace.tusky.components.systemnotifications.NotificationService
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.entity.Notification
@@ -48,7 +48,7 @@ class MainViewModel @Inject constructor(
     private val eventHub: EventHub,
     private val accountManager: AccountManager,
     private val shareShortcutHelper: ShareShortcutHelper,
-    private val notificationService: NotificationService,
+    private val notificationHelper: NotificationHelper,
 ) : ViewModel() {
 
     private val activeAccount = accountManager.activeAccount!!
@@ -160,15 +160,15 @@ class MainViewModel @Inject constructor(
         //   notifications fully disabled) will get unnoticed; and also an app restart cannot be easily triggered by the user.
 
         // TODO it's quite odd to separate channel creation (for an account) from the "is enabled by channels" question below
-        notificationService.createNotificationChannelsForAccount(activeAccount)
+        notificationHelper.createNotificationChannelsForAccount(activeAccount)
 
-        if (notificationService.areNotificationsEnabledBySystem()) {
+        if (notificationHelper.areNotificationsEnabledBySystem()) {
             viewModelScope.launch {
-                notificationService.setupNotifications(activity)
+                notificationHelper.setupNotifications(activity)
             }
         } else {
             viewModelScope.launch {
-                notificationService.disableAllNotifications()
+                notificationHelper.disableAllNotifications()
             }
         }
     }

app/src/main/java/com/keylesspalace/tusky/components/instanceinfo/InstanceInfo.kt

@@ -32,4 +32,5 @@ data class InstanceInfo(
     val version: String?,
     val translationEnabled: Boolean?,
     val mastodonApiVersion: Int?,
+    val vapidKey: String?
 )

app/src/main/java/com/keylesspalace/tusky/components/instanceinfo/InstanceInfoRepository.kt

@@ -147,6 +147,7 @@ class InstanceInfoRepository @Inject constructor(
         version = this?.version,
         translationEnabled = this?.translationEnabled,
         mastodonApiVersion = this?.mastodonApiVersion,
+        vapidKey = this?.vapidKey
     )
 
     private fun Instance.toEntity() = InstanceInfoEntity(
@@ -176,6 +177,7 @@ class InstanceInfoRepository @Inject constructor(
         maxFieldValueLength = this.pleroma?.metadata?.fieldLimits?.valueLength,
         translationEnabled = this.configuration?.translation?.enabled,
         mastodonApiVersion = this.apiVersions?.mastodon,
+        vapidKey = this.configuration?.vapid?.publicKey
     )
 
     private fun InstanceV1.toEntity(instanceName: String) =
@@ -205,6 +207,7 @@ class InstanceInfoRepository @Inject constructor(
             maxFieldValueLength = this.pleroma?.metadata?.fieldLimits?.valueLength,
             translationEnabled = null,
             mastodonApiVersion = null,
+            vapidKey = null
         )
 
     companion object {

app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt

@@ -53,7 +53,7 @@ import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.components.notifications.requests.NotificationRequestsActivity
 import com.keylesspalace.tusky.components.preference.PreferencesFragment.ReadingOrder
 import com.keylesspalace.tusky.components.systemnotifications.NotificationChannelData
-import com.keylesspalace.tusky.components.systemnotifications.NotificationService
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.databinding.FragmentTimelineNotificationsBinding
 import com.keylesspalace.tusky.databinding.NotificationsFilterBinding
 import com.keylesspalace.tusky.entity.Status
@@ -100,7 +100,7 @@ class NotificationsFragment :
     lateinit var eventHub: EventHub
 
     @Inject
-    lateinit var notificationService: NotificationService
+    lateinit var notificationHelper: NotificationHelper
 
     private val binding by viewBinding(FragmentTimelineNotificationsBinding::bind)
 
@@ -269,7 +269,7 @@ class NotificationsFragment :
         viewLifecycleOwner.lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 accountManager.activeAccount?.let { account ->
-                    notificationService.clearNotificationsForAccount(account)
+                    notificationHelper.clearNotificationsForAccount(account)
                 }
             }
         }

app/src/main/java/com/keylesspalace/tusky/components/notifications/SeveredRelationshipNotificationViewHolder.kt

@@ -16,7 +16,7 @@
 package com.keylesspalace.tusky.components.notifications
 
 import androidx.recyclerview.widget.RecyclerView
-import com.keylesspalace.tusky.components.systemnotifications.NotificationService
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.databinding.ItemSeveredRelationshipNotificationBinding
 import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.viewdata.NotificationViewData
@@ -37,7 +37,7 @@ class SeveredRelationshipNotificationViewHolder(
         val event = viewData.event!!
         val context = binding.root.context
 
-        binding.severedRelationshipText.text = NotificationService.severedRelationShipText(
+        binding.severedRelationshipText.text = NotificationHelper.severedRelationShipText(
             context,
             event,
             instanceName

app/src/main/java/com/keylesspalace/tusky/components/preference/NotificationPreferencesFragment.kt

@@ -18,7 +18,7 @@ package com.keylesspalace.tusky.components.preference
 import android.os.Bundle
 import androidx.lifecycle.lifecycleScope
 import com.keylesspalace.tusky.R
-import com.keylesspalace.tusky.components.systemnotifications.NotificationService
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.entity.AccountEntity
 import com.keylesspalace.tusky.settings.PrefKeys
@@ -36,7 +36,7 @@ class NotificationPreferencesFragment : BasePreferencesFragment() {
     lateinit var accountManager: AccountManager
 
     @Inject
-    lateinit var notificationService: NotificationService
+    lateinit var notificationHelper: NotificationHelper
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         val activeAccount = accountManager.activeAccount ?: return
@@ -48,10 +48,10 @@ class NotificationPreferencesFragment : BasePreferencesFragment() {
                 isChecked = activeAccount.notificationsEnabled
                 setOnPreferenceChangeListener { _, newValue ->
                     updateAccount { copy(notificationsEnabled = newValue as Boolean) }
-                    if (notificationService.areNotificationsEnabledBySystem()) {
-                        notificationService.enablePullNotifications()
+                    if (notificationHelper.areNotificationsEnabledBySystem()) {
+                        notificationHelper.enablePullNotifications()
                     } else {
-                        notificationService.disablePullNotifications()
+                        notificationHelper.disablePullNotifications()
                     }
                     true
                 }

app/src/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationFetcher.kt

@@ -43,7 +43,7 @@ class NotificationFetcher @Inject constructor(
     private val mastodonApi: MastodonApi,
     private val accountManager: AccountManager,
     private val eventHub: EventHub,
-    private val notificationService: NotificationService,
+    private val notificationHelper: NotificationHelper,
 ) {
     suspend fun fetchAndShow(accountId: Long?) {
         for (account in accountManager.accounts) {
@@ -54,14 +54,14 @@ class NotificationFetcher @Inject constructor(
             if (account.notificationsEnabled) {
                 try {
                     val notifications = fetchNewNotifications(account)
-                        .filter { notificationService.filterNotification(account, it.type) }
+                        .filter { notificationHelper.filterNotification(account, it.type) }
                         .sortedWith(
                             compareBy({ it.id.length }, { it.id })
                         ) // oldest notifications first
 
                     eventHub.dispatch(NewNotificationsEvent(account.accountId, notifications))
 
-                    notificationService.show(account, notifications)
+                    notificationHelper.show(account, notifications)
                 } catch (e: Exception) {
                     Log.e(TAG, "Error while fetching notifications", e)
                 }