diff --git a/app/src/main/java/com/github/gotify/service/ReconnectListener.java b/app/src/main/java/com/github/gotify/service/ReconnectListener.java deleted file mode 100644 index eae2d75..0000000 --- a/app/src/main/java/com/github/gotify/service/ReconnectListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.gotify.service; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import com.github.gotify.log.Log; - -public class ReconnectListener extends BroadcastReceiver { - - private Runnable reconnected; - - ReconnectListener(Runnable reconnected) { - this.reconnected = reconnected; - } - - @Override - public void onReceive(Context context, Intent intent) { - ConnectivityManager cm = - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - - NetworkInfo network = cm.getActiveNetworkInfo(); - - if (network != null && network.isConnected()) { - Log.i("Network reconnected"); - reconnected.run(); - } - } -} diff --git a/app/src/main/java/com/github/gotify/service/WebSocketConnection.java b/app/src/main/java/com/github/gotify/service/WebSocketConnection.java index 2810128..3915d10 100644 --- a/app/src/main/java/com/github/gotify/service/WebSocketConnection.java +++ b/app/src/main/java/com/github/gotify/service/WebSocketConnection.java @@ -41,7 +41,6 @@ class WebSocketConnection { private OnNetworkFailureRunnable onNetworkFailure; private Runnable onReconnected; private State state; - private Runnable onDisconnect; WebSocketConnection( String baseUrl, @@ -84,11 +83,6 @@ class WebSocketConnection { return this; } - synchronized WebSocketConnection onDisconnect(Runnable onDisconnect) { - this.onDisconnect = onDisconnect; - return this; - } - synchronized WebSocketConnection onNetworkFailure(OnNetworkFailureRunnable onNetworkFailure) { this.onNetworkFailure = onNetworkFailure; return this; @@ -224,8 +218,6 @@ class WebSocketConnection { NetworkInfo network = connectivityManager.getActiveNetworkInfo(); if (network == null || !network.isConnected()) { Log.i("WebSocket(" + id + "): Network not connected"); - onDisconnect.run(); - return; } int minutes = Math.min(errorCount * 2 - 1, 20); diff --git a/app/src/main/java/com/github/gotify/service/WebSocketService.java b/app/src/main/java/com/github/gotify/service/WebSocketService.java index e772d7c..3a8c41f 100644 --- a/app/src/main/java/com/github/gotify/service/WebSocketService.java +++ b/app/src/main/java/com/github/gotify/service/WebSocketService.java @@ -111,15 +111,12 @@ public class WebSocketService extends Service { .onBadRequest(this::onBadRequest) .onNetworkFailure( (min) -> foreground(getString(R.string.websocket_failed, min))) - .onDisconnect(this::onDisconnect) .onMessage(this::onMessage) .onReconnected(this::notifyMissedNotifications) .start(); IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); - ReconnectListener receiver = new ReconnectListener(this::doReconnect); - registerReceiver(receiver, intentFilter); picassoHandler.updateAppIds(); } @@ -142,10 +139,6 @@ public class WebSocketService extends Service { })); } - private void onDisconnect() { - foreground(getString(R.string.websocket_no_network)); - } - private void doReconnect() { if (connection == null) { return;