From f6e7b92ced34bad78f47820f35df750c65a386ab Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 17 Apr 2014 15:50:16 +0200
Subject: load data only once in ImportKeysListLoader

Fixes #571
---
 .../keychain/ui/adapter/ImportKeysListLoader.java              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index f476382f4..e7a045294 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -51,9 +51,8 @@ public class ImportKeysListLoader
         }
     }
 
-    Context mContext;
-
-    InputData mInputData;
+    final Context mContext;
+    final InputData mInputData;
 
     ArrayList<ImportKeysListEntry> mData = new ArrayList<ImportKeysListEntry>();
     AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> mEntryListWrapper;
@@ -67,6 +66,11 @@ public class ImportKeysListLoader
     @Override
     public AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> loadInBackground() {
 
+        // This has already been loaded! nvm any further, just return
+        if (mEntryListWrapper != null) {
+            return mEntryListWrapper;
+        }
+
         mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mData, null);
 
         if (mInputData == null) {
-- 
cgit v1.2.3