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

Certifying instead of signing

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-01 00:22:15 +02:00
parent f7cbf39555
commit a25ca5429f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
View File

@ -139,7 +139,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
Notify.showNotify(CertifyKeyActivity.this, getString(R.string.select_key_to_certify), Notify.showNotify(CertifyKeyActivity.this, getString(R.string.select_key_to_certify),
Notify.Style.ERROR); Notify.Style.ERROR);
} else { } 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 * 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) // get the user's passphrase for this key (if required)
String passphrase = PassphraseCacheService.getCachedPassphrase(this, mMasterKeyId); String passphrase = PassphraseCacheService.getCachedPassphrase(this, mMasterKeyId);
if (passphrase == null) { if (passphrase == null) {
@ -238,7 +238,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
@Override @Override
public void handleMessage(Message message) { public void handleMessage(Message message) {
if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { 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 // bail out; need to wait until the user has entered the passphrase before trying again
return; return;
} else { } else {
startSigning(); startCertifying();
} }
} }
/** /**
* kicks off the actual signing process on a background thread * 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 // Bail out if there is not at least one user id selected
ArrayList<String> userIds = mUserIdsAdapter.getSelectedUserIds(); ArrayList<String> userIds = mUserIdsAdapter.getSelectedUserIds();
if (userIds.isEmpty()) { if (userIds.isEmpty()) {
@ -279,7 +278,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
// Message is received after signing is done in KeychainIntentService // Message is received after signing is done in KeychainIntentService
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, 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) { public void handleMessage(Message message) {
// handle messages by standard KeychainIntentServiceHandler first // handle messages by standard KeychainIntentServiceHandler first
super.handleMessage(message); super.handleMessage(message);

1
OpenKeychain/src/main/res/values/strings.xml
View File

@ -339,6 +339,7 @@
<string name="progress_processing_signature">processing signature…</string> <string name="progress_processing_signature">processing signature…</string>
<string name="progress_verifying_signature">verifying signature…</string> <string name="progress_verifying_signature">verifying signature…</string>
<string name="progress_signing">signing…</string> <string name="progress_signing">signing…</string>
<string name="progress_certifying">certifying…</string>
<string name="progress_reading_data">reading data…</string> <string name="progress_reading_data">reading data…</string>
<string name="progress_finding_key">finding key…</string> <string name="progress_finding_key">finding key…</string>
<string name="progress_decompressing_data">decompressing data…</string> <string name="progress_decompressing_data">decompressing data…</string>