aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-20 22:28:08 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-20 22:28:08 +0200
commit0a790c7aa2305c8b001e4505692a9d357a9068fc (patch)
tree0ac88567bf1f105d941ae5873187dd201b413ba4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
parent6b7aa2767a07fae02538b5b02bee9698fa1d3b15 (diff)
downloadopen-keychain-0a790c7aa2305c8b001e4505692a9d357a9068fc.tar.gz
open-keychain-0a790c7aa2305c8b001e4505692a9d357a9068fc.tar.bz2
open-keychain-0a790c7aa2305c8b001e4505692a9d357a9068fc.zip
Work on Qr code import
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 233b1fca8..a44d32e5b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -170,7 +170,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
} else {
holder.userIdsList.setVisibility(View.VISIBLE);
- // clear view from holder
+ // destroyLoader view from holder
holder.userIdsList.removeAllViews();
Iterator<String> it = entry.getUserIds().iterator();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 4eb6f158b..d62c2db43 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -47,7 +47,6 @@ public class ImportKeysListServerLoader
@Override
public AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> loadInBackground() {
-
mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
if (mServerQuery == null) {