From 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:08:42 +0530
Subject: added sync preferences

---
 .../keychain/service/KeyserverSyncAdapterService.java          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
index c50f6a6e9..baf649701 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
@@ -162,6 +162,12 @@ public class KeyserverSyncAdapterService extends Service {
                 postponeSync();
             }
         }
+
+        @Override
+        public void onSyncCanceled() {
+            super.onSyncCanceled();
+            cancelUpdates(KeyserverSyncAdapterService.this);
+        }
     }
 
     @Override
@@ -402,7 +408,9 @@ public class KeyserverSyncAdapterService extends Service {
     }
 
     /**
-     * will cancel an update already in progress
+     * will cancel an update already in progress. We send an Intent to cancel it instead of simply
+     * modifying a static variable sync the service is running in a process that is different from
+     * the default application process where the UI code runs.
      *
      * @param context used to send an Intent to the service requesting cancellation.
      */
-- 
cgit v1.2.3