From 8fa2660b446a0972ae1b0bfacf25e2d5af98a670 Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Sun, 20 May 2018 15:20:01 +0200
Subject: [PATCH] Try to instantly reconnect to WS on first error

---
 .../src/main/java/de/gotify/PushService.java  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/java/de/gotify/PushService.java b/android/app/src/main/java/de/gotify/PushService.java
index 379e0f5..a2a48bd 100644
--- a/android/app/src/main/java/de/gotify/PushService.java
+++ b/android/app/src/main/java/de/gotify/PushService.java
@@ -37,6 +37,7 @@ public class PushService extends Service {
     private Handler handler = null;
     private WebSocket socket = null;
     private Gson gson = null;
+    private long lastError = 0;
 
     private SharedPreferences.OnSharedPreferenceChangeListener listener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
@@ -139,18 +140,30 @@ public class PushService extends Service {
                     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() {
-                    @Override
-                    public void run() {
-                        start();
-                    }
-                }, TimeUnit.MINUTES.toMillis(1));
+                if (recentErrored) {
+                    Log.i("Waiting one minute to reconnect to the WebSocket (because WebSocket failed recently)");
+                    showNotification(-3, "WebSocket connection failed", "The WebSocket connection failed, trying again in a minute: " + t.getMessage());
+                    handler.postDelayed(new Runnable() {
+                        @Override
+                        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) {
         Intent intent = new Intent(this, MainActivity.class);
         PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);