aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-21 11:19:44 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-21 11:19:44 +0200
commit2930f83b2a49735a840f2adad4a4c3cb83ac07e0 (patch)
tree9e6e5f1dfe8e0be4473b0325bbaa5ad9c7c2416d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
parent7adf07a9f9bc53ec98338f92b760b75e31559c8e (diff)
downloadopen-keychain-2930f83b2a49735a840f2adad4a4c3cb83ac07e0.tar.gz
open-keychain-2930f83b2a49735a840f2adad4a4c3cb83ac07e0.tar.bz2
open-keychain-2930f83b2a49735a840f2adad4a4c3cb83ac07e0.zip
Change account type
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
index 909c3031c..fbe914b78 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -98,12 +98,12 @@ public class ContactSyncAdapterService extends Service {
}
}
- public static void requestSync(Context context) {
+ public static void requestSync() {
Bundle extras = new Bundle();
// no need to wait for internet connection!
extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
ContentResolver.requestSync(
- new Account(context.getString(R.string.app_name), Constants.PACKAGE_NAME),
+ new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE),
ContactsContract.AUTHORITY,
extras);
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 246804383..021e6bc07 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -455,7 +455,7 @@ public class KeychainIntentService extends IntentService
setProgress(R.string.progress_done, 100, 100);
// make sure new data is synced into contacts
- ContactSyncAdapterService.requestSync(this);
+ ContactSyncAdapterService.requestSync();
/* Output */
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, saveResult);
@@ -506,7 +506,7 @@ public class KeychainIntentService extends IntentService
providerHelper.consolidateDatabaseStep1(this);
}
// make sure new data is synced into contacts
- ContactSyncAdapterService.requestSync(this);
+ ContactSyncAdapterService.requestSync();
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, result);
} catch (Exception e) {
@@ -715,7 +715,7 @@ public class KeychainIntentService extends IntentService
if (success) {
// make sure new data is synced into contacts
- ContactSyncAdapterService.requestSync(this);
+ ContactSyncAdapterService.requestSync();
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
}