Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Periodically wake the WebSocket, when GCM is disabled #7666

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.WebSocketAlarm;

import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -50,6 +51,7 @@ public class MessageRetrievalService extends Service implements InjectableType,
private int activeActivities = 0;
private List<Intent> pushPending = new LinkedList<>();
private MessageRetrievalThread retrievalThread = null;
private WebSocketAlarm webSocketAlarm = null;

public static SignalServiceMessagePipe pipe = null;

Expand All @@ -66,6 +68,10 @@ public void onCreate() {
retrievalThread = new MessageRetrievalThread();
retrievalThread.start();

if (TextSecurePreferences.isGcmDisabled(this)) {
webSocketAlarm = new WebSocketAlarm(this);
}

setForegroundIfNecessary();
}

Expand All @@ -87,6 +93,10 @@ public void onDestroy() {
retrievalThread.stopThread();
}

if (webSocketAlarm != null) {
webSocketAlarm.disable();
}

sendBroadcast(new Intent("org.thoughtcrime.securesms.RESTART"));
}

Expand Down