kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete reconnect callbacks

Browse Source 
removes obsolete reconnect callbacks scheduled before
network reconnects to prevent unwanted reconnection

also renamed WebSocketConnection.onFailure to onNetworkFailure to clear confusion
This commit is contained in:
eternal-flame-AD
2019-01-05 10:36:49 +08:00
parent 38681012a6
commit 0c3ebb9bce
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/github/gotify/service/WebSocketService.java
View File

@@ -10,7 +10,6 @@ import android.content.IntentFilter;
import android.graphics.Color;
import android.net.ConnectivityManager;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -97,7 +96,8 @@ public class WebSocketService extends Service {
.onOpen(this::onOpen)
.onClose(() -> foreground(getString(R.string.websocket_closed)))
.onBadRequest(this::onBadRequest)
.onFailure((min) -> foreground(getString(R.string.websocket_failed, min)))
.onNetworkFailure(
(min) -> foreground(getString(R.string.websocket_failed, min)))
.onDisconnect(this::onDisconnect)
.onMessage(this::onMessage)
.onReconnected(this::notifyMissedNotifications)
@@ -118,15 +118,7 @@ public class WebSocketService extends Service {
return;
}
new Handler()
.postDelayed(
() -> new Thread(this::notifyAndStart).start(),
TimeUnit.SECONDS.toMillis(5));
}
private void notifyAndStart() {
notifyMissedNotifications();
connection.start();
connection.scheduleReconnect(TimeUnit.SECONDS.toMillis(5));
}
private void onBadRequest(String message) {