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

Improve detection of websocket drained status.

Browse Source 
Will now work when you lose and regain network. Also removes the
unnecessary InitialMessageRetriever.
This commit is contained in:
Greyson Parrelli
2020-07-21 10:38:42 -04:00
committed by GitHub
parent 96ce42ae91
commit 662f0b8fb6
10 changed files with 106 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/WebsocketDrainedConstraint.java
View File

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.jobmanager.Constraint;
/**
* A constraint that is met once we have pulled down all messages from the websocket during initial
* load. See {@link org.thoughtcrime.securesms.messages.InitialMessageRetriever}.
* load. See {@link org.thoughtcrime.securesms.messages.IncomingMessageObserver}.
*/
public final class WebsocketDrainedConstraint implements Constraint {
@@ -21,7 +21,7 @@ public final class WebsocketDrainedConstraint implements Constraint {
@Override
public boolean isMet() {
return ApplicationDependencies.getInitialMessageRetriever().isCaughtUp();
return ApplicationDependencies.getIncomingMessageObserver().isWebsocketDrained();
}
@Override

6
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/WebsocketDrainedConstraintObserver.java
View File

@@ -6,8 +6,8 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
/**
* An observer for {@link WebsocketDrainedConstraint}. Will fire when the
* {@link org.thoughtcrime.securesms.messages.InitialMessageRetriever} is caught up.
* An observer for {@link WebsocketDrainedConstraint}. Will fire when the websocket is drained
* (i.e. it has received an empty response).
*/
public class WebsocketDrainedConstraintObserver implements ConstraintObserver {
@@ -16,7 +16,7 @@ public class WebsocketDrainedConstraintObserver implements ConstraintObserver {
private volatile Notifier notifier;
public WebsocketDrainedConstraintObserver() {
ApplicationDependencies.getInitialMessageRetriever().addListener(() -> {
ApplicationDependencies.getIncomingMessageObserver().addWebsocketDrainedListener(() -> {
if (notifier != null) {
notifier.onConstraintMet(REASON);
}