cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight amendments for clarity

Browse Source
This commit is contained in:
Alex Fong
2016-05-05 07:40:08 +08:00
parent bc3aa44b22
commit 6cf3e4c891
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
View File

@@ -300,7 +300,9 @@ public class CreateKeyFinalFragment extends Fragment {
if(createKeyActivity.mPassphrase != null) { if(createKeyActivity.mPassphrase != null) {
saveKeyringParcel.setNewUnlock(new ChangeUnlockParcel(createKeyActivity.mPassphrase)); saveKeyringParcel.setNewUnlock(new ChangeUnlockParcel(createKeyActivity.mPassphrase));
} } else {
saveKeyringParcel.setNewUnlock(null);
}
} }
String userId = KeyRing.createUserId( String userId = KeyRing.createUserId(
new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null) new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null)

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -466,6 +466,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) { if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) {
Bundle data = message.getData(); Bundle data = message.getData();
// use new passphrase!
mChangeUnlockParcel = new ChangeUnlockParcel( mChangeUnlockParcel = new ChangeUnlockParcel(
mMasterKeyId, mMasterKeyId,
mFingerprint, mFingerprint,

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

@@ -527,7 +527,7 @@
<string name="import_qr_code_button">"Scan QR Code"</string> <string name="import_qr_code_button">"Scan QR Code"</string>
<string name="import_qr_code_text">"Place your camera over the QR Code!"</string> <string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
<string name="import_warning_title">"Warning"</string> <string name="import_warning_title">"Warning"</string>
<string name="import_warning">"Imported keys will overwrite existing keys that have the same IDs!"</string> <string name="import_warning">"Import will overwrite existing keys that have the same IDs!"</string>
<!-- Import from URL --> <!-- Import from URL -->
<string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string> <string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>