diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-09 00:10:09 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-09 00:10:09 +0200 |
commit | 5185492b049926511d727a510fc2dffcc0947c88 (patch) | |
tree | 961e2dce59b76b13ac292f48103dde4f35fc81df /OpenKeychain/src | |
parent | 16498be4a2c4b08b9763f21de4bc5670c89db4ee (diff) | |
download | open-keychain-5185492b049926511d727a510fc2dffcc0947c88.tar.gz open-keychain-5185492b049926511d727a510fc2dffcc0947c88.tar.bz2 open-keychain-5185492b049926511d727a510fc2dffcc0947c88.zip |
Fix OperationResultParcel
Naming conventions save lives... or atleast make addAll() work
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 16 |
1 files changed, 8 insertions, 8 deletions
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 8db48ae3b..f868d931c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -305,20 +305,20 @@ public class OperationResultParcel implements Parcelable { public static class OperationLog implements Iterable<LogEntryParcel> { - private final List<LogEntryParcel> parcels = new ArrayList<LogEntryParcel>(); + private final List<LogEntryParcel> mParcels = new ArrayList<LogEntryParcel>(); /// Simple convenience method public void add(LogLevel level, LogType type, int indent, Object... parameters) { Log.d(Constants.TAG, type.toString()); - parcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, parameters)); + mParcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, parameters)); } public void add(LogLevel level, LogType type, int indent) { - parcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, (Object[]) null)); + mParcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, (Object[]) null)); } public boolean containsWarnings() { - for(LogEntryParcel entry : new IterableIterator<LogEntryParcel>(parcels.iterator())) { + for(LogEntryParcel entry : new IterableIterator<LogEntryParcel>(mParcels.iterator())) { if (entry.mLevel == LogLevel.WARN || entry.mLevel == LogLevel.ERROR) { return true; } @@ -327,20 +327,20 @@ public class OperationResultParcel implements Parcelable { } public void addAll(List<LogEntryParcel> parcels) { - parcels.addAll(parcels); + mParcels.addAll(parcels); } public List<LogEntryParcel> toList() { - return parcels; + return mParcels; } public boolean isEmpty() { - return parcels.isEmpty(); + return mParcels.isEmpty(); } @Override public Iterator<LogEntryParcel> iterator() { - return parcels.iterator(); + return mParcels.iterator(); } } |