aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service
diff options
context:
space:
mode:
authorThialfihar <thi@thialfihar.org>2014-04-02 01:43:40 +0200
committerThialfihar <thi@thialfihar.org>2014-04-02 10:51:02 +0200
commitdd4a1e3f5239cc35a1abdc625238361350155191 (patch)
tree3a138adafd90763b51da958151f88467678b08da /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service
parent8e503bd263d451234f92b843987cb0d12cfbee3a (diff)
downloadopen-keychain-dd4a1e3f5239cc35a1abdc625238361350155191.tar.gz
open-keychain-dd4a1e3f5239cc35a1abdc625238361350155191.tar.bz2
open-keychain-dd4a1e3f5239cc35a1abdc625238361350155191.zip
Trivial spacing changes to conform to style guide
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java2
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java16
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index bdd50c98d..14beae40c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -818,7 +818,7 @@ public class KeychainIntentService extends IntentService
return;
}
// contextualize the exception, if necessary
- if(e instanceof PgpGeneralMsgIdException) {
+ if (e instanceof PgpGeneralMsgIdException) {
e = ((PgpGeneralMsgIdException) e).getContextualized(this);
}
Log.e(Constants.TAG, "ApgService Exception: ", e);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index b7ae4e1f1..cc0f94b9b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -46,20 +46,20 @@ public class SaveKeyringParcel implements Parcelable {
public SaveKeyringParcel() {}
- private SaveKeyringParcel(Parcel source)
- {
- userIDs = (ArrayList<String>)source.readSerializable();
- originalIDs = (ArrayList<String>)source.readSerializable();
- deletedIDs = (ArrayList<String>)source.readSerializable();
+ private SaveKeyringParcel(Parcel source) {
+ userIDs = (ArrayList<String>) source.readSerializable();
+ originalIDs = (ArrayList<String>) source.readSerializable();
+ deletedIDs = (ArrayList<String>) source.readSerializable();
newIDs = source.createBooleanArray();
primaryIDChanged = source.readByte() != 0;
moddedKeys = source.createBooleanArray();
byte[] tmp = source.createByteArray();
- if (tmp == null)
+ if (tmp == null) {
deletedKeys = null;
- else
+ } else {
deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(tmp);
- keysExpiryDates = (ArrayList<GregorianCalendar>)source.readSerializable();
+ }
+ keysExpiryDates = (ArrayList<GregorianCalendar>) source.readSerializable();
keysUsages = source.readArrayList(Integer.class.getClassLoader());
newPassPhrase = source.readString();
oldPassPhrase = source.readString();