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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-08-20 19:59:54 +02:00
parent 475293a116 0e152d1db0
commit 1e5ac82985
7 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@@ -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;

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
View File

@@ -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>() {