Turn MessageRetrievalService into IncomingMessageObserver.
Due to an Android P bug, we basically need to stop calling startService() in onResume()/onPause(). That means I had to turn MessageRetrieval service into a singlton instead of a service. I also moved the offending KeyCachingService calls into static methods that didn't have to start the service.pull/1/head
Greyson Parrelli
7 years ago
parent
7a6d863ff7
commit
45e0bb281f
@ -0,0 +1,202 @@
|
|||||||
|
package org.thoughtcrime.securesms.service;
|
||||||
|
|
||||||
|
import android.app.Service;
|
||||||
|
import android.arch.lifecycle.DefaultLifecycleObserver;
|
||||||
|
import android.arch.lifecycle.LifecycleOwner;
|
||||||
|
import android.arch.lifecycle.ProcessLifecycleOwner;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.IBinder;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.v4.app.NotificationCompat;
|
||||||
|
import android.support.v4.content.ContextCompat;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.logging.Log;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.ApplicationContext;
|
||||||
|
import org.thoughtcrime.securesms.R;
|
||||||
|
import org.thoughtcrime.securesms.dependencies.InjectableType;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirementProvider;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.requirements.RequirementListener;
|
||||||
|
import org.thoughtcrime.securesms.jobs.PushContentReceiveJob;
|
||||||
|
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
||||||
|
import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
|
import org.whispersystems.libsignal.InvalidVersionException;
|
||||||
|
import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
|
||||||
|
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.TimeoutException;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
public class IncomingMessageObserver implements InjectableType, RequirementListener {
|
||||||
|
|
||||||
|
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 final Context context;
|
||||||
|
private final NetworkRequirement networkRequirement;
|
||||||
|
|
||||||
|
private boolean appVisible;
|
||||||
|
|
||||||
|
@Inject SignalServiceMessageReceiver receiver;
|
||||||
|
@Inject SignalServiceNetworkAccess networkAccess;
|
||||||
|
|
||||||
|
public IncomingMessageObserver(@NonNull Context context) {
|
||||||
|
ApplicationContext.getInstance(context).injectDependencies(this);
|
||||||
|
|
||||||
|
this.context = context;
|
||||||
|
this.networkRequirement = new NetworkRequirement(context);
|
||||||
|
|
||||||
|
new NetworkRequirementProvider(context).setListener(this);
|
||||||
|
new MessageRetrievalThread().start();
|
||||||
|
|
||||||
|
if (TextSecurePreferences.isGcmDisabled(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 onRequirementStatusChanged() {
|
||||||
|
synchronized (this) {
|
||||||
|
notifyAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized void onAppForegrounded() {
|
||||||
|
appVisible = true;
|
||||||
|
notifyAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized void onAppBackgrounded() {
|
||||||
|
appVisible = false;
|
||||||
|
notifyAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized boolean isConnectionNecessary() {
|
||||||
|
boolean isGcmDisabled = TextSecurePreferences.isGcmDisabled(context);
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Network requirement: %s, app visible: %s, gcm disabled: %b",
|
||||||
|
networkRequirement.isPresent(), appVisible, isGcmDisabled));
|
||||||
|
|
||||||
|
return TextSecurePreferences.isPushRegistered(context) &&
|
||||||
|
TextSecurePreferences.isWebsocketRegistered(context) &&
|
||||||
|
(appVisible || isGcmDisabled) &&
|
||||||
|
networkRequirement.isPresent() &&
|
||||||
|
!networkAccess.isCensored(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized void waitForConnectionNecessary() {
|
||||||
|
try {
|
||||||
|
while (!isConnectionNecessary()) wait();
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void shutdown(SignalServiceMessagePipe pipe) {
|
||||||
|
try {
|
||||||
|
pipe.shutdown();
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static @Nullable SignalServiceMessagePipe getPipe() {
|
||||||
|
return pipe;
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
SignalServiceMessagePipe localPipe = pipe;
|
||||||
|
|
||||||
|
try {
|
||||||
|
while (isConnectionNecessary()) {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Reading message...");
|
||||||
|
localPipe.read(REQUEST_TIMEOUT_MINUTES, TimeUnit.MINUTES,
|
||||||
|
envelope -> {
|
||||||
|
Log.i(TAG, "Retrieved envelope! " + envelope.getSource());
|
||||||
|
new PushContentReceiveJob(context).processEnvelope(envelope);
|
||||||
|
});
|
||||||
|
} 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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_signal_grey_24dp);
|
||||||
|
startForeground(FOREGROUND_ID, builder.build());
|
||||||
|
|
||||||
|
return Service.START_STICKY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,247 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.service;
|
|
||||||
|
|
||||||
import android.app.Service;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.IBinder;
|
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v4.app.NotificationCompat;
|
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.logging.Log;
|
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.ApplicationContext;
|
|
||||||
import org.thoughtcrime.securesms.R;
|
|
||||||
import org.thoughtcrime.securesms.dependencies.InjectableType;
|
|
||||||
import org.thoughtcrime.securesms.gcm.GcmBroadcastReceiver;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirementProvider;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.requirements.RequirementListener;
|
|
||||||
import org.thoughtcrime.securesms.jobs.PushContentReceiveJob;
|
|
||||||
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
|
||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
||||||
import org.whispersystems.libsignal.InvalidVersionException;
|
|
||||||
import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
|
|
||||||
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
|
|
||||||
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.concurrent.TimeoutException;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
public class MessageRetrievalService extends Service implements InjectableType, RequirementListener {
|
|
||||||
|
|
||||||
private static final String TAG = MessageRetrievalService.class.getSimpleName();
|
|
||||||
|
|
||||||
public static final String ACTION_ACTIVITY_STARTED = "ACTIVITY_STARTED";
|
|
||||||
public static final String ACTION_ACTIVITY_FINISHED = "ACTIVITY_FINISHED";
|
|
||||||
public static final String ACTION_PUSH_RECEIVED = "PUSH_RECEIVED";
|
|
||||||
public static final String ACTION_INITIALIZE = "INITIALIZE";
|
|
||||||
public static final int FOREGROUND_ID = 313399;
|
|
||||||
|
|
||||||
private static final long REQUEST_TIMEOUT_MINUTES = 1;
|
|
||||||
|
|
||||||
private NetworkRequirement networkRequirement;
|
|
||||||
private NetworkRequirementProvider networkRequirementProvider;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public SignalServiceMessageReceiver receiver;
|
|
||||||
|
|
||||||
private int activeActivities = 0;
|
|
||||||
private List<Intent> pushPending = new LinkedList<>();
|
|
||||||
private MessageRetrievalThread retrievalThread = null;
|
|
||||||
|
|
||||||
public static SignalServiceMessagePipe pipe = null;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate() {
|
|
||||||
super.onCreate();
|
|
||||||
ApplicationContext.getInstance(this).injectDependencies(this);
|
|
||||||
|
|
||||||
networkRequirement = new NetworkRequirement(this);
|
|
||||||
networkRequirementProvider = new NetworkRequirementProvider(this);
|
|
||||||
|
|
||||||
networkRequirementProvider.setListener(this);
|
|
||||||
|
|
||||||
retrievalThread = new MessageRetrievalThread();
|
|
||||||
retrievalThread.start();
|
|
||||||
|
|
||||||
setForegroundIfNecessary();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int onStartCommand(Intent intent, int flags, int startId) {
|
|
||||||
if (intent == null) return START_STICKY;
|
|
||||||
|
|
||||||
if (ACTION_ACTIVITY_STARTED.equals(intent.getAction())) incrementActive();
|
|
||||||
else if (ACTION_ACTIVITY_FINISHED.equals(intent.getAction())) decrementActive();
|
|
||||||
else if (ACTION_PUSH_RECEIVED.equals(intent.getAction())) incrementPushReceived(intent);
|
|
||||||
|
|
||||||
return START_STICKY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
|
|
||||||
if (retrievalThread != null) {
|
|
||||||
retrievalThread.stopThread();
|
|
||||||
}
|
|
||||||
|
|
||||||
sendBroadcast(new Intent("org.thoughtcrime.securesms.RESTART"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRequirementStatusChanged() {
|
|
||||||
synchronized (this) {
|
|
||||||
notifyAll();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IBinder onBind(Intent intent) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setForegroundIfNecessary() {
|
|
||||||
if (TextSecurePreferences.isGcmDisabled(this)) {
|
|
||||||
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NotificationChannels.OTHER);
|
|
||||||
builder.setContentTitle(getString(R.string.MessageRetrievalService_signal));
|
|
||||||
builder.setContentText(getString(R.string.MessageRetrievalService_background_connection_enabled));
|
|
||||||
builder.setPriority(NotificationCompat.PRIORITY_MIN);
|
|
||||||
builder.setWhen(0);
|
|
||||||
builder.setSmallIcon(R.drawable.ic_signal_grey_24dp);
|
|
||||||
startForeground(FOREGROUND_ID, builder.build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized void incrementActive() {
|
|
||||||
activeActivities++;
|
|
||||||
Log.d(TAG, "Active Count: " + activeActivities);
|
|
||||||
notifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized void decrementActive() {
|
|
||||||
activeActivities--;
|
|
||||||
Log.d(TAG, "Active Count: " + activeActivities);
|
|
||||||
notifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized void incrementPushReceived(Intent intent) {
|
|
||||||
pushPending.add(intent);
|
|
||||||
notifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized void decrementPushReceived() {
|
|
||||||
if (!pushPending.isEmpty()) {
|
|
||||||
Intent intent = pushPending.remove(0);
|
|
||||||
GcmBroadcastReceiver.completeWakefulIntent(intent);
|
|
||||||
notifyAll();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized boolean isConnectionNecessary() {
|
|
||||||
boolean isGcmDisabled = TextSecurePreferences.isGcmDisabled(this);
|
|
||||||
|
|
||||||
Log.d(TAG, String.format("Network requirement: %s, active activities: %s, push pending: %s, gcm disabled: %b",
|
|
||||||
networkRequirement.isPresent(), activeActivities, pushPending.size(), isGcmDisabled));
|
|
||||||
|
|
||||||
return TextSecurePreferences.isPushRegistered(this) &&
|
|
||||||
TextSecurePreferences.isWebsocketRegistered(this) &&
|
|
||||||
(activeActivities > 0 || !pushPending.isEmpty() || isGcmDisabled) &&
|
|
||||||
networkRequirement.isPresent();
|
|
||||||
}
|
|
||||||
|
|
||||||
private synchronized void waitForConnectionNecessary() {
|
|
||||||
try {
|
|
||||||
while (!isConnectionNecessary()) wait();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
throw new AssertionError(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void shutdown(SignalServiceMessagePipe pipe) {
|
|
||||||
try {
|
|
||||||
pipe.shutdown();
|
|
||||||
} catch (Throwable t) {
|
|
||||||
Log.w(TAG, t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerActivityStarted(Context activity) {
|
|
||||||
Intent intent = new Intent(activity, MessageRetrievalService.class);
|
|
||||||
intent.setAction(MessageRetrievalService.ACTION_ACTIVITY_STARTED);
|
|
||||||
activity.startService(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerActivityStopped(Context activity) {
|
|
||||||
Intent intent = new Intent(activity, MessageRetrievalService.class);
|
|
||||||
intent.setAction(MessageRetrievalService.ACTION_ACTIVITY_FINISHED);
|
|
||||||
activity.startService(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static @Nullable SignalServiceMessagePipe getPipe() {
|
|
||||||
return pipe;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class MessageRetrievalThread extends Thread implements Thread.UncaughtExceptionHandler {
|
|
||||||
|
|
||||||
private AtomicBoolean stopThread = new AtomicBoolean(false);
|
|
||||||
|
|
||||||
MessageRetrievalThread() {
|
|
||||||
super("MessageRetrievalService");
|
|
||||||
setUncaughtExceptionHandler(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
while (!stopThread.get()) {
|
|
||||||
Log.i(TAG, "Waiting for websocket state change....");
|
|
||||||
waitForConnectionNecessary();
|
|
||||||
|
|
||||||
Log.i(TAG, "Making websocket connection....");
|
|
||||||
pipe = receiver.createMessagePipe();
|
|
||||||
|
|
||||||
SignalServiceMessagePipe localPipe = pipe;
|
|
||||||
|
|
||||||
try {
|
|
||||||
while (isConnectionNecessary() && !stopThread.get()) {
|
|
||||||
try {
|
|
||||||
Log.i(TAG, "Reading message...");
|
|
||||||
localPipe.read(REQUEST_TIMEOUT_MINUTES, TimeUnit.MINUTES,
|
|
||||||
envelope -> {
|
|
||||||
Log.i(TAG, "Retrieved envelope! " + envelope.getSource());
|
|
||||||
new PushContentReceiveJob(getApplicationContext()).processEnvelope(envelope);
|
|
||||||
decrementPushReceived();
|
|
||||||
});
|
|
||||||
} 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
Log.i(TAG, "Looping...");
|
|
||||||
}
|
|
||||||
|
|
||||||
Log.i(TAG, "Exiting...");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void stopThread() {
|
|
||||||
stopThread.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void uncaughtException(Thread t, Throwable e) {
|
|
||||||
Log.w(TAG, "*** Uncaught exception!");
|
|
||||||
Log.w(TAG, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue