Remove old search suggestions adapter
This commit is contained in:
Anthony Restaino
parent
08161059c9
commit
d9f6931047
@ -18,7 +18,6 @@ import acr.browser.lightning.fragment.LightningPreferenceFragment;
|
|||||||
import acr.browser.lightning.fragment.PrivacySettingsFragment;
|
import acr.browser.lightning.fragment.PrivacySettingsFragment;
|
||||||
import acr.browser.lightning.fragment.TabsFragment;
|
import acr.browser.lightning.fragment.TabsFragment;
|
||||||
import acr.browser.lightning.search.Suggestions;
|
import acr.browser.lightning.search.Suggestions;
|
||||||
import acr.browser.lightning.search.SuggestionsAdapter;
|
|
||||||
import acr.browser.lightning.utils.AdBlock;
|
import acr.browser.lightning.utils.AdBlock;
|
||||||
import acr.browser.lightning.utils.ProxyUtils;
|
import acr.browser.lightning.utils.ProxyUtils;
|
||||||
import acr.browser.lightning.view.LightningView;
|
import acr.browser.lightning.view.LightningView;
|
||||||
@ -35,8 +34,6 @@ public interface AppComponent {
|
|||||||
|
|
||||||
void inject(BookmarkSettingsFragment fragment);
|
void inject(BookmarkSettingsFragment fragment);
|
||||||
|
|
||||||
void inject(SuggestionsAdapter adapter);
|
|
||||||
|
|
||||||
void inject(LightningDialogBuilder builder);
|
void inject(LightningDialogBuilder builder);
|
||||||
|
|
||||||
void inject(TabsFragment fragment);
|
void inject(TabsFragment fragment);
|
||||||
|
|||||||
@ -2,9 +2,6 @@ package acr.browser.lightning.dialog;
|
|||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.content.ClipData;
|
|
||||||
import android.content.ClipboardManager;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
|
|||||||
@ -6,8 +6,6 @@ package acr.browser.lightning.download;
|
|||||||
import android.app.DownloadManager;
|
import android.app.DownloadManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Looper;
|
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.webkit.MimeTypeMap;
|
import android.webkit.MimeTypeMap;
|
||||||
|
|||||||
@ -249,7 +249,7 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
Dialog dialog = builder.show();
|
Dialog dialog = builder.show();
|
||||||
BrowserDialog.setDialogSize(mActivity, dialog);
|
BrowserDialog.setDialogSize(activity, dialog);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@ -315,7 +315,7 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
Dialog dialog = builder.show();
|
Dialog dialog = builder.show();
|
||||||
BrowserDialog.setDialogSize(mActivity, dialog);
|
BrowserDialog.setDialogSize(activity, dialog);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|||||||
@ -12,21 +12,17 @@ import android.graphics.Paint;
|
|||||||
import android.graphics.PorterDuff;
|
import android.graphics.PorterDuff;
|
||||||
import android.graphics.drawable.BitmapDrawable;
|
import android.graphics.drawable.BitmapDrawable;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.graphics.drawable.TransitionDrawable;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.IdRes;
|
import android.support.annotation.IdRes;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.annotation.Nullable;
|
import android.support.annotation.Nullable;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.content.ContextCompat;
|
|
||||||
import android.support.v4.view.ViewCompat;
|
import android.support.v4.view.ViewCompat;
|
||||||
import android.support.v4.widget.TextViewCompat;
|
import android.support.v4.widget.TextViewCompat;
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
import android.support.v7.widget.RecyclerView.LayoutManager;
|
import android.support.v7.widget.RecyclerView.LayoutManager;
|
||||||
import android.support.v7.widget.SimpleItemAnimator;
|
import android.support.v7.widget.SimpleItemAnimator;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|||||||
@ -1,333 +0,0 @@
|
|||||||
package acr.browser.lightning.search;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.BaseAdapter;
|
|
||||||
import android.widget.Filter;
|
|
||||||
import android.widget.Filterable;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FilenameFilter;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import acr.browser.lightning.R;
|
|
||||||
import acr.browser.lightning.app.BrowserApp;
|
|
||||||
import acr.browser.lightning.database.BookmarkManager;
|
|
||||||
import acr.browser.lightning.database.HistoryDatabase;
|
|
||||||
import acr.browser.lightning.database.HistoryItem;
|
|
||||||
import acr.browser.lightning.preference.PreferenceManager;
|
|
||||||
import acr.browser.lightning.utils.ThemeUtils;
|
|
||||||
|
|
||||||
public class SuggestionsAdapter extends BaseAdapter implements Filterable, SuggestionsResult {
|
|
||||||
|
|
||||||
private static final String TAG = SuggestionsAdapter.class.getSimpleName();
|
|
||||||
|
|
||||||
private final List<HistoryItem> mHistory = new ArrayList<>(5);
|
|
||||||
private final List<HistoryItem> mBookmarks = new ArrayList<>(5);
|
|
||||||
private final List<HistoryItem> mSuggestions = new ArrayList<>(5);
|
|
||||||
private final List<HistoryItem> mFilteredList = new ArrayList<>(5);
|
|
||||||
private final List<HistoryItem> mAllBookmarks = new ArrayList<>(5);
|
|
||||||
|
|
||||||
private boolean mUseGoogle = true;
|
|
||||||
private boolean mIsExecuting = false;
|
|
||||||
private final boolean mDarkTheme;
|
|
||||||
private final boolean mIncognito;
|
|
||||||
private static final String CACHE_FILE_TYPE = ".sgg";
|
|
||||||
private static final long INTERVAL_DAY = 86400000;
|
|
||||||
private static final int MAX_SUGGESTIONS = 5;
|
|
||||||
private static final SuggestionsComparator sComparator = new SuggestionsComparator();
|
|
||||||
|
|
||||||
@NonNull private final Context mContext;
|
|
||||||
@Nullable private SearchFilter mFilter;
|
|
||||||
@NonNull private final Drawable mSearchDrawable;
|
|
||||||
@NonNull private final Drawable mHistoryDrawable;
|
|
||||||
@NonNull private final Drawable mBookmarkDrawable;
|
|
||||||
|
|
||||||
@Inject HistoryDatabase mDatabaseHandler;
|
|
||||||
@Inject BookmarkManager mBookmarkManager;
|
|
||||||
@Inject PreferenceManager mPreferenceManager;
|
|
||||||
|
|
||||||
public SuggestionsAdapter(@NonNull Context context, boolean dark, boolean incognito) {
|
|
||||||
BrowserApp.getAppComponent().inject(this);
|
|
||||||
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
|
|
||||||
mUseGoogle = mPreferenceManager.getGoogleSearchSuggestionsEnabled();
|
|
||||||
mContext = context;
|
|
||||||
mDarkTheme = dark || incognito;
|
|
||||||
mIncognito = incognito;
|
|
||||||
BrowserApp.getTaskThread().execute(new ClearCacheRunnable(BrowserApp.get(context)));
|
|
||||||
mSearchDrawable = ThemeUtils.getThemedDrawable(context, R.drawable.ic_search, mDarkTheme);
|
|
||||||
mBookmarkDrawable = ThemeUtils.getThemedDrawable(context, R.drawable.ic_bookmark, mDarkTheme);
|
|
||||||
mHistoryDrawable = ThemeUtils.getThemedDrawable(context, R.drawable.ic_history, mDarkTheme);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refreshPreferences() {
|
|
||||||
mUseGoogle = mPreferenceManager.getGoogleSearchSuggestionsEnabled();
|
|
||||||
if (!mUseGoogle) {
|
|
||||||
synchronized (mSuggestions) {
|
|
||||||
mSuggestions.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refreshBookmarks() {
|
|
||||||
synchronized (SuggestionsAdapter.this) {
|
|
||||||
mAllBookmarks.clear();
|
|
||||||
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getCount() {
|
|
||||||
return mFilteredList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getItem(int position) {
|
|
||||||
return mFilteredList.get(position);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getItemId(int position) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SuggestionHolder {
|
|
||||||
ImageView mImage;
|
|
||||||
TextView mTitle;
|
|
||||||
TextView mUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public View getView(int position, @Nullable View convertView, ViewGroup parent) {
|
|
||||||
SuggestionHolder holder;
|
|
||||||
|
|
||||||
if (convertView == null) {
|
|
||||||
LayoutInflater inflater = LayoutInflater.from(mContext);
|
|
||||||
convertView = inflater.inflate(R.layout.two_line_autocomplete, parent, false);
|
|
||||||
|
|
||||||
holder = new SuggestionHolder();
|
|
||||||
holder.mTitle = (TextView) convertView.findViewById(R.id.title);
|
|
||||||
holder.mUrl = (TextView) convertView.findViewById(R.id.url);
|
|
||||||
holder.mImage = (ImageView) convertView.findViewById(R.id.suggestionIcon);
|
|
||||||
convertView.setTag(holder);
|
|
||||||
} else {
|
|
||||||
holder = (SuggestionHolder) convertView.getTag();
|
|
||||||
}
|
|
||||||
HistoryItem web;
|
|
||||||
web = mFilteredList.get(position);
|
|
||||||
holder.mTitle.setText(web.getTitle());
|
|
||||||
holder.mUrl.setText(web.getUrl());
|
|
||||||
|
|
||||||
Drawable image;
|
|
||||||
switch (web.getImageId()) {
|
|
||||||
case R.drawable.ic_bookmark: {
|
|
||||||
if (mDarkTheme)
|
|
||||||
holder.mTitle.setTextColor(Color.WHITE);
|
|
||||||
image = mBookmarkDrawable;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case R.drawable.ic_search: {
|
|
||||||
if (mDarkTheme)
|
|
||||||
holder.mTitle.setTextColor(Color.WHITE);
|
|
||||||
image = mSearchDrawable;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case R.drawable.ic_history: {
|
|
||||||
if (mDarkTheme)
|
|
||||||
holder.mTitle.setTextColor(Color.WHITE);
|
|
||||||
image = mHistoryDrawable;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
if (mDarkTheme)
|
|
||||||
holder.mTitle.setTextColor(Color.WHITE);
|
|
||||||
image = mSearchDrawable;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
holder.mImage.setImageDrawable(image);
|
|
||||||
|
|
||||||
return convertView;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Filter getFilter() {
|
|
||||||
if (mFilter == null) {
|
|
||||||
mFilter = new SearchFilter();
|
|
||||||
}
|
|
||||||
return mFilter;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class ClearCacheRunnable implements Runnable {
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
private final Application app;
|
|
||||||
|
|
||||||
public ClearCacheRunnable(@NonNull Application app) {
|
|
||||||
this.app = app;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
File dir = new File(app.getCacheDir().toString());
|
|
||||||
String[] fileList = dir.list(new NameFilter());
|
|
||||||
long earliestTimeAllowed = System.currentTimeMillis() - INTERVAL_DAY;
|
|
||||||
for (String fileName : fileList) {
|
|
||||||
File file = new File(dir.getPath() + fileName);
|
|
||||||
if (earliestTimeAllowed > file.lastModified()) {
|
|
||||||
file.delete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class NameFilter implements FilenameFilter {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean accept(File dir, @NonNull String filename) {
|
|
||||||
return filename.endsWith(CACHE_FILE_TYPE);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private class SearchFilter extends Filter {
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
protected FilterResults performFiltering(@Nullable CharSequence constraint) {
|
|
||||||
FilterResults results = new FilterResults();
|
|
||||||
if (constraint == null) {
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
String query = constraint.toString().toLowerCase(Locale.getDefault());
|
|
||||||
if (mUseGoogle && !mIncognito && !mIsExecuting) {
|
|
||||||
mIsExecuting = true;
|
|
||||||
new RetrieveSuggestionsTask(query, SuggestionsAdapter.this, BrowserApp.get(mContext)).executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
|
|
||||||
}
|
|
||||||
|
|
||||||
int counter = 0;
|
|
||||||
synchronized (mBookmarks) {
|
|
||||||
mBookmarks.clear();
|
|
||||||
// TODO Synchronizing on this... freezes up during getFilteredList method execution since
|
|
||||||
// both are synchronized on this
|
|
||||||
synchronized (SuggestionsAdapter.this) {
|
|
||||||
for (int n = 0; n < mAllBookmarks.size(); n++) {
|
|
||||||
if (counter >= 5) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (mAllBookmarks.get(n).getTitle().toLowerCase(Locale.getDefault())
|
|
||||||
.startsWith(query)) {
|
|
||||||
mBookmarks.add(mAllBookmarks.get(n));
|
|
||||||
counter++;
|
|
||||||
} else if (mAllBookmarks.get(n).getUrl().contains(query)) {
|
|
||||||
mBookmarks.add(mAllBookmarks.get(n));
|
|
||||||
counter++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
List<HistoryItem> historyList = mDatabaseHandler.findItemsContaining(constraint.toString());
|
|
||||||
synchronized (mHistory) {
|
|
||||||
mHistory.clear();
|
|
||||||
mHistory.addAll(historyList);
|
|
||||||
}
|
|
||||||
results.count = 1;
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CharSequence convertResultToString(@NonNull Object resultValue) {
|
|
||||||
return ((HistoryItem) resultValue).getUrl();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void publishResults(CharSequence constraint, FilterResults results) {
|
|
||||||
synchronized (mFilteredList) {
|
|
||||||
mFilteredList.clear();
|
|
||||||
List<HistoryItem> filtered = getFilteredList();
|
|
||||||
Collections.sort(filtered, sComparator);
|
|
||||||
mFilteredList.addAll(filtered);
|
|
||||||
}
|
|
||||||
notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resultReceived(@NonNull List<HistoryItem> searchResults) {
|
|
||||||
mIsExecuting = false;
|
|
||||||
synchronized (mSuggestions) {
|
|
||||||
mSuggestions.clear();
|
|
||||||
mSuggestions.addAll(searchResults);
|
|
||||||
}
|
|
||||||
synchronized (mFilteredList) {
|
|
||||||
mFilteredList.clear();
|
|
||||||
List<HistoryItem> filtered = getFilteredList();
|
|
||||||
Collections.sort(filtered, sComparator);
|
|
||||||
mFilteredList.addAll(filtered);
|
|
||||||
notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
private synchronized List<HistoryItem> getFilteredList() {
|
|
||||||
List<HistoryItem> list = new ArrayList<>(5);
|
|
||||||
synchronized (mBookmarks) {
|
|
||||||
synchronized (mHistory) {
|
|
||||||
synchronized (mSuggestions) {
|
|
||||||
Iterator<HistoryItem> bookmark = mBookmarks.iterator();
|
|
||||||
Iterator<HistoryItem> history = mHistory.iterator();
|
|
||||||
Iterator<HistoryItem> suggestion = mSuggestions.listIterator();
|
|
||||||
while (list.size() < MAX_SUGGESTIONS) {
|
|
||||||
if (!bookmark.hasNext() && !suggestion.hasNext() && !history.hasNext()) {
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
if (bookmark.hasNext()) {
|
|
||||||
list.add(bookmark.next());
|
|
||||||
}
|
|
||||||
if (suggestion.hasNext() && list.size() < MAX_SUGGESTIONS) {
|
|
||||||
list.add(suggestion.next());
|
|
||||||
}
|
|
||||||
if (history.hasNext() && list.size() < MAX_SUGGESTIONS) {
|
|
||||||
list.add(history.next());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SuggestionsComparator implements Comparator<HistoryItem> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int compare(@NonNull HistoryItem lhs, @NonNull HistoryItem rhs) {
|
|
||||||
if (lhs.getImageId() == rhs.getImageId()) return 0;
|
|
||||||
if (lhs.getImageId() == R.drawable.ic_bookmark) return -1;
|
|
||||||
if (rhs.getImageId() == R.drawable.ic_bookmark) return 1;
|
|
||||||
if (lhs.getImageId() == R.drawable.ic_history) return -1;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user