Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep web socket open during calling to improve message delivery.

Browse Source
This commit is contained in:
Cody Henthorne
2022-08-03 14:16:20 -04:00
committed by Greyson Parrelli
parent 120dda6e68
commit b002235ef7
3 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
View File

@@ -14,10 +14,12 @@ import android.os.IBinder;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -31,6 +33,7 @@ import org.thoughtcrime.securesms.webrtc.locks.LockManager;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
* Provide a foreground service for {@link SignalCallManager} to leverage to run in the background when necessary. Also
@@ -38,7 +41,8 @@ import java.util.Set;
*/
public final class WebRtcCallService extends Service implements SignalAudioManager.EventListener {
private static final String TAG = Log.tag(WebRtcCallService.class);
private static final String TAG = Log.tag(WebRtcCallService.class);
private static final String WEBSOCKET_KEEP_ALIVE_TOKEN = WebRtcCallService.class.getName();
private static final String ACTION_UPDATE = "UPDATE";
private static final String ACTION_STOP = "STOP";
@@ -52,7 +56,10 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
private static final String EXTRA_ENABLED = "ENABLED";
private static final String EXTRA_AUDIO_COMMAND = "AUDIO_COMMAND";
private static final int INVALID_NOTIFICATION_ID = -1;
private static final int INVALID_NOTIFICATION_ID = -1;
private static final long REQUEST_WEBSOCKET_STAY_OPEN_DELAY = TimeUnit.MINUTES.toMillis(1);
private final WebSocketKeepAliveTask webSocketKeepAliveTask = new WebSocketKeepAliveTask();
private SignalCallManager callManager;
@@ -147,15 +154,20 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
if (!AndroidTelecomUtil.getTelecomSupported()) {
TelephonyUtil.getManager(this).listen(hangUpRtcOnDeviceCallAnswered, PhoneStateListener.LISTEN_NONE);
}
webSocketKeepAliveTask.stop();
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
if (intent == null || intent.getAction() == null) {
setCallNotification();
stop();
return START_NOT_STICKY;
}
Log.i(TAG, "action: " + intent.getAction());
webSocketKeepAliveTask.start();
switch (intent.getAction()) {
case ACTION_UPDATE:
@@ -296,6 +308,37 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
}
}
/**
* Periodically request the web socket stay open if we are doing anything call related.
*/
private class WebSocketKeepAliveTask implements Runnable {
private boolean keepRunning = false;
@MainThread
public void start() {
if (!keepRunning) {
keepRunning = true;
run();
}
}
@MainThread
public void stop() {
keepRunning = false;
ThreadUtil.cancelRunnableOnMain(webSocketKeepAliveTask);
ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
}
@MainThread
@Override
public void run() {
if (keepRunning) {
ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY);
}
}
}
private static class NetworkReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {