aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 00:22:15 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 00:22:15 +0200
commita25ca5429fc9b54dd41ee3c7f261710de8100c1b (patch)
tree13a1c0ebbf5359a019e5344560890ee11e115d69 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
parentf7cbf39555f43843dd8e83854e173835b75bef71 (diff)
downloadopen-keychain-a25ca5429fc9b54dd41ee3c7f261710de8100c1b.tar.gz
open-keychain-a25ca5429fc9b54dd41ee3c7f261710de8100c1b.tar.bz2
open-keychain-a25ca5429fc9b54dd41ee3c7f261710de8100c1b.zip
Certifying instead of signing
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
index 74ce936d5..467e0c14a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
@@ -139,7 +139,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
Notify.showNotify(CertifyKeyActivity.this, getString(R.string.select_key_to_certify),
Notify.Style.ERROR);
} else {
- initiateSigning();
+ initiateCertifying();
}
}
}
@@ -229,7 +229,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
/**
* handles the UI bits of the signing process on the UI thread
*/
- private void initiateSigning() {
+ private void initiateCertifying() {
// get the user's passphrase for this key (if required)
String passphrase = PassphraseCacheService.getCachedPassphrase(this, mMasterKeyId);
if (passphrase == null) {
@@ -238,7 +238,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
@Override
public void handleMessage(Message message) {
if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
- startSigning();
+ startCertifying();
}
}
}
@@ -246,15 +246,14 @@ public class CertifyKeyActivity extends ActionBarActivity implements
// bail out; need to wait until the user has entered the passphrase before trying again
return;
} else {
- startSigning();
+ startCertifying();
}
}
/**
* kicks off the actual signing process on a background thread
*/
- private void startSigning() {
-
+ private void startCertifying() {
// Bail out if there is not at least one user id selected
ArrayList<String> userIds = mUserIdsAdapter.getSelectedUserIds();
if (userIds.isEmpty()) {
@@ -279,7 +278,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
// Message is received after signing is done in KeychainIntentService
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
- getString(R.string.progress_signing), ProgressDialog.STYLE_SPINNER) {
+ getString(R.string.progress_certifying), ProgressDialog.STYLE_SPINNER) {
public void handleMessage(Message message) {
// handle messages by standard KeychainIntentServiceHandler first
super.handleMessage(message);