From 6bc40d12ad44c4170f10054fb8ea7d2c9459da35 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Mon, 1 Jun 2015 17:43:00 +0530 Subject: renamed KeychainIntentService to KeychainService --- .../sufficientlysecure/keychain/ui/DecryptFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 0dd14a4be..3d87ce894 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -47,7 +47,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.service.KeychainIntentService; +import org.sufficientlysecure.keychain.service.KeychainService; import org.sufficientlysecure.keychain.service.ServiceProgressHandler; import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; @@ -130,7 +130,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements private void lookupUnknownKey(long unknownKeyId) { - // Message is received after importing is done in KeychainIntentService + // Message is received after importing is done in KeychainService ServiceProgressHandler serviceHandler = new ServiceProgressHandler(getActivity()) { @Override public void handleMessage(Message message) { @@ -163,7 +163,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements Preferences prefs = Preferences.getPreferences(getActivity()); Preferences.CloudSearchPrefs cloudPrefs = new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver()); - data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver); + data.putString(KeychainService.IMPORT_KEY_SERVER, cloudPrefs.keyserver); } { @@ -172,17 +172,17 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements ArrayList selectedEntries = new ArrayList<>(); selectedEntries.add(keyEntry); - data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, selectedEntries); + data.putParcelableArrayList(KeychainService.IMPORT_KEY_LIST, selectedEntries); } // Send all information needed to service to query keys in other thread - Intent intent = new Intent(getActivity(), KeychainIntentService.class); - intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING); - intent.putExtra(KeychainIntentService.EXTRA_DATA, data); + Intent intent = new Intent(getActivity(), KeychainService.class); + intent.setAction(KeychainService.ACTION_IMPORT_KEYRING); + intent.putExtra(KeychainService.EXTRA_DATA, data); // Create a new Messenger for the communication back Messenger messenger = new Messenger(serviceHandler); - intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger); + intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger); getActivity().startService(intent); } -- cgit v1.2.3