diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:59:54 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:59:54 +0200 |
| commit | 1e5ac82985c6eaef1da16022252e69c03c1889d5 (patch) | |
| tree | 0cfba4a6b61f5110590fa875f1e4e76c3996fd7f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 475293a116b5c3f7937bc5075921a2a0cb9c9a29 (diff) | |
| parent | 0e152d1db0dbebd6c48498f449efecfaa2c4a2bc (diff) | |
| download | open-keychain-1e5ac82985c6eaef1da16022252e69c03c1889d5.tar.gz open-keychain-1e5ac82985c6eaef1da16022252e69c03c1889d5.tar.bz2 open-keychain-1e5ac82985c6eaef1da16022252e69c03c1889d5.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
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 ae881769d..d568df91a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -185,8 +185,6 @@ public class KeychainIntentService extends IntentService // export public static final String RESULT_EXPORT = "exported"; - public static final String RESULT_IMPORT = "result"; - Messenger mMessenger; private boolean mIsCanceled; 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 7fe712534..a7092d7c7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -443,7 +443,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>() { |