do not connect to MQTT server unless messages need to be sent

also fix version number
ostrya · May 30, 2019 · 5296ffb · 5296ffb
1 parent 2c15593
commit 5296ffb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.ostrya.presencepublisher"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 9
-        versionName "1.4.1"
+        versionCode 10
+        versionName "1.5.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {

diff --git a/app/src/main/java/org/ostrya/presencepublisher/ForegroundService.java b/app/src/main/java/org/ostrya/presencepublisher/ForegroundService.java
@@ -155,7 +155,11 @@ private void registerWatchDog() {
 
     private void start() {
         try {
-            executorService.submit(() -> doSend(getMessagesToSend()));
+            List<String> messages = getMessagesToSend();
+            if (!messages.isEmpty()) {
+                Log.d(TAG, "Schedule sending messages");
+                executorService.submit(() -> doSend(messages));
+            }
         } catch (RuntimeException e) {
             Log.w(TAG, "Error while getting messages to send", e);
         }
@@ -194,7 +198,7 @@ private List<String> getMessagesToSend() {
             }
         }
         if (content.isEmpty() && sharedPreferences.getBoolean(OFFLINE_PING, false)) {
-            Log.d(TAG, "Correct Wi-Fi disconnected");
+            Log.d(TAG, "Not connected to any expected network");
             content.add(sharedPreferences.getString(CONTENT_OFFLINE, DEFAULT_CONTENT_OFFLINE));
         }
         return content;