UnifiedPush

Author: p1gp1g

app/build.gradle

@@ -134,6 +134,10 @@ android {
         androidTest {
             java.srcDirs += "$projectDir/src/testShared"
         }
+
+        main {
+            java.srcDirs += "$projectDir/src/unifiedpush/java"
+        }
     }
 
     compileOptions {
@@ -448,6 +452,8 @@ dependencies {
     implementation libs.androidx.asynclayoutinflater.appcompat
     implementation libs.androidx.webkit
 
+    implementation 'com.github.UnifiedPush:android-connector:2.1.1'
+
     gmsImplementation (libs.firebase.messaging) {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'

app/proguard/proguard.cfg

@@ -3,6 +3,7 @@
 -keep class org.whispersystems.** { *; }
 -keep class org.signal.libsignal.protocol.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
+-keep class im.molly.unifiedpush.** { *; }
 -keepclassmembers class ** {
     public void onEvent*(**);
 }

app/src/main/AndroidManifest.xml

@@ -1260,6 +1260,15 @@
         android:enabled="@bool/enable_alarm_manager"
         android:exported="false"/>
 
+    <receiver android:exported="true"  android:enabled="true"  android:name="im.molly.unifiedpush.receiver.UnifiedPushReceiver">
+        <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"/>
+        </intent-filter>
+    </receiver>
+
     <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
 </application>

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -110,13 +110,15 @@
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
+import im.molly.unifiedpush.util.UnifiedPushHelper;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.security.Security;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import im.molly.unifiedpush.jobs.UnifiedPushRefreshJob;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -468,14 +470,19 @@ private void initializeNetworkSettings() {
     }
   }
 
-  private void initializeFcmCheck() {
+  public void initializeFcmCheck() {
     if (!SignalStore.account().isRegistered()) {
       return;
     }
 
     PlayServicesUtil.PlayServicesStatus fcmStatus = PlayServicesUtil.getPlayServicesStatus(this);
 
-    if (fcmStatus == PlayServicesUtil.PlayServicesStatus.DISABLED) {
+    if (UnifiedPushHelper.isUnifiedPushAvailable()
+        || fcmStatus == PlayServicesUtil.PlayServicesStatus.DISABLED) {
+      if (!SignalStore.unifiedpush().getAirGaped()) {
+        ApplicationDependencies.getJobManager().add(new UnifiedPushRefreshJob());
+      }
+      ApplicationDependencies.getJobManager().cancel(new FcmRefreshJob().getId());
       if (SignalStore.account().isFcmEnabled()) {
         Log.i(TAG, "Play Services are disabled. Disabling FCM.");
         SignalStore.account().setFcmEnabled(false);
@@ -490,10 +497,12 @@ private void initializeFcmCheck() {
                SignalStore.account().getFcmTokenLastSetTime() < 0) {
       Log.i(TAG, "Play Services are newly-available. Updating to use FCM.");
       SignalStore.account().setFcmEnabled(true);
+      ApplicationDependencies.getJobManager().cancel(new UnifiedPushRefreshJob().getId());
       ApplicationDependencies.getJobManager().startChain(new FcmRefreshJob())
                                              .then(new RefreshAttributesJob())
                                              .enqueue();
     } else {
+      ApplicationDependencies.getJobManager().cancel(new UnifiedPushRefreshJob().getId());
       long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
 
       if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {

app/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java

@@ -17,6 +17,8 @@
 import org.thoughtcrime.securesms.util.PowerManagerCompat;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import im.molly.unifiedpush.util.UnifiedPushHelper;
+
 @SuppressLint("BatteryLife")
 public class DozeReminder extends Reminder {
 
@@ -34,6 +36,7 @@ public DozeReminder(@NonNull final Context context) {
   public static boolean isEligible(Context context) {
     return !SignalStore.account().isFcmEnabled()                   &&
            !TextSecurePreferences.hasPromptedOptimizeDoze(context) &&
+           !UnifiedPushHelper.isUnifiedPushAvailable()             &&
            !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName());
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt

@@ -29,6 +29,7 @@ import org.thoughtcrime.securesms.components.settings.PreferenceViewHolder
 import org.thoughtcrime.securesms.components.settings.RadioListPreference
 import org.thoughtcrime.securesms.components.settings.RadioListPreferenceViewHolder
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.keyvalue.SettingsValues.NotificationDeliveryMethod
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.util.RingtoneUtil
@@ -59,6 +60,11 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
   private val ledBlinkValues by lazy { resources.getStringArray(R.array.pref_led_blink_pattern_values) }
   private val ledBlinkLabels by lazy { resources.getStringArray(R.array.pref_led_blink_pattern_entries) }
 
+  private val notificationMethodValues = NotificationDeliveryMethod.values().filterNot {
+    !SignalStore.account().fcmEnabled && it == NotificationDeliveryMethod.FCM
+  }
+  private val notificationMethodLabels by lazy { notificationMethodValues.map { resources.getString(it.getStringId()) }.toTypedArray() }
+
   private lateinit var viewModel: NotificationsSettingsViewModel
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -259,6 +265,28 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
           viewModel.setNotifyWhenContactJoinsSignal(!state.notifyWhenContactJoinsSignal)
         }
       )
+
+      dividerPref()
+
+      sectionHeaderPref(R.string.NotificationsSettingsFragment__pushStrategy)
+
+      radioListPref(
+        title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__deliveryMethod),
+        listItems = notificationMethodLabels,
+        selected = notificationMethodValues.indexOf(state.notificationDeliveryMethod),
+        onSelected = {
+          viewModel.setNotificationDeliveryMethod(notificationMethodValues[it])
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpush),
+        summary = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpushDescription),
+        isEnabled = state.notificationDeliveryMethod == NotificationDeliveryMethod.UNIFIEDPUSH,
+        onClick = {
+          findNavController().safeNavigate(R.id.action_notificationsSettingsFragment_to_unifiedPushFragment)
+        }
+      )
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt

@@ -1,11 +1,13 @@
 package org.thoughtcrime.securesms.components.settings.app.notifications
 
 import android.net.Uri
+import org.thoughtcrime.securesms.keyvalue.SettingsValues.NotificationDeliveryMethod
 
 data class NotificationsSettingsState(
   val messageNotificationsState: MessageNotificationsState,
   val callNotificationsState: CallNotificationsState,
-  val notifyWhenContactJoinsSignal: Boolean
+  val notifyWhenContactJoinsSignal: Boolean,
+  val notificationDeliveryMethod: NotificationDeliveryMethod
 )
 
 data class MessageNotificationsState(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt

@@ -5,12 +5,19 @@ import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+
+import im.molly.unifiedpush.util.UnifiedPushHelper
+import org.signal.core.util.concurrent.SignalExecutors
+import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.keyvalue.SettingsValues.NotificationDeliveryMethod
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor
 import org.thoughtcrime.securesms.util.livedata.Store
+import org.unifiedpush.android.connector.UnifiedPush
 
 class NotificationsSettingsViewModel(private val sharedPreferences: SharedPreferences) : ViewModel() {
 
@@ -24,6 +31,7 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
   private val store = Store(getState())
 
   val state: LiveData<NotificationsSettingsState> = store.stateLiveData
+  private val EXECUTOR = SerialMonoLifoExecutor(SignalExecutors.UNBOUNDED)
 
   fun setMessageNotificationsEnabled(enabled: Boolean) {
     SignalStore.settings().isMessageNotificationsEnabled = enabled
@@ -94,6 +102,29 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
     store.update { getState() }
   }
 
+  fun setNotificationDeliveryMethod(method: NotificationDeliveryMethod) {
+    SignalStore.settings().notificationDeliveryMethod = method
+    SignalStore.unifiedpush().enabled = method == NotificationDeliveryMethod.UNIFIEDPUSH
+    SignalStore.internalValues().isWebsocketModeForced = method == NotificationDeliveryMethod.WEBSOCKET
+    val context = ApplicationContext.getInstance()
+    if (method == NotificationDeliveryMethod.UNIFIEDPUSH) {
+      UnifiedPush.getDistributors(context).getOrNull(0)?.let {
+        store.update { getState() }
+        EXECUTOR.enqueue {
+          UnifiedPush.saveDistributor(context, it)
+          UnifiedPush.registerApp(context)
+          UnifiedPushHelper.initializeMollySocketLinkedDevice(context)
+        }
+        // Do not enable if there is no distributor
+      } ?: return
+    } else {
+      UnifiedPush.unregisterApp(context)
+      SignalStore.unifiedpush().airGaped = false
+      SignalStore.unifiedpush().mollySocketUrl = null
+    }
+    store.update { getState() }
+  }
+
   private fun getState(): NotificationsSettingsState = NotificationsSettingsState(
     messageNotificationsState = MessageNotificationsState(
       notificationsEnabled = SignalStore.settings().isMessageNotificationsEnabled,
@@ -111,7 +142,8 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
       ringtone = SignalStore.settings().callRingtone,
       vibrateEnabled = SignalStore.settings().isCallVibrateEnabled
     ),
-    notifyWhenContactJoinsSignal = SignalStore.settings().isNotifyWhenContactJoinsSignal
+    notifyWhenContactJoinsSignal = SignalStore.settings().isNotifyWhenContactJoinsSignal,
+    notificationDeliveryMethod = SignalStore.settings().notificationDeliveryMethod
   )
 
   class Factory(private val sharedPreferences: SharedPreferences) : ViewModelProvider.Factory {

app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java

@@ -99,6 +99,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import im.molly.unifiedpush.util.UnifiedPushHelper;
+
 /**
  * Implementation of {@link ApplicationDependencies.Provider} that provides real app dependencies.
  */
@@ -285,7 +287,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
 
   @Override
   public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier) {
-    SleepTimer                   sleepTimer      = !SignalStore.account().isFcmEnabled() || SignalStore.internalValues().isWebsocketModeForced() ? new AlarmSleepTimer(context) : new UptimeSleepTimer() ;
+    SleepTimer                   sleepTimer      = !UnifiedPushHelper.isPushAvailable() || SignalStore.internalValues().isWebsocketModeForced() ? new AlarmSleepTimer(context) : new UptimeSleepTimer() ;
     SignalWebSocketHealthMonitor healthMonitor   = new SignalWebSocketHealthMonitor(context, sleepTimer);
     SignalWebSocket              signalWebSocket = new SignalWebSocket(provideWebSocketFactory(signalServiceConfigurationSupplier, healthMonitor));
 

app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java

@@ -88,7 +88,7 @@ public void onSendError(@NonNull String s, @NonNull Exception e) {
     Log.w(TAG, "onSendError()", e);
   }
 
-  private static void handleReceivedNotification(Context context, @Nullable RemoteMessage remoteMessage) {
+  public static void handleReceivedNotification(Context context, @Nullable RemoteMessage remoteMessage) {
     boolean highPriority = remoteMessage != null && remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH;
     try {
       Log.d(TAG, String.format(Locale.US, "[handleReceivedNotification] API: %s, RemoteMessagePriority: %s", Build.VERSION.SDK_INT, remoteMessage != null ? remoteMessage.getPriority() : "n/a"));