diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 18:16:25 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 18:16:25 +0100 |
| commit | a891ff2f7c078631900d15a181c209a289cb9c23 (patch) | |
| tree | 94522554c4a4e978f9f722bb64018226c809b682 /OpenPGP-Keychain | |
| parent | abbdfd48dfef1a2cea5ac065bdbb4199e2b3b7de (diff) | |
| download | open-keychain-a891ff2f7c078631900d15a181c209a289cb9c23.tar.gz open-keychain-a891ff2f7c078631900d15a181c209a289cb9c23.tar.bz2 open-keychain-a891ff2f7c078631900d15a181c209a289cb9c23.zip | |
rename KeyServerUploadActivity to UploadKeyActivity
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java (renamed from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java) | 4 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index b8ee23514..d40580a79 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -243,7 +243,7 @@ android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_key_server_query" /> <activity - android:name=".ui.KeyServerUploadActivity" + android:name=".ui.UploadKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_send_key" /> <activity diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 7b410e461..d72dd37ab 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -44,7 +44,7 @@ import com.beardedhen.androidbootstrap.BootstrapButton; * * Sends the selected public key to a key server */ -public class KeyServerUploadActivity extends SherlockFragmentActivity { +public class UploadKeyActivity extends SherlockFragmentActivity { private BootstrapButton mUploadButton; private Spinner mKeyServerSpinner; @@ -111,7 +111,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity { if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { - Toast.makeText(KeyServerUploadActivity.this, R.string.key_send_success, + Toast.makeText(UploadKeyActivity.this, R.string.key_send_success, Toast.LENGTH_SHORT).show(); finish(); } diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index e1cefbed1..74aac1d3c 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -384,7 +384,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements } private void uploadToKeyserver(Uri dataUri) { - Intent uploadIntent = new Intent(this, KeyServerUploadActivity.class); + Intent uploadIntent = new Intent(this, UploadKeyActivity.class); uploadIntent.setData(dataUri); startActivityForResult(uploadIntent, Id.request.export_to_server); } |