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

Try to instantly reconnect to WS on first error

Browse Source
This commit is contained in:
Jannis Mattheis
2018-05-20 15:20:01 +02:00
parent 08bb8e50b1
commit 8fa2660b44
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
android/app/src/main/java/de/gotify/PushService.java
View File

@@ -37,6 +37,7 @@ public class PushService extends Service {
private Handler handler = null; private Handler handler = null;
private WebSocket socket = null; private WebSocket socket = null;
private Gson gson = null; private Gson gson = null;
private long lastError = 0;
private SharedPreferences.OnSharedPreferenceChangeListener listener = new SharedPreferences.OnSharedPreferenceChangeListener() { private SharedPreferences.OnSharedPreferenceChangeListener listener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override @Override
@@ -139,18 +140,30 @@ public class PushService extends Service {
return; return;
} }
showNotification(-3, "WS Conn Failed", "The websocket connection failed, trying again in a minute: " + t.getMessage()); boolean recentErrored = recentErrored();
lastError = System.currentTimeMillis();
handler.postDelayed(new Runnable() { if (recentErrored) {
@Override Log.i("Waiting one minute to reconnect to the WebSocket (because WebSocket failed recently)");
public void run() { showNotification(-3, "WebSocket connection failed", "The WebSocket connection failed, trying again in a minute: " + t.getMessage());
start(); handler.postDelayed(new Runnable() {
} @Override
}, TimeUnit.MINUTES.toMillis(1)); public void run() {
start();
}
}, TimeUnit.MINUTES.toMillis(1));
} else {
Log.i("Trying to reconnect to WebSocket");
start();
}
} }
}); });
} }
private boolean recentErrored() {
return System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(1) < lastError;
}
private void showNotification(int id, String title, String message) { private void showNotification(int id, String title, String message) {
Intent intent = new Intent(this, MainActivity.class); Intent intent = new Intent(this, MainActivity.class);
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);