WIP: clean up signal service protos

app/src/main/AndroidManifest.xml

@@ -382,9 +382,6 @@
             android:name="org.thoughtcrime.securesms.service.KeyCachingService"
             android:enabled="true"
             android:exported="false" />
-        <service
-            android:name="org.thoughtcrime.securesms.service.IncomingMessageObserver$ForegroundService"
-            android:enabled="true" />
         <service
             android:name="org.thoughtcrime.securesms.service.DirectShareService"
             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">

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

@@ -84,7 +84,6 @@ import org.thoughtcrime.securesms.notifications.OptimizedMessageNotifier;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
@@ -206,7 +205,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     initializeProfileManager();
     initializePeriodicTasks();
     initializeWebRtc();
-    initializePendingMessages();
     initializeBlobProvider();
     SSKEnvironment.Companion.configure(getTypingStatusRepository(), getReadReceiptManager(), getProfileManager(), messageNotifier, getExpiringMessageManager());
   }
@@ -340,7 +338,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   }
 
   private void initializeDependencyInjection() {
-    communicationModule = new SignalCommunicationModule(this, new SignalServiceNetworkAccess(this));
+    communicationModule = new SignalCommunicationModule(this);
     this.objectGraph = ObjectGraph.create(communicationModule);
   }
 
@@ -409,14 +407,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     }
   }
 
-  private void initializePendingMessages() {
-    if (TextSecurePreferences.getNeedsMessagePull(this)) {
-      Log.i(TAG, "Scheduling a message fetch.");
-      ApplicationContext.getInstance(this).getJobManager().add(new PushNotificationReceiveJob(this));
-      TextSecurePreferences.setNeedsMessagePull(this, false);
-    }
-  }
-
   private void initializeBlobProvider() {
     AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
       BlobProvider.getInstance().onSessionStart(this);

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

@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.jobs.PushDecryptJob;
 import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
 import org.thoughtcrime.securesms.jobs.PushGroupUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushMediaSendJob;
-import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.PushTextSendJob;
 import org.thoughtcrime.securesms.jobs.RequestGroupInfoJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
@@ -32,9 +31,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.session.libsignal.utilities.logging.Log;
 import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
-import org.thoughtcrime.securesms.push.MessageSenderEventListener;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository;
 import org.thoughtcrime.securesms.stickers.StickerRemoteUriLoader;
 import org.thoughtcrime.securesms.util.RealtimeSleepTimer;
@@ -48,8 +45,6 @@ import network.loki.messenger.BuildConfig;
                                      PushTextSendJob.class,
                                      PushMediaSendJob.class,
                                      AttachmentDownloadJob.class,
-                                     IncomingMessageObserver.class,
-                                     PushNotificationReceiveJob.class,
                                      RequestGroupInfoJob.class,
                                      PushGroupUpdateJob.class,
                                      AvatarDownloadJob.class,
@@ -71,15 +66,12 @@ public class SignalCommunicationModule {
   private static final String TAG = SignalCommunicationModule.class.getSimpleName();
 
   private final Context                      context;
-  private final SignalServiceNetworkAccess   networkAccess;
 
   private SignalServiceMessageSender   messageSender;
   private SignalServiceMessageReceiver messageReceiver;
 
-  public SignalCommunicationModule(Context context, SignalServiceNetworkAccess networkAccess) {
+  public SignalCommunicationModule(Context context) {
     this.context       = context;
-    this.networkAccess = networkAccess;
-
   }
 
   @Provides
@@ -87,8 +79,6 @@ public class SignalCommunicationModule {
     if (this.messageSender == null) {
       this.messageSender = new SignalServiceMessageSender(new DynamicCredentialsProvider(context),
                                                           new SignalProtocolStoreImpl(context),
-                                                          Optional.fromNullable(IncomingMessageObserver.getPipe()),
-                                                          Optional.fromNullable(IncomingMessageObserver.getUnidentifiedPipe()),
                                                           TextSecurePreferences.getLocalNumber(context),
                                                           DatabaseFactory.getLokiAPIDatabase(context),
                                                           DatabaseFactory.getLokiThreadDatabase(context),
@@ -97,8 +87,6 @@ public class SignalCommunicationModule {
                                                           DatabaseFactory.getLokiUserDatabase(context),
                                                           DatabaseFactory.getGroupDatabase(context),
                                                           ((ApplicationContext)context.getApplicationContext()).broadcaster);
-    } else {
-      this.messageSender.setMessagePipe(IncomingMessageObserver.getPipe(), IncomingMessageObserver.getUnidentifiedPipe());
     }
 
     return this.messageSender;
@@ -109,8 +97,7 @@ public class SignalCommunicationModule {
     if (this.messageReceiver == null) {
       SleepTimer sleepTimer =  TextSecurePreferences.isFcmDisabled(context) ? new RealtimeSleepTimer(context) : new UptimeSleepTimer();
 
-      this.messageReceiver = new SignalServiceMessageReceiver(networkAccess.getConfiguration(context),
-                                                              new DynamicCredentialsProvider(context),
+      this.messageReceiver = new SignalServiceMessageReceiver(new DynamicCredentialsProvider(context),
                                                               BuildConfig.USER_AGENT,
                                                               new PipeConnectivityListener(),
                                                               sleepTimer);
@@ -119,11 +106,6 @@ public class SignalCommunicationModule {
     return this.messageReceiver;
   }
 
-  @Provides
-  synchronized SignalServiceNetworkAccess provideSignalServiceNetworkAccess() {
-    return networkAccess;
-  }
-
   private static class DynamicCredentialsProvider implements CredentialsProvider {
 
     private final Context context;

app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java

@@ -1,90 +0,0 @@
-package org.thoughtcrime.securesms.jobs;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-
-import org.session.libsession.messaging.jobs.Data;
-import org.thoughtcrime.securesms.dependencies.InjectableType;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.session.libsignal.utilities.logging.Log;
-import org.session.libsignal.service.api.SignalServiceMessageReceiver;
-import org.session.libsignal.service.api.push.exceptions.PushNetworkException;
-
-import org.session.libsession.utilities.TextSecurePreferences;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-public class PushNotificationReceiveJob extends PushReceivedJob implements InjectableType {
-
-  public static final String KEY = "PushNotificationReceiveJob";
-
-  private static final String TAG = PushNotificationReceiveJob.class.getSimpleName();
-
-  @Inject SignalServiceMessageReceiver receiver;
-
-  public PushNotificationReceiveJob(Context context) {
-    this(new Job.Parameters.Builder()
-                           .addConstraint(NetworkConstraint.KEY)
-                           .setQueue("__notification_received")
-                           .setMaxAttempts(3)
-                           .setMaxInstances(1)
-                           .build());
-    setContext(context);
-  }
-
-  private PushNotificationReceiveJob(@NonNull Job.Parameters parameters) {
-    super(parameters);
-  }
-
-  @Override
-  public @NonNull
-  Data serialize() {
-    return Data.EMPTY;
-  }
-
-  @Override
-  public @NonNull String getFactoryKey() {
-    return KEY;
-  }
-
-  @Override
-  public void onRun() throws IOException {
-    pullAndProcessMessages(receiver, TAG, System.currentTimeMillis());
-  }
-
-  public void pullAndProcessMessages(SignalServiceMessageReceiver receiver, String tag, long startTime) throws IOException {
-    synchronized (PushReceivedJob.RECEIVE_LOCK) {
-      receiver.retrieveMessages(envelope -> {
-        Log.i(tag, "Retrieved an envelope." + timeSuffix(startTime));
-        processEnvelope(envelope, false);
-        Log.i(tag, "Successfully processed an envelope." + timeSuffix(startTime));
-      });
-      TextSecurePreferences.setNeedsMessagePull(context, false);
-    }
-  }
-  @Override
-  public boolean onShouldRetry(@NonNull Exception e) {
-    Log.w(TAG, e);
-    return e instanceof PushNetworkException;
-  }
-
-  @Override
-  public void onCanceled() {
-    Log.w(TAG, "***** Failed to download pending message!");
-//    MessageNotifier.notifyMessagesPending(getContext());
-  }
-
-  private static String timeSuffix(long startTime) {
-    return " (" + (System.currentTimeMillis() - startTime) + " ms elapsed)";
-  }
-
-  public static final class Factory implements Job.Factory<PushNotificationReceiveJob> {
-    @Override
-    public @NonNull PushNotificationReceiveJob create(@NonNull Parameters parameters, @NonNull Data data) {
-      return new PushNotificationReceiveJob(parameters);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java

@@ -1,210 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.app.Service;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
-import android.content.Context;
-import android.content.Intent;
-import android.os.IBinder;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.content.ContextCompat;
-
-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.dependencies.InjectableType;
-import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraintObserver;
-import org.thoughtcrime.securesms.jobs.PushContentReceiveJob;
-import org.session.libsignal.utilities.logging.Log;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.session.libsession.utilities.TextSecurePreferences;
-import org.session.libsignal.libsignal.InvalidVersionException;
-import org.session.libsignal.service.api.SignalServiceMessagePipe;
-import org.session.libsignal.service.api.SignalServiceMessageReceiver;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.inject.Inject;
-
-import network.loki.messenger.R;
-
-public class IncomingMessageObserver implements InjectableType, ConstraintObserver.Notifier {
-
-  private static final String TAG = IncomingMessageObserver.class.getSimpleName();
-
-  public  static final  int FOREGROUND_ID            = 313399;
-  private static final long REQUEST_TIMEOUT_MINUTES  = 1;
-
-  private static SignalServiceMessagePipe pipe             = null;
-  private static SignalServiceMessagePipe unidentifiedPipe = null;
-
-  private final Context           context;
-  private final NetworkConstraint networkConstraint;
-
-  private boolean appVisible;
-
-  @Inject SignalServiceMessageReceiver receiver;
-  @Inject SignalServiceNetworkAccess   networkAccess;
-
-  public IncomingMessageObserver(@NonNull Context context) {
-    ApplicationContext.getInstance(context).injectDependencies(this);
-
-    this.context            = context;
-    this.networkConstraint = new NetworkConstraint.Factory(ApplicationContext.getInstance(context)).create();
-
-    new NetworkConstraintObserver(ApplicationContext.getInstance(context)).register(this);
-    new MessageRetrievalThread().start();
-
-    if (TextSecurePreferences.isFcmDisabled(context)) {
-      ContextCompat.startForegroundService(context, new Intent(context, ForegroundService.class));
-    }
-
-    ProcessLifecycleOwner.get().getLifecycle().addObserver(new DefaultLifecycleObserver() {
-      @Override
-      public void onStart(@NonNull LifecycleOwner owner) {
-        onAppForegrounded();
-      }
-
-      @Override
-      public void onStop(@NonNull LifecycleOwner owner) {
-        onAppBackgrounded();
-      }
-    });
-  }
-
-  @Override
-  public void onConstraintMet(@NonNull String reason) {
-    synchronized (this) {
-      notifyAll();
-    }
-  }
-
-  private synchronized void onAppForegrounded() {
-    appVisible = true;
-    notifyAll();
-  }
-
-  private synchronized void onAppBackgrounded() {
-    appVisible = false;
-    notifyAll();
-  }
-
-  private synchronized boolean isConnectionNecessary() {
-    boolean isGcmDisabled = TextSecurePreferences.isFcmDisabled(context);
-
-    Log.d(TAG, String.format("Network requirement: %s, app visible: %s, gcm disabled: %b",
-                             networkConstraint.isMet(), appVisible, isGcmDisabled));
-
-    return TextSecurePreferences.isPushRegistered(context)      &&
-           TextSecurePreferences.isWebsocketRegistered(context) &&
-           (appVisible || isGcmDisabled)                        &&
-           networkConstraint.isMet()                       &&
-           !networkAccess.isCensored(context);
-  }
-
-  private synchronized void waitForConnectionNecessary() {
-    try {
-      while (!isConnectionNecessary()) wait();
-    } catch (InterruptedException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  private void shutdown(SignalServiceMessagePipe pipe, SignalServiceMessagePipe unidentifiedPipe) {
-    try {
-      pipe.shutdown();
-      unidentifiedPipe.shutdown();
-    } catch (Throwable t) {
-      Log.w(TAG, t);
-    }
-  }
-
-  public static @Nullable SignalServiceMessagePipe getPipe() {
-    return pipe;
-  }
-
-  public static @Nullable SignalServiceMessagePipe getUnidentifiedPipe() {
-    return unidentifiedPipe;
-  }
-
-  private class MessageRetrievalThread extends Thread implements Thread.UncaughtExceptionHandler {
-
-    MessageRetrievalThread() {
-      super("MessageRetrievalService");
-      setUncaughtExceptionHandler(this);
-    }
-
-    @Override
-    public void run() {
-      while (true) {
-        Log.i(TAG, "Waiting for websocket state change....");
-        waitForConnectionNecessary();
-
-        Log.i(TAG, "Making websocket connection....");
-        pipe             = receiver.createMessagePipe();
-        unidentifiedPipe = receiver.createUnidentifiedMessagePipe();
-
-        SignalServiceMessagePipe localPipe             = pipe;
-        SignalServiceMessagePipe unidentifiedLocalPipe = unidentifiedPipe;
-
-        try {
-          while (isConnectionNecessary()) {
-            try {
-              Log.i(TAG, "Reading message...");
-              localPipe.read(REQUEST_TIMEOUT_MINUTES, TimeUnit.MINUTES,
-                             envelope -> {
-                               Log.i(TAG, "Retrieved envelope! " + String.valueOf(envelope.getSource()));
-                               new PushContentReceiveJob(context).processEnvelope(envelope, false);
-                             });
-            } catch (TimeoutException e) {
-              Log.w(TAG, "Application level read timeout...");
-            } catch (InvalidVersionException e) {
-              Log.w(TAG, e);
-            }
-          }
-        } catch (Throwable e) {
-          Log.w(TAG, e);
-        } finally {
-          Log.w(TAG, "Shutting down pipe...");
-          shutdown(localPipe, unidentifiedLocalPipe);
-        }
-
-        Log.i(TAG, "Looping...");
-      }
-    }
-
-    @Override
-    public void uncaughtException(Thread t, Throwable e) {
-      Log.w(TAG, "*** Uncaught exception!");
-      Log.w(TAG, e);
-    }
-  }
-
-  public static class ForegroundService extends Service {
-
-    @Override
-    public @Nullable IBinder onBind(Intent intent) {
-      return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-      super.onStartCommand(intent, flags, startId);
-
-      NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), NotificationChannels.OTHER);
-      builder.setContentTitle(getApplicationContext().getString(R.string.MessageRetrievalService_signal));
-      builder.setContentText(getApplicationContext().getString(R.string.MessageRetrievalService_background_connection_enabled));
-      builder.setPriority(NotificationCompat.PRIORITY_MIN);
-      builder.setWhen(0);
-      builder.setSmallIcon(R.drawable.ic_notification);
-      startForeground(FOREGROUND_ID, builder.build());
-
-      return Service.START_STICKY;
-    }
-  }
-}