moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-26 00:11:52 -05:00
Code Issues Releases Wiki Activity

rename KeyServerUploadActivity to UploadKeyActivity

Browse Source
This commit is contained in:
Dominik Schürmann 2014-02-01 18:16:25 +01:00
parent abbdfd48df
commit a891ff2f7c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/src/main/AndroidManifest.xml
View File

@ -243,7 +243,7 @@
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_key_server_query" /> android:label="@string/title_key_server_query" />
<activity <activity
android:name=".ui.KeyServerUploadActivity" android:name=".ui.UploadKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_send_key" /> android:label="@string/title_send_key" />
<activity <activity

4
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java → OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
View File

@ -44,7 +44,7 @@ import com.beardedhen.androidbootstrap.BootstrapButton;
* *
* Sends the selected public key to a key server * Sends the selected public key to a key server
*/ */
public class KeyServerUploadActivity extends SherlockFragmentActivity { public class UploadKeyActivity extends SherlockFragmentActivity {
private BootstrapButton mUploadButton; private BootstrapButton mUploadButton;
private Spinner mKeyServerSpinner; private Spinner mKeyServerSpinner;
@ -111,7 +111,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity {
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { 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(); Toast.LENGTH_SHORT).show();
finish(); finish();
} }

2
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -384,7 +384,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
} }
private void uploadToKeyserver(Uri dataUri) { private void uploadToKeyserver(Uri dataUri) {
Intent uploadIntent = new Intent(this, KeyServerUploadActivity.class); Intent uploadIntent = new Intent(this, UploadKeyActivity.class);
uploadIntent.setData(dataUri); uploadIntent.setData(dataUri);
startActivityForResult(uploadIntent, Id.request.export_to_server); startActivityForResult(uploadIntent, Id.request.export_to_server);
} }