diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-01 17:43:00 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-01 17:43:00 +0530 |
| commit | 6bc40d12ad44c4170f10054fb8ea7d2c9459da35 (patch) | |
| tree | a7b79e122d81bb3cd97b870ce38499e0778e9a0a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |
| parent | 14a08361e52bcd8bd26b9b2b2b9690276b40ed42 (diff) | |
| download | open-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.tar.gz open-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.tar.bz2 open-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.zip | |
renamed KeychainIntentService to KeychainService
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 7426cf149..2a195a4da 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; -import org.sufficientlysecure.keychain.service.KeychainIntentService; +import org.sufficientlysecure.keychain.service.KeychainService; import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.service.ServiceProgressHandler; import org.sufficientlysecure.keychain.util.Log; @@ -91,9 +91,9 @@ public class UploadKeyActivity extends BaseActivity { private void uploadKey() { // Send all information needed to service to upload key in other thread - Intent intent = new Intent(this, KeychainIntentService.class); + Intent intent = new Intent(this, KeychainService.class); - intent.setAction(KeychainIntentService.ACTION_UPLOAD_KEYRING); + intent.setAction(KeychainService.ACTION_UPLOAD_KEYRING); // set data uri as path to keyring Uri blobUri = KeyRings.buildUnifiedKeyRingUri(mDataUri); @@ -103,11 +103,11 @@ public class UploadKeyActivity extends BaseActivity { Bundle data = new Bundle(); String server = (String) mKeyServerSpinner.getSelectedItem(); - data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, server); + data.putString(KeychainService.UPLOAD_KEY_SERVER, server); - intent.putExtra(KeychainIntentService.EXTRA_DATA, data); + intent.putExtra(KeychainService.EXTRA_DATA, data); - // Message is received after uploading is done in KeychainIntentService + // Message is received after uploading is done in KeychainService ServiceProgressHandler saveHandler = new ServiceProgressHandler( this, getString(R.string.progress_uploading), @@ -129,7 +129,7 @@ public class UploadKeyActivity extends BaseActivity { // Create a new Messenger for the communication back Messenger messenger = new Messenger(saveHandler); - intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger); + intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger); // show progress dialog saveHandler.showProgressDialog(this); |