Early merge PR #182

Catfriend1 · Mar 9, 2019 · 20e6a42 · 20e6a42
1 parent dff782d
commit 20e6a42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java b/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java
@@ -338,7 +338,7 @@ public LoggingAsyncQueryHandler(ContentResolver contentResolver) {
         protected void onDeleteComplete(int token, Object cookie, int result) {
             super.onUpdateComplete(token, cookie, result);
             if (result == 1 && cookie != null) {
-                // ToDo Log.v(TAG, "onItemFinished: onDeleteComplete: [ok] file=" + cookie.toString() + ", token=" + Integer.toString(token));
+                // Log.v(TAG, "onItemFinished: onDeleteComplete: [ok] file=" + cookie.toString() + ", token=" + Integer.toString(token));
             }
         }
     }

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
@@ -724,7 +724,11 @@ public void unregisterOnServiceStateChangeListener(OnServiceStateChangeListener
      * Called to notify listeners of an API change.
      */
     private void onServiceStateChange(State newState) {
-        Log.i(TAG, "onServiceStateChange: from " + mCurrentState + " to " + newState);
+        if (newState == mCurrentState) {
+            Log.d(TAG, "onServiceStateChange: Called with unchanged state " + newState);
+        } else {
+            Log.i(TAG, "onServiceStateChange: from " + mCurrentState + " to " + newState);
+        }
         mCurrentState = newState;
         mHandler.post(() -> {
             mNotificationHandler.updatePersistentNotification(this);