diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 20:21:19 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 21:00:26 +0200 |
commit | 54bc874ce558866e70e54c0076cbee1f51823be7 (patch) | |
tree | 824420ab99b744755d0edd7f1dda8dfd865c08b5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |
parent | d4fa2bbf47c2b2b722ecd2032e8479b405d65b59 (diff) | |
parent | 9fcc0a881648dd42ca854cb9a19f9627154bdbb5 (diff) | |
download | open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.tar.gz open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.tar.bz2 open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.zip |
Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java')
-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 1cf2a60ec..c160da483 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -317,21 +317,21 @@ 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) { Log.d(Constants.TAG, type.toString()); - 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; } @@ -340,20 +340,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(); } } |