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

more stable nullable behavior in OperationLog

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-18 13:13:18 +02:00
parent 297f53e171
commit 7c3518a011
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@ -22,6 +22,7 @@ import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
@ -101,9 +102,9 @@ public abstract class OperationResult implements Parcelable {
} }
public OperationLog getLog() { public OperationLog getLog() {
// If there is only a single entry, and it's a compound one, return that log SubLogEntryParcel singleSubLog = mLog.getSubResultIfSingle();
if (mLog.isSingleCompound()) { if (singleSubLog != null) {
return ((SubLogEntryParcel) mLog.getFirst()).getSubResult().getLog(); return singleSubLog.getSubResult().getLog();
} }
// Otherwse, return our regular log // Otherwse, return our regular log
return mLog; return mLog;
@ -169,9 +170,9 @@ public abstract class OperationResult implements Parcelable {
public static class SubLogEntryParcel extends LogEntryParcel { public static class SubLogEntryParcel extends LogEntryParcel {
OperationResult mSubResult; @NonNull OperationResult mSubResult;
public SubLogEntryParcel(OperationResult subResult, LogType type, int indent, Object... parameters) { public SubLogEntryParcel(@NonNull OperationResult subResult, LogType type, int indent, Object... parameters) {
super(type, indent, parameters); super(type, indent, parameters);
mSubResult = subResult; mSubResult = subResult;
@ -209,6 +210,10 @@ public abstract class OperationResult implements Parcelable {
String logText; String logText;
LogEntryParcel entryParcel = mLog.getLast(); LogEntryParcel entryParcel = mLog.getLast();
if (entryParcel == null) {
Log.e(Constants.TAG, "Tried to show empty log!");
return Notify.create(activity, R.string.error_empty_log, Style.ERROR);
}
// special case: first parameter may be a quantity // special case: first parameter may be a quantity
if (entryParcel.mParameters != null && entryParcel.mParameters.length > 0 if (entryParcel.mParameters != null && entryParcel.mParameters.length > 0
&& entryParcel.mParameters[0] instanceof Integer) { && entryParcel.mParameters[0] instanceof Integer) {
@ -269,7 +274,7 @@ public abstract class OperationResult implements Parcelable {
* mark. * mark.
* *
*/ */
public static enum LogType { public enum LogType {
MSG_INTERNAL_ERROR (LogLevel.ERROR, R.string.msg_internal_error), MSG_INTERNAL_ERROR (LogLevel.ERROR, R.string.msg_internal_error),
MSG_OPERATION_CANCELLED (LogLevel.CANCELLED, R.string.msg_cancelled), MSG_OPERATION_CANCELLED (LogLevel.CANCELLED, R.string.msg_cancelled),
@ -765,7 +770,7 @@ public abstract class OperationResult implements Parcelable {
} }
/** Enumeration of possible log levels. */ /** Enumeration of possible log levels. */
public static enum LogLevel { public enum LogLevel {
DEBUG, DEBUG,
INFO, INFO,
WARN, WARN,
@ -805,8 +810,15 @@ public abstract class OperationResult implements Parcelable {
mParcels.add(new SubLogEntryParcel(subResult, subLog.getFirst().mType, indent, subLog.getFirst().mParameters)); mParcels.add(new SubLogEntryParcel(subResult, subLog.getFirst().mType, indent, subLog.getFirst().mParameters));
} }
boolean isSingleCompound() { public SubLogEntryParcel getSubResultIfSingle() {
return mParcels.size() == 1 && getFirst() instanceof SubLogEntryParcel; if (mParcels.size() != 1) {
return null;
}
LogEntryParcel first = getFirst();
if (first instanceof SubLogEntryParcel) {
return (SubLogEntryParcel) first;
}
return null;
} }
public void clear() { public void clear() {

1
OpenKeychain/src/main/res/values/strings.xml
View File

@ -1330,5 +1330,6 @@
<string name="snack_compression_on">"Compression <b>enabled</b>."</string> <string name="snack_compression_on">"Compression <b>enabled</b>."</string>
<string name="snack_compression_off">"Compression <b>disabled</b>."</string> <string name="snack_compression_off">"Compression <b>disabled</b>."</string>
<string name="error_loading_keys">Error loading keys!</string> <string name="error_loading_keys">Error loading keys!</string>
<string name="error_empty_log">(error, empty log)</string>
</resources> </resources>