aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-05 14:35:08 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-05 14:35:08 +0300
commiteeb6fa5755c77f2e82b7b23a3cd98a17e09b6392 (patch)
treef5a1d9e3d94bb1067d24f7cf89de26430e091d77
parent4278aa1bf1614d8b41e240a4f99328f85202041b (diff)
downloadopen-keychain-eeb6fa5755c77f2e82b7b23a3cd98a17e09b6392.tar.gz
open-keychain-eeb6fa5755c77f2e82b7b23a3cd98a17e09b6392.tar.bz2
open-keychain-eeb6fa5755c77f2e82b7b23a3cd98a17e09b6392.zip
Fix formatting
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java6
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index eada0b43c..227d6fce4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -298,11 +298,11 @@ public class CreateKeyFinalFragment extends Fragment {
saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
3072, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
- if(createKeyActivity.mPassphrase != null) {
+ if (createKeyActivity.mPassphrase != null) {
saveKeyringParcel.setNewUnlock(new ChangeUnlockParcel(createKeyActivity.mPassphrase));
} else {
- saveKeyringParcel.setNewUnlock(null);
- }
+ saveKeyringParcel.setNewUnlock(null);
+ }
}
String userId = KeyRing.createUserId(
new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null)
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 1a1e07dec..ca4a33980 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -466,7 +466,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) {
Bundle data = message.getData();
- // use new passphrase!
+ // use new passphrase!
mChangeUnlockParcel = new ChangeUnlockParcel(
mMasterKeyId,
mFingerprint,