moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Fix ConsolidateResult, needed parcelable methods

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-21 22:31:28 +02:00
parent 1dd68c7120
commit 65c3d69d9a
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java
View File

@ -18,10 +18,29 @@
package org.sufficientlysecure.keychain.service.results;
import android.os.Parcel;
public class ConsolidateResult extends OperationResult {
public ConsolidateResult(int result, OperationLog log) {
super(result, log);
}
/**
* Construct from a parcel - trivial because we have no extra data.
*/
public ConsolidateResult(Parcel source) {
super(source);
}
public static Creator<ConsolidateResult> CREATOR = new Creator<ConsolidateResult>() {
public ConsolidateResult createFromParcel(final Parcel source) {
return new ConsolidateResult(source);
}
public ConsolidateResult[] newArray(final int size) {
return new ConsolidateResult[size];
}
};
}

4
OpenKeychain/src/main/res/layout/log_display_activity.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment