From 985a6793c0fb8c5f28c229c9432303263704015e Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Fri, 14 Mar 2014 00:59:10 +0200
Subject: Fix two bugs in ImportKeys screen (issue #416)

---
 .../org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java    | 1 +
 .../keychain/ui/adapter/ImportKeysListServerLoader.java                  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src')

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 16776e121..0f05af447 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -152,6 +152,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         }
 
         LinearLayout ll = (LinearLayout) convertView.findViewById(R.id.list);
+        ll.removeAllViews();
         if (entry.userIds.size() == 1) {
             ll.setVisibility(View.GONE);
         } else {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 1e96606a6..a4dd06e40 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -89,6 +89,7 @@ public class ImportKeysListServerLoader
         try {
             ArrayList<ImportKeysListEntry> searchResult = server.search(query);
 
+            mEntryList.clear();
             // add result to data
             mEntryList.addAll(searchResult);
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
-- 
cgit v1.2.3