diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 19:46:44 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 19:46:44 +0200 |
| commit | f46f2b6895ac0c9c5c000e93457cb66049269ed0 (patch) | |
| tree | bd7d772e29fc220ee3c11a2c8aae5df30d387f47 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | c3b12bb3c271a62c99e9417558576c202e6fed59 (diff) | |
| download | open-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.tar.gz open-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.tar.bz2 open-keychain-f46f2b6895ac0c9c5c000e93457cb66049269ed0.zip | |
Fixes and temporary fixes for returning results
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 2c1bc8463..99eab7f1d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -181,8 +181,6 @@ public class KeychainIntentService extends IntentService // export public static final String RESULT_EXPORT = "exported"; - public static final String RESULT_IMPORT = "result"; - public static final String RESULT_CONSOLIDATE = "consolidate_result"; Messenger mMessenger; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index 91939739a..1ca06e6b6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -442,7 +442,9 @@ public class OperationResultParcel implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mResult); - dest.writeTypedList(mLog.toList()); + if (mLog != null) { + dest.writeTypedList(mLog.toList()); + } } public static final Creator<OperationResultParcel> CREATOR = new Creator<OperationResultParcel>() { |