r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Search adapter shouldnt spawn new worker threads if current ones havent finished

Browse Source
This commit is contained in:
Anthony Restaino 2015-01-29 21:57:39 -05:00
parent 04c4d202b2
commit 35c585b3f4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/acr/browser/lightning/SearchAdapter.java
View File

@ -33,6 +33,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
private SharedPreferences mPreferences; private SharedPreferences mPreferences;
private boolean mUseGoogle = true; private boolean mUseGoogle = true;
private Context mContext; private Context mContext;
private boolean mIsExecuting = false;
private boolean mIncognito; private boolean mIncognito;
private BookmarkManager mBookmarkManager; private BookmarkManager mBookmarkManager;
private static final String ENCODING = "ISO-8859-1"; private static final String ENCODING = "ISO-8859-1";
@ -167,7 +168,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
if (query == null) { if (query == null) {
return results; return results;
} }
if (mUseGoogle && !mIncognito) { if (mUseGoogle && !mIncognito && !mIsExecuting) {
new RetrieveSearchSuggestions().execute(query); new RetrieveSearchSuggestions().execute(query);
} }
@ -222,6 +223,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
@Override @Override
protected List<HistoryItem> doInBackground(String... arg0) { protected List<HistoryItem> doInBackground(String... arg0) {
mIsExecuting = true;
if (!isNetworkConnected(mContext)) { if (!isNetworkConnected(mContext)) {
return new ArrayList<HistoryItem>(); return new ArrayList<HistoryItem>();
} }
@ -259,7 +261,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
} }
eventType = mXpp.next(); eventType = mXpp.next();
} }
} catch (Exception e){ } catch (Exception e) {
return filter; return filter;
} finally { } finally {
if (download != null) { if (download != null) {
@ -282,6 +284,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
mFilteredList = getSuggestions(); mFilteredList = getSuggestions();
notifyDataSetChanged(); notifyDataSetChanged();
} }
mIsExecuting = false;
} }
} }