() {
+ @Override
+ public void onComplete() {
+ // At this point we always have at least a tab in the tab manager
+ tabChanged(mTabsModel.last());
+ mView.updateTabNumber(mTabsModel.size());
+ }
+ });
+ }
+
+ /**
+ * Notify the presenter that a change occurred to
+ * the current tab. Currently doesn't do anything
+ * other than tell the view to notify the adapter
+ * about the change.
+ *
+ * @param tab the tab that changed, may be null.
+ */
+ public void tabChangeOccurred(@Nullable LightningView tab) {
+ mView.notifyTabViewChanged(mTabsModel.indexOfTab(tab));
+ }
+
+ private void onTabChanged(@Nullable LightningView newTab) {
+ Log.d(TAG, "On tab changed");
+ if (newTab == null) {
+ mView.removeTabView();
+ if (mCurrentTab != null) {
+ mCurrentTab.pauseTimers();
+ mCurrentTab.onDestroy();
+ }
+ } else {
+ if (newTab.getWebView() == null) {
+ mView.removeTabView();
+ if (mCurrentTab != null) {
+ mCurrentTab.pauseTimers();
+ mCurrentTab.onDestroy();
+ }
+ } else {
+ if (mCurrentTab != null) {
+ // TODO: Restore this when Google fixes the bug where the WebView is
+ // blank after calling onPause followed by onResume.
+ // mCurrentTab.onPause();
+ mCurrentTab.setForegroundTab(false);
+ }
+
+ newTab.resumeTimers();
+ newTab.onResume();
+ newTab.setForegroundTab(true);
+
+ mView.updateProgress(newTab.getProgress());
+ mView.setBackButtonEnabled(newTab.canGoBack());
+ mView.setForwardButtonEnabled(newTab.canGoForward());
+ mView.updateUrl(newTab.getUrl(), true);
+ mView.setTabView(newTab.getWebView());
+ int index = mTabsModel.indexOfTab(newTab);
+ if (index >= 0) {
+ mView.notifyTabViewChanged(mTabsModel.indexOfTab(newTab));
+ }
+ }
+ }
+
+ mCurrentTab = newTab;
+ }
+
+ /**
+ * Closes all tabs but the current tab.
+ */
+ public void closeAllOtherTabs() {
+
+ while (mTabsModel.last() != mTabsModel.indexOfCurrentTab()) {
+ deleteTab(mTabsModel.last());
+ }
+
+ while (0 != mTabsModel.indexOfCurrentTab()) {
+ deleteTab(0);
+ }
+
+ }
+
+ /**
+ * Deletes the tab at the specified position.
+ *
+ * @param position the position at which to
+ * delete the tab.
+ */
+ public void deleteTab(int position) {
+ Log.d(TAG, "delete Tab");
+ final LightningView tabToDelete = mTabsModel.getTabAtPosition(position);
+
+ if (tabToDelete == null) {
+ return;
+ }
+
+ if (!UrlUtils.isSpecialUrl(tabToDelete.getUrl()) && !mIsIncognito) {
+ mPreferences.setSavedUrl(tabToDelete.getUrl());
+ }
+
+ final boolean isShown = tabToDelete.isShown();
+ boolean shouldClose = mShouldClose && isShown && Boolean.TRUE.equals(tabToDelete.getTag());
+ final LightningView currentTab = mTabsModel.getCurrentTab();
+ if (mTabsModel.size() == 1 && currentTab != null &&
+ (UrlUtils.isSpecialUrl(currentTab.getUrl()) ||
+ currentTab.getUrl().equals(mPreferences.getHomepage()))) {
+ mView.closeActivity();
+ return;
+ } else {
+ if (isShown) {
+ mView.removeTabView();
+ }
+ boolean currentDeleted = mTabsModel.deleteTab(position);
+ if (currentDeleted) {
+ tabChanged(mTabsModel.indexOfCurrentTab());
+ }
+ }
+
+ final LightningView afterTab = mTabsModel.getCurrentTab();
+ mView.notifyTabViewRemoved(position);
+
+ if (afterTab == null) {
+ mView.closeBrowser();
+ return;
+ } else if (afterTab != currentTab) {
+ //TODO remove this?
+// switchTabs(currentTab, afterTab);
+// if (currentTab != null) {
+// currentTab.pauseTimers();
+// }
+ mView.notifyTabViewChanged(mTabsModel.indexOfCurrentTab());
+ }
+
+ if (shouldClose) {
+ mShouldClose = false;
+ mView.closeActivity();
+ }
+
+ mView.updateTabNumber(mTabsModel.size());
+
+ Log.d(TAG, "deleted tab");
+ }
+
+ /**
+ * Handle a new intent from the the main
+ * BrowserActivity.
+ *
+ * @param intent the intent to handle,
+ * may be null.
+ */
+ public void onNewIntent(@Nullable final Intent intent) {
+ mTabsModel.doAfterInitialization(new Runnable() {
+ @Override
+ public void run() {
+ final String url;
+ if (intent != null) {
+ url = intent.getDataString();
+ } else {
+ url = null;
+ }
+ int num = 0;
+ if (intent != null && intent.getExtras() != null) {
+ num = intent.getExtras().getInt(Constants.INTENT_ORIGIN);
+ }
+
+ if (num == 1) {
+ loadUrlInCurrentView(url);
+ } else if (url != null) {
+ if (url.startsWith(Constants.FILE)) {
+ mView.showBlockedLocalFileDialog(new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ newTab(url, true);
+ }
+ });
+ } else {
+ newTab(url, true);
+ }
+ mShouldClose = true;
+ LightningView tab = mTabsModel.lastTab();
+ if (tab != null) {
+ tab.setTag(true);
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * Loads a URL in the current tab.
+ *
+ * @param url the URL to load, must
+ * not be null.
+ */
+ public void loadUrlInCurrentView(@NonNull final String url) {
+ final LightningView currentTab = mTabsModel.getCurrentTab();
+ if (currentTab == null) {
+ // This is a problem, probably an assert will be better than a return
+ return;
+ }
+
+ currentTab.loadUrl(url);
+ }
+
+ /**
+ * Notifies the presenter that it should
+ * shut down. This should be called when
+ * the BrowserActivity is destroyed so that
+ * we don't leak any memory.
+ */
+ public void shutdown() {
+ onTabChanged(null);
+ mTabsModel.setTabNumberChangedListener(null);
+ mTabsModel.cancelPendingWork();
+ }
+
+ /**
+ * Notifies the presenter that we wish
+ * to switch to a different tab at the
+ * specified position. If the position
+ * is not in the model, this method will
+ * do nothing.
+ *
+ * @param position the position of the
+ * tab to switch to.
+ */
+ public synchronized void tabChanged(int position) {
+ Log.d(TAG, "tabChanged: " + position);
+ if (position < 0 || position >= mTabsModel.size()) {
+ return;
+ }
+ LightningView tab = mTabsModel.switchToTab(position);
+ onTabChanged(tab);
+ }
+
+ /**
+ * Open a new tab with the specified URL. You
+ * can choose to show the tab or load it in the
+ * background.
+ *
+ * @param url the URL to load, may be null if you
+ * don't wish to load anything.
+ * @param show whether or not to switch to this
+ * tab after opening it.
+ * @return true if we successfully created the tab,
+ * false if we have hit max tabs.
+ */
+ public synchronized boolean newTab(@Nullable String url, boolean show) {
+ // Limit number of tabs for limited version of app
+ if (!Constants.FULL_VERSION && mTabsModel.size() >= 10) {
+ mView.showSnackbar(R.string.max_tabs);
+ return false;
+ }
+
+ Log.d(TAG, "New tab, show: " + show);
+
+ LightningView startingTab = mTabsModel.newTab((Activity) mView, url, mIsIncognito);
+ if (mTabsModel.size() == 1) {
+ startingTab.resumeTimers();
+ }
+
+ mView.notifyTabViewAdded();
+
+ if (show) {
+ LightningView tab = mTabsModel.switchToTab(mTabsModel.last());
+ onTabChanged(tab);
+ }
+
+ mView.updateTabNumber(mTabsModel.size());
+
+ return true;
+ }
+
+}
diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.java b/app/src/main/java/acr/browser/lightning/browser/BrowserView.java
new file mode 100644
index 000000000..4ef45f59f
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.java
@@ -0,0 +1,38 @@
+package acr.browser.lightning.browser;
+
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.view.View;
+
+public interface BrowserView {
+
+ void setTabView(@NonNull View view);
+
+ void removeTabView();
+
+ void updateUrl(String url, boolean shortUrl);
+
+ void updateProgress(int progress);
+
+ void updateTabNumber(int number);
+
+ void closeBrowser();
+
+ void closeActivity();
+
+ void showBlockedLocalFileDialog(DialogInterface.OnClickListener listener);
+
+ void showSnackbar(@StringRes int resource);
+
+ void setForwardButtonEnabled(boolean enabled);
+
+ void setBackButtonEnabled(boolean enabled);
+
+ void notifyTabViewRemoved(int position);
+
+ void notifyTabViewAdded();
+
+ void notifyTabViewChanged(int position);
+
+}
diff --git a/app/src/main/java/acr/browser/lightning/browser/TabsView.java b/app/src/main/java/acr/browser/lightning/browser/TabsView.java
new file mode 100644
index 000000000..8c4e64ee2
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/browser/TabsView.java
@@ -0,0 +1,11 @@
+package acr.browser.lightning.browser;
+
+public interface TabsView {
+
+ void tabAdded();
+
+ void tabRemoved(int position);
+
+ void tabChanged(int position);
+
+}
diff --git a/app/src/main/java/acr/browser/lightning/bus/BookmarkEvents.java b/app/src/main/java/acr/browser/lightning/bus/BookmarkEvents.java
index 3331eb7e7..20c10e595 100644
--- a/app/src/main/java/acr/browser/lightning/bus/BookmarkEvents.java
+++ b/app/src/main/java/acr/browser/lightning/bus/BookmarkEvents.java
@@ -2,37 +2,12 @@
import acr.browser.lightning.database.HistoryItem;
-/**
- * Created by Stefano Pacifici on 26/08/15.
- */
public final class BookmarkEvents {
private BookmarkEvents() {
// No instances
}
- /**
- * A bookmark was clicked
- */
- public final static class Clicked {
- public final HistoryItem bookmark;
-
- public Clicked(final HistoryItem bookmark) {
- this.bookmark = bookmark;
- }
- }
-
- /**
- * The user ask to open the bookmark as new tab
- */
- public final static class AsNewTab {
- public final HistoryItem bookmark;
-
- public AsNewTab(final HistoryItem bookmark) {
- this.bookmark = bookmark;
- }
- }
-
/**
* The user ask to delete the selected bookmark
*/
@@ -45,29 +20,11 @@ public Deleted(final HistoryItem item) {
}
/**
- * The user ask to bookmark the currently displayed page
+ * The user ask to add/del a bookmark to the currently displayed page
*/
- public static class WantToBookmarkCurrentPage {
+ public static class ToggleBookmarkForCurrentPage {
}
- /**
- * The bookmark was added
- */
- public static class Added {
- public final HistoryItem item;
-
- public Added(final HistoryItem item) {
- this.item = item;
- }
- }
-
- /**
- * The {@link acr.browser.lightning.fragment.BookmarksFragment} want to know the url (and title)
- * of the currently shown web page.
- */
- // public static class WantInfoAboutCurrentPage {
- // }
-
/**
* Sended by the {@link acr.browser.lightning.fragment.BookmarksFragment} when it wants to close
* itself (generally in reply to a {@link acr.browser.lightning.bus.BrowserEvents.UserPressedBack}
diff --git a/app/src/main/java/acr/browser/lightning/bus/BrowserEvents.java b/app/src/main/java/acr/browser/lightning/bus/BrowserEvents.java
index 15ff37369..17dbe6664 100644
--- a/app/src/main/java/acr/browser/lightning/bus/BrowserEvents.java
+++ b/app/src/main/java/acr/browser/lightning/bus/BrowserEvents.java
@@ -1,8 +1,8 @@
package acr.browser.lightning.bus;
-/**
- * Created by Stefano Pacifici on 26/08/15.
- */
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+
public final class BrowserEvents {
private BrowserEvents() {
@@ -10,23 +10,21 @@ private BrowserEvents() {
}
/**
- * Used to reply to the {@link acr.browser.lightning.fragment.BookmarksFragment} message
- * {@link acr.browser.lightning.bus.BookmarkEvents.WantToBookmarkCurrentPage}. The interaction
- * result is a new bookmark added.
+ * The {@link acr.browser.lightning.activity.BrowserActivity} signal a new bookmark was added
+ * (mainly to the {@link acr.browser.lightning.fragment.BookmarksFragment}).
*/
- public static class AddBookmark {
+ public static class BookmarkAdded {
public final String title, url;
- public AddBookmark(final String title, final String url) {
+ public BookmarkAdded(final String title, final String url) {
this.title = title;
this.url = url;
}
}
/**
- * Used to reply to {@link acr.browser.lightning.fragment.BookmarksFragment} message
- * {@link acr.browser.lightning.bus.BookmarkEvents.WantInfoAboutCurrentPage}. This is generally
- * used to update the {@link acr.browser.lightning.fragment.BookmarksFragment} interface.
+ * Notify the current page has a new url. This is generally used to update the
+ * {@link acr.browser.lightning.fragment.BookmarksFragment} interface.
*/
public static class CurrentPageUrl {
public final String url;
@@ -41,4 +39,52 @@ public CurrentPageUrl(final String url) {
*/
public static class UserPressedBack {
}
+
+ /**
+ *
+ */
+
+ /**
+ * Notify the Browser to display a SnackBar in the main activity
+ */
+ public static class ShowSnackBarMessage {
+ @Nullable public final String message;
+ @StringRes
+ public final int stringRes;
+
+ public ShowSnackBarMessage(@Nullable final String message) {
+ this.message = message;
+ this.stringRes = -1;
+ }
+
+ public ShowSnackBarMessage(@StringRes final int stringRes) {
+ this.message = null;
+ this.stringRes = stringRes;
+ }
+ }
+
+ public final static class OpenHistoryInCurrentTab {
+ }
+
+ /**
+ * The user want to open the given url in the current tab
+ */
+ public final static class OpenUrlInCurrentTab {
+ public final String url;
+
+ public OpenUrlInCurrentTab(final String url) {
+ this.url = url;
+ }
+ }
+
+ /**
+ * The user ask to open the given url as new tab
+ */
+ public final static class OpenUrlInNewTab {
+ public final String url;
+
+ public OpenUrlInNewTab(final String url) {
+ this.url = url;
+ }
+ }
}
diff --git a/app/src/main/java/acr/browser/lightning/bus/NavigationEvents.java b/app/src/main/java/acr/browser/lightning/bus/NavigationEvents.java
new file mode 100644
index 000000000..5f7519fa3
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/bus/NavigationEvents.java
@@ -0,0 +1,34 @@
+package acr.browser.lightning.bus;
+
+/**
+ * Collections of navigation events, like go back or go forward
+ *
+ * @author Stefano Pacifici
+ * @date 2015/09/15
+ */
+public class NavigationEvents {
+ private NavigationEvents() {
+ // No instances please
+ }
+
+ /**
+ * Fired by {@link acr.browser.lightning.fragment.TabsFragment} when the user presses back
+ * button.
+ */
+ public static class GoBack {
+ }
+
+ /**
+ * Fired by {@link acr.browser.lightning.fragment.TabsFragment} when the user presses forward
+ * button.
+ */
+ public static class GoForward {
+ }
+
+ /**
+ * Fired by {@link acr.browser.lightning.fragment.TabsFragment} when the user presses the home
+ * button.
+ */
+ public static class GoHome {
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/bus/TabEvents.java b/app/src/main/java/acr/browser/lightning/bus/TabEvents.java
new file mode 100644
index 000000000..a2bac5c9d
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/bus/TabEvents.java
@@ -0,0 +1,65 @@
+package acr.browser.lightning.bus;
+
+/**
+ * A collection of events been sent by {@link acr.browser.lightning.fragment.TabsFragment}
+ *
+ * @author Stefano Pacifici
+ * @date 2015/09/14
+ */
+public final class TabEvents {
+
+ private TabEvents() {
+ // No instances
+ }
+
+
+ /**
+ * Sended by {@link acr.browser.lightning.fragment.TabsFragment} when the user click on the
+ * tab exit button
+ */
+ public static class CloseTab {
+ public final int position;
+
+ public CloseTab(int position) {
+ this.position = position;
+ }
+ }
+
+ /**
+ * Sended by {@link acr.browser.lightning.fragment.TabsFragment} when the user click on the
+ * tab itself.
+ */
+ public static class ShowTab {
+ public final int position;
+
+ public ShowTab(int position) {
+ this.position = position;
+ }
+ }
+
+ /**
+ * Sended by {@link acr.browser.lightning.fragment.TabsFragment} when the user long press on the
+ * tab itself.
+ */
+ public static class ShowCloseDialog {
+ public final int position;
+
+ public ShowCloseDialog(int position) {
+ this.position = position;
+ }
+ }
+
+ /**
+ * Sended by {@link acr.browser.lightning.fragment.TabsFragment} when the user want to create a
+ * new tab.
+ */
+ public static class NewTab {
+ }
+
+ /**
+ * Sended by {@link acr.browser.lightning.fragment.TabsFragment} when the user long presses on
+ * new tab button.
+ */
+ public static class NewTabLongPress {
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
index 67c176586..6e4a02ae1 100644
--- a/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
@@ -3,31 +3,44 @@
*/
package acr.browser.lightning.constant;
-import android.content.Context;
+import android.app.Activity;
+import android.app.Application;
+import android.graphics.Bitmap;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.lang.ref.WeakReference;
import java.util.List;
-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.HistoryItem;
+import acr.browser.lightning.utils.ThemeUtils;
import acr.browser.lightning.utils.Utils;
+import acr.browser.lightning.view.LightningView;
+
+public final class BookmarkPage extends AsyncTask {
-public final class BookmarkPage {
+ /**
+ * The bookmark page standard suffix
+ */
+ public static final String FILENAME = "bookmarks.html";
- private static final String HEADING = "\n" +
+ private static final String HEADING_1 = "\n" +
"\n" +
"\n" +
"\n" +
- "\n" +
- "" +
- BrowserApp.getAppContext().getString(R.string.action_bookmarks) +
- "\n" +
+ "\n" +
+ "";
+
+ private static final String HEADING_2 = "\n" +
"\n" +
"\n" +
@@ -41,7 +54,7 @@ public final class BookmarkPage {
"\n" +
"![](";
- private static final String PART3 = "http://www.google.com/s2/favicons?domain=";
+ private static final String PART3 = "https://www.google.com/s2/favicons?domain=";
private static final String PART4 = ")
";
@@ -49,55 +62,90 @@ public final class BookmarkPage {
private static final String END = "";
- @Inject
- BookmarkManager manager;
+ private File mFilesDir;
+ private File mCacheDir;
+
+ private final Application mApp;
+ private final BookmarkManager mManager;
+ @NonNull private final WeakReference mTabReference;
+ private final Bitmap mFolderIcon;
+ @NonNull private final String mTitle;
+
+ public BookmarkPage(LightningView tab, @NonNull Activity activity, BookmarkManager manager) {
+ mApp = BrowserApp.get(activity);
+ final Bitmap folderIcon = ThemeUtils.getThemedBitmap(activity, R.drawable.ic_folder, false);
+ mTitle = mApp.getString(R.string.action_bookmarks);
+ mManager = manager;
+ mTabReference = new WeakReference<>(tab);
+ mFolderIcon = folderIcon;
+ }
- private final File FILES_DIR;
- private final File CACHE_DIR;
+ @Override
+ protected Void doInBackground(Void... params) {
+ mCacheDir = mApp.getCacheDir();
+ mFilesDir = mApp.getFilesDir();
+ cacheDefaultFolderIcon();
+ buildBookmarkPage(null, mManager);
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ super.onPostExecute(aVoid);
+ LightningView tab = mTabReference.get();
+ if (tab != null) {
+ File bookmarkWebPage = new File(mFilesDir, FILENAME);
+ tab.loadUrl(Constants.FILE + bookmarkWebPage);
+ }
+ }
- @Inject
- public BookmarkPage(Context context) {
- BrowserApp.getAppComponent().inject(this);
- FILES_DIR = context.getFilesDir();
- CACHE_DIR = context.getCacheDir();
+ private void cacheDefaultFolderIcon() {
+ FileOutputStream outputStream = null;
+ File image = new File(mCacheDir, "folder.png");
+ try {
+ outputStream = new FileOutputStream(image);
+ mFolderIcon.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
+ mFolderIcon.recycle();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } finally {
+ Utils.close(outputStream);
+ }
}
- public void buildBookmarkPage(final String folder, final List list) {
+ private void buildBookmarkPage(@Nullable final String folder, @NonNull final BookmarkManager manager) {
+ final List list = manager.getBookmarksCopyFromFolder(folder, true);
final File bookmarkWebPage;
if (folder == null || folder.isEmpty()) {
- bookmarkWebPage = new File(FILES_DIR, Constants.BOOKMARKS_FILENAME);
+ bookmarkWebPage = new File(mFilesDir, FILENAME);
} else {
- bookmarkWebPage = new File(FILES_DIR, folder + '-' + Constants.BOOKMARKS_FILENAME);
+ bookmarkWebPage = new File(mFilesDir, folder + '-' + FILENAME);
}
- final StringBuilder bookmarkBuilder = new StringBuilder(BookmarkPage.HEADING);
+ final StringBuilder bookmarkBuilder = new StringBuilder(HEADING_1 + mTitle + HEADING_2);
- final String folderIconPath = Constants.FILE + CACHE_DIR + "/folder.png";
+ final String folderIconPath = Constants.FILE + mCacheDir + "/folder.png";
for (int n = 0, size = list.size(); n < size; n++) {
final HistoryItem item = list.get(n);
- bookmarkBuilder.append(BookmarkPage.PART1);
+ bookmarkBuilder.append(PART1);
if (item.isFolder()) {
- final File folderPage = new File(FILES_DIR, item.getTitle() + '-' + Constants.BOOKMARKS_FILENAME);
+ final File folderPage = new File(mFilesDir, item.getTitle() + '-' + FILENAME);
bookmarkBuilder.append(Constants.FILE).append(folderPage);
- bookmarkBuilder.append(BookmarkPage.PART2);
+ bookmarkBuilder.append(PART2);
bookmarkBuilder.append(folderIconPath);
- new Thread(new Runnable() {
- @Override
- public void run() {
- buildBookmarkPage(item.getTitle(), manager.getBookmarksFromFolder(item.getTitle(), true));
- }
- }).run();
+ buildBookmarkPage(item.getTitle(), manager);
} else {
bookmarkBuilder.append(item.getUrl());
- bookmarkBuilder.append(BookmarkPage.PART2).append(BookmarkPage.PART3);
+ bookmarkBuilder.append(PART2).append(PART3);
bookmarkBuilder.append(item.getUrl());
}
- bookmarkBuilder.append(BookmarkPage.PART4);
+ bookmarkBuilder.append(PART4);
bookmarkBuilder.append(item.getTitle());
- bookmarkBuilder.append(BookmarkPage.PART5);
+ bookmarkBuilder.append(PART5);
}
- bookmarkBuilder.append(BookmarkPage.END);
+ bookmarkBuilder.append(END);
FileWriter bookWriter = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
bookWriter = new FileWriter(bookmarkWebPage, false);
bookWriter.write(bookmarkBuilder.toString());
} catch (IOException e) {
@@ -107,4 +155,8 @@ public void run() {
}
}
+ public void load() {
+ executeOnExecutor(BrowserApp.getIOThread());
+ }
+
}
diff --git a/app/src/main/java/acr/browser/lightning/constant/Constants.java b/app/src/main/java/acr/browser/lightning/constant/Constants.java
index 33bc97335..3861a28e8 100644
--- a/app/src/main/java/acr/browser/lightning/constant/Constants.java
+++ b/app/src/main/java/acr/browser/lightning/constant/Constants.java
@@ -27,6 +27,22 @@ private Constants() {
public static final String YANDEX_SEARCH = "https://yandex.ru/yandsearch?lr=21411&text=";
public static final String JAVASCRIPT_INVERT_PAGE = "javascript:(function(){var e='img {-webkit-filter: invert(100%);'+'-moz-filter: invert(100%);'+'-o-filter: invert(100%);'+'-ms-filter: invert(100%); }',t=document.getElementsByTagName('head')[0],n=document.createElement('style');if(!window.counter){window.counter=1}else{window.counter++;if(window.counter%2==0){var e='html {-webkit-filter: invert(0%); -moz-filter: invert(0%); -o-filter: invert(0%); -ms-filter: invert(0%); }'}}n.type='text/css';if(n.styleSheet){n.styleSheet.cssText=e}else{n.appendChild(document.createTextNode(e))}t.appendChild(n)})();";
public static final String JAVASCRIPT_TEXT_REFLOW = "javascript:document.getElementsByTagName('body')[0].style.width=window.innerWidth+'px';";
+ public static final String JAVASCRIPT_THEME_COLOR = "(function () {\n" +
+ " \"use strict\";\n" +
+ " var metas, i, tag;\n" +
+ " metas = document.getElementsByTagName('meta');\n" +
+ " if (metas !== null) {\n" +
+ " for (i = 0; i < metas.length; i++) {\n" +
+ " tag = metas[i].getAttribute('name');\n" +
+ " if (tag !== null && tag.toLowerCase() === 'theme-color') {\n" +
+ " return metas[i].getAttribute('content');\n" +
+ " }\n" +
+ " console.log(tag);\n" +
+ " }\n" +
+ " }\n" +
+ '\n' +
+ " return '';\n" +
+ "}());";
public static final String LOAD_READING_URL = "ReadingUrl";
@@ -43,12 +59,9 @@ private Constants() {
public static final int PROXY_I2P = 2;
public static final int PROXY_MANUAL = 3;
- /**
- * The bookmark page standard suffix
- */
- public static final String BOOKMARKS_FILENAME = "bookmarks.html";
-
public static final String DEFAULT_ENCODING = "UTF-8";
public static final String[] TEXT_ENCODINGS = {"ISO-8859-1", "UTF-8", "GBK", "Big5", "ISO-2022-JP", "SHIFT_JS", "EUC-JP", "EUC-KR"};
+
+ public static final String INTENT_ORIGIN = "URL_INTENT_ORIGIN";
}
diff --git a/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
index 41dc907ad..e628e8ac6 100644
--- a/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
@@ -3,27 +3,32 @@
*/
package acr.browser.lightning.constant;
+import android.app.Application;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.lang.ref.WeakReference;
import java.util.Iterator;
import java.util.List;
-import android.content.Context;
-
-import acr.browser.lightning.app.BrowserApp;
-import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.R;
+import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.database.HistoryDatabase;
+import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.utils.Utils;
+import acr.browser.lightning.view.LightningView;
-public class HistoryPage {
+public class HistoryPage extends AsyncTask {
public static final String FILENAME = "history.html";
- private static final String HEADING = ""
- + BrowserApp.getAppContext().getString(R.string.action_history)
- + "";
+ private static final String HEADING_1 = "
";
+
+ private static final String HEADING_2 = "";
private static final String PART1 = "
historyList = getWebHistory(context);
+ @NonNull private final WeakReference mTabReference;
+ @NonNull private final Application mApp;
+ @NonNull private final String mTitle;
+ private final HistoryDatabase mHistoryDatabase;
+
+ @Nullable private String mHistoryUrl = null;
+
+ public HistoryPage(LightningView tab, @NonNull Application app, HistoryDatabase database) {
+ mTabReference = new WeakReference<>(tab);
+ mApp = app;
+ mTitle = app.getString(R.string.action_history);
+ mHistoryDatabase = database;
+ }
+
+ @Nullable
+ @Override
+ protected Void doInBackground(Void... params) {
+ mHistoryUrl = getHistoryPage();
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ super.onPostExecute(aVoid);
+ LightningView tab = mTabReference.get();
+ if (tab != null && mHistoryUrl != null) {
+ tab.loadUrl(mHistoryUrl);
+ }
+ }
+
+ @NonNull
+ private String getHistoryPage() {
+ StringBuilder historyBuilder = new StringBuilder(HEADING_1 + mTitle + HEADING_2);
+ List historyList = mHistoryDatabase.getLastHundredItems();
Iterator it = historyList.iterator();
HistoryItem helper;
while (it.hasNext()) {
helper = it.next();
- historyBuilder.append(HistoryPage.PART1);
+ historyBuilder.append(PART1);
historyBuilder.append(helper.getUrl());
- historyBuilder.append(HistoryPage.PART2);
+ historyBuilder.append(PART2);
historyBuilder.append(helper.getTitle());
- historyBuilder.append(HistoryPage.PART3);
+ historyBuilder.append(PART3);
historyBuilder.append(helper.getUrl());
- historyBuilder.append(HistoryPage.PART4);
+ historyBuilder.append(PART4);
}
- historyBuilder.append(HistoryPage.END);
- File historyWebPage = new File(context.getFilesDir(), FILENAME);
+ historyBuilder.append(END);
+ File historyWebPage = new File(mApp.getFilesDir(), FILENAME);
FileWriter historyWriter = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
historyWriter = new FileWriter(historyWebPage, false);
historyWriter.write(historyBuilder.toString());
} catch (IOException e) {
@@ -65,8 +102,22 @@ public static String getHistoryPage(Context context) {
return Constants.FILE + historyWebPage;
}
- private static List getWebHistory(Context context) {
- HistoryDatabase databaseHandler = HistoryDatabase.getInstance();
- return databaseHandler.getLastHundredItems();
+ public void load() {
+ executeOnExecutor(BrowserApp.getIOThread());
}
-}
+
+ /**
+ * Use this method to immediately delete the history
+ * page on the current thread. This will clear the
+ * cached history page that was stored on file.
+ *
+ * @param application the application object needed to get the file.
+ */
+ public static void deleteHistoryPage(@NonNull Application application) {
+ File historyWebPage = new File(application.getFilesDir(), FILENAME);
+ if (historyWebPage.exists()) {
+ historyWebPage.delete();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/acr/browser/lightning/constant/StartPage.java b/app/src/main/java/acr/browser/lightning/constant/StartPage.java
index 35b5453af..15de36510 100644
--- a/app/src/main/java/acr/browser/lightning/constant/StartPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/StartPage.java
@@ -3,29 +3,36 @@
*/
package acr.browser.lightning.constant;
-import android.app.Activity;
+import android.app.Application;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.lang.ref.WeakReference;
+
+import javax.inject.Inject;
-import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.R;
+import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.utils.Utils;
+import acr.browser.lightning.view.LightningView;
-public class StartPage {
+public class StartPage extends AsyncTask {
- private static final String FILENAME = "homepage.html";
+ public static final String FILENAME = "homepage.html";
- private static final String HEAD = ""
+ private static final String HEAD_1 = ""
+ ""
+ ""
+ ""
+ ""
- + ""
- + BrowserApp.getAppContext().getString(R.string.home)
- + ""
+ + "";
+
+ private static final String HEAD_2 = ""
+ ""
+ " ";
+ @NonNull private final String mTitle;
+ @NonNull private final Application mApp;
+ @NonNull private final WeakReference mTabReference;
+
+ @Inject PreferenceManager mPreferenceManager;
+
+ private String mStartpageUrl;
+
+ public StartPage(LightningView tab, @NonNull Application app) {
+ BrowserApp.getAppComponent().inject(this);
+ mTitle = app.getString(R.string.home);
+ mApp = app;
+ mTabReference = new WeakReference<>(tab);
+ }
+
+ @Nullable
+ @Override
+ protected Void doInBackground(Void... params) {
+ mStartpageUrl = getHomepage();
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ super.onPostExecute(aVoid);
+ LightningView tab = mTabReference.get();
+ if (tab != null) {
+ tab.loadUrl(mStartpageUrl);
+ }
+ }
+
/**
* This method builds the homepage and returns the local URL to be loaded
* when it finishes building.
*
* @return the URL to load
*/
- public static String getHomepage(Activity activity) {
- StringBuilder homepageBuilder = new StringBuilder(StartPage.HEAD);
+ @NonNull
+ private String getHomepage() {
+ StringBuilder homepageBuilder = new StringBuilder(HEAD_1 + mTitle + HEAD_2);
String icon;
String searchUrl;
- switch (PreferenceManager.getInstance().getSearchChoice()) {
+ switch (mPreferenceManager.getSearchChoice()) {
case 0:
// CUSTOM SEARCH
icon = "file:///android_asset/lightning.png";
- searchUrl = PreferenceManager.getInstance().getSearchUrl();
+ searchUrl = mPreferenceManager.getSearchUrl();
break;
case 1:
// GOOGLE_SEARCH;
@@ -88,14 +127,14 @@ public static String getHomepage(Activity activity) {
break;
case 5:
// STARTPAGE_SEARCH;
- icon = "file:///android_asset/startpage.png";
- // "https://startpage.com/graphics/startp_logo.gif";
+ icon = "file:///android_asset/png";
+ // "https://com/graphics/startp_logo.gif";
searchUrl = Constants.STARTPAGE_SEARCH;
break;
case 6:
// STARTPAGE_MOBILE
- icon = "file:///android_asset/startpage.png";
- // "https://startpage.com/graphics/startp_logo.gif";
+ icon = "file:///android_asset/png";
+ // "https://com/graphics/startp_logo.gif";
searchUrl = Constants.STARTPAGE_MOBILE_SEARCH;
break;
case 7:
@@ -131,13 +170,14 @@ public static String getHomepage(Activity activity) {
}
homepageBuilder.append(icon);
- homepageBuilder.append(StartPage.MIDDLE);
+ homepageBuilder.append(MIDDLE);
homepageBuilder.append(searchUrl);
- homepageBuilder.append(StartPage.END);
+ homepageBuilder.append(END);
- File homepage = new File(activity.getFilesDir(), StartPage.FILENAME);
+ File homepage = new File(mApp.getFilesDir(), FILENAME);
FileWriter hWriter = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
hWriter = new FileWriter(homepage, false);
hWriter.write(homepageBuilder.toString());
} catch (IOException e) {
@@ -148,4 +188,9 @@ public static String getHomepage(Activity activity) {
return Constants.FILE + homepage;
}
+
+ public void load() {
+ executeOnExecutor(BrowserApp.getIOThread());
+ }
+
}
diff --git a/app/src/main/java/acr/browser/lightning/controller/BrowserController.java b/app/src/main/java/acr/browser/lightning/controller/BrowserController.java
deleted file mode 100644
index 73c8e7fde..000000000
--- a/app/src/main/java/acr/browser/lightning/controller/BrowserController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2014 A.C.R. Development
- */
-package acr.browser.lightning.controller;
-
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Message;
-import android.view.View;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient.CustomViewCallback;
-import android.webkit.WebView;
-
-import acr.browser.lightning.view.LightningView;
-
-public interface BrowserController {
-
- void updateUrl(String title, boolean shortUrl);
-
- void updateProgress(int n);
-
- void updateHistory(String title, String url);
-
- void openFileChooser(ValueCallback uploadMsg);
-
- void updateTabs();
-
- void onLongPress();
-
- void onShowCustomView(View view, CustomViewCallback callback);
-
- void onHideCustomView();
-
- Bitmap getDefaultVideoPoster();
-
- View getVideoLoadingProgressView();
-
- void onCreateWindow(Message resultMsg);
-
- void onCloseWindow(LightningView view);
-
- void hideActionBar();
-
- void showActionBar();
-
- void longClickPage(String url);
-
- void openBookmarkPage(WebView view);
-
- void showFileChooser(ValueCallback filePathCallback);
-
- void closeEmptyTab();
-
- boolean proxyIsNotReady();
-
- // void updateBookmarkIndicator(String url);
-
-}
diff --git a/app/src/main/java/acr/browser/lightning/controller/UIController.java b/app/src/main/java/acr/browser/lightning/controller/UIController.java
new file mode 100644
index 000000000..e28ca136b
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/controller/UIController.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2014 A.C.R. Development
+ */
+package acr.browser.lightning.controller;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Message;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient.CustomViewCallback;
+
+import acr.browser.lightning.activity.TabsManager;
+import acr.browser.lightning.view.LightningView;
+
+public interface UIController {
+
+ void changeToolbarBackground(@NonNull Bitmap favicon, @Nullable Drawable drawable);
+
+ @ColorInt
+ int getUiColor();
+
+ boolean getUseDarkTheme();
+
+ void updateUrl(@Nullable String title, boolean shortUrl);
+
+ void updateProgress(int n);
+
+ void updateHistory(@Nullable String title, @NonNull String url);
+
+ void openFileChooser(ValueCallback uploadMsg);
+
+ void onShowCustomView(View view, CustomViewCallback callback);
+
+ void onShowCustomView(View view, CustomViewCallback callback, int requestedOrienation);
+
+ void onHideCustomView();
+
+ void onCreateWindow(Message resultMsg);
+
+ void onCloseWindow(LightningView view);
+
+ void hideActionBar();
+
+ void showActionBar();
+
+ void showFileChooser(ValueCallback filePathCallback);
+
+ void closeEmptyTab();
+
+ void showCloseDialog(int position);
+
+ void newTabClicked();
+
+ void setForwardButtonEnabled(boolean enabled);
+
+ void setBackButtonEnabled(boolean enabled);
+
+ void tabChanged(LightningView tab);
+
+ TabsManager getTabModel();
+
+}
diff --git a/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java b/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java
index 1c1b8c110..827c099b7 100644
--- a/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java
+++ b/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java
@@ -11,6 +11,9 @@
import java.util.ArrayList;
import java.util.List;
+import acr.browser.lightning.react.Action;
+import acr.browser.lightning.react.Observable;
+import acr.browser.lightning.react.Subscriber;
import acr.browser.lightning.utils.Utils;
public class BookmarkLocalSync {
@@ -19,25 +22,29 @@ public class BookmarkLocalSync {
private static final String STOCK_BOOKMARKS_CONTENT = "content://browser/bookmarks";
private static final String CHROME_BOOKMARKS_CONTENT = "content://com.android.chrome.browser/bookmarks";
+ private static final String CHROME_BETA_BOOKMARKS_CONTENT = "content://com.chrome.beta.browser/bookmarks";
+ private static final String CHROME_DEV_BOOKMARKS_CONTENT = "content://com.chrome.dev.browser/bookmarks";
private static final String COLUMN_TITLE = "title";
private static final String COLUMN_URL = "url";
private static final String COLUMN_BOOKMARK = "bookmark";
- private final Context mContext;
+ @NonNull private final Context mContext;
- public BookmarkLocalSync(Context context) {
+ public enum Source {
+ STOCK,
+ CHROME_STABLE,
+ CHROME_BETA,
+ CHROME_DEV
+ }
+
+ public BookmarkLocalSync(@NonNull Context context) {
mContext = context;
}
- @NonNull
- @WorkerThread
- public List getBookmarksFromStockBrowser() {
+ public List getBookmarksFromContentUri(String contentUri) {
List list = new ArrayList<>();
- if (!isStockSupported()) {
- return list;
- }
- Cursor cursor = getStockCursor();
+ Cursor cursor = getBrowserCursor(contentUri);
try {
if (cursor != null) {
for (int n = 0; n < cursor.getColumnCount(); n++) {
@@ -54,7 +61,9 @@ public List getBookmarksFromStockBrowser() {
if (title == null || title.isEmpty()) {
title = Utils.getDomainName(url);
}
- list.add(new HistoryItem(url, title));
+ if (title != null) {
+ list.add(new HistoryItem(url, title));
+ }
}
}
}
@@ -65,81 +74,133 @@ public List getBookmarksFromStockBrowser() {
return list;
}
- @NonNull
+ @Nullable
@WorkerThread
- public List getBookmarksFromChrome() {
- List list = new ArrayList<>();
- if (!isChromeSupported()) {
- return list;
- }
- Cursor cursor = getStockCursor();
+ private Cursor getBrowserCursor(String contentUri) {
+ Cursor cursor;
+ Uri uri = Uri.parse(contentUri);
try {
- if (cursor != null) {
- for (int n = 0; n < cursor.getColumnCount(); n++) {
- Log.d(TAG, cursor.getColumnName(n));
- }
+ cursor = mContext.getContentResolver().query(uri,
+ new String[]{COLUMN_URL, COLUMN_TITLE, COLUMN_BOOKMARK}, null, null, null);
+ } catch (IllegalArgumentException e) {
+ return null;
+ }
+ return cursor;
+ }
- while (cursor.moveToNext()) {
- if (cursor.getInt(2) == 1) {
- String url = cursor.getString(0);
- String title = cursor.getString(1);
- if (url.isEmpty()) {
- continue;
- }
- if (title == null || title.isEmpty()) {
- title = Utils.getDomainName(url);
- }
- list.add(new HistoryItem(url, title));
- }
+ @NonNull
+ public Observable> getSupportedBrowsers() {
+ return Observable.create(new Action>() {
+ @Override
+ public void onSubscribe(@NonNull Subscriber> subscriber) {
+ List sources = new ArrayList<>(1);
+ if (isBrowserSupported(STOCK_BOOKMARKS_CONTENT)) {
+ sources.add(Source.STOCK);
+ }
+ if (isBrowserSupported(CHROME_BOOKMARKS_CONTENT)) {
+ sources.add(Source.CHROME_STABLE);
+ }
+ if (isBrowserSupported(CHROME_BETA_BOOKMARKS_CONTENT)) {
+ sources.add(Source.CHROME_BETA);
}
+ if (isBrowserSupported(CHROME_DEV_BOOKMARKS_CONTENT)) {
+ sources.add(Source.CHROME_DEV);
+ }
+ subscriber.onNext(sources);
+ subscriber.onComplete();
}
- } catch (Exception e) {
- e.printStackTrace();
- }
+ });
+ }
+
+ private boolean isBrowserSupported(String contentUri) {
+ Cursor cursor = getBrowserCursor(contentUri);
+ boolean supported = cursor != null;
Utils.close(cursor);
- return list;
+ return supported;
}
+ @NonNull
@WorkerThread
- public boolean isStockSupported() {
- Cursor cursor = getStockCursor();
- Utils.close(cursor);
- return cursor != null;
+ public List getBookmarksFromStockBrowser() {
+ return getBookmarksFromContentUri(STOCK_BOOKMARKS_CONTENT);
}
+ @NonNull
@WorkerThread
- public boolean isChromeSupported() {
- Cursor cursor = getChromeCursor();
- Utils.close(cursor);
- return cursor != null;
+ public List getBookmarksFromChrome() {
+ return getBookmarksFromContentUri(CHROME_BOOKMARKS_CONTENT);
+ }
+
+ @NonNull
+ @WorkerThread
+ public List getBookmarksFromChromeBeta() {
+ return getBookmarksFromContentUri(CHROME_BETA_BOOKMARKS_CONTENT);
+ }
+
+ @NonNull
+ @WorkerThread
+ public List getBookmarksFromChromeDev() {
+ return getBookmarksFromContentUri(CHROME_DEV_BOOKMARKS_CONTENT);
+ }
+
+ @WorkerThread
+ public boolean isBrowserImportSupported() {
+ Cursor chrome = getChromeCursor();
+ Utils.close(chrome);
+ Cursor dev = getChromeDevCursor();
+ Utils.close(dev);
+ Cursor beta = getChromeBetaCursor();
+ Cursor stock = getStockCursor();
+ Utils.close(stock);
+ return chrome != null || dev != null || beta != null || stock != null;
+ }
+
+ @Nullable
+ @WorkerThread
+ private Cursor getChromeBetaCursor() {
+ return getBrowserCursor(CHROME_BETA_BOOKMARKS_CONTENT);
+ }
+
+ @Nullable
+ @WorkerThread
+ private Cursor getChromeDevCursor() {
+ return getBrowserCursor(CHROME_DEV_BOOKMARKS_CONTENT);
}
@Nullable
@WorkerThread
private Cursor getChromeCursor() {
- Cursor cursor;
- Uri uri = Uri.parse(CHROME_BOOKMARKS_CONTENT);
- try {
- cursor = mContext.getContentResolver().query(uri,
- new String[]{COLUMN_URL, COLUMN_TITLE, COLUMN_BOOKMARK}, null, null, null);
- } catch (IllegalArgumentException e) {
- return null;
- }
- return cursor;
+ return getBrowserCursor(CHROME_BOOKMARKS_CONTENT);
}
@Nullable
@WorkerThread
private Cursor getStockCursor() {
- Cursor cursor;
- Uri uri = Uri.parse(STOCK_BOOKMARKS_CONTENT);
+ return getBrowserCursor(STOCK_BOOKMARKS_CONTENT);
+ }
+
+ public void printAllColumns() {
+ printColumns(CHROME_BETA_BOOKMARKS_CONTENT);
+ printColumns(CHROME_BOOKMARKS_CONTENT);
+ printColumns(CHROME_DEV_BOOKMARKS_CONTENT);
+ printColumns(STOCK_BOOKMARKS_CONTENT);
+ }
+
+ public void printColumns(String contentProvider) {
+ Cursor cursor = null;
+ Log.e(TAG, contentProvider);
+ Uri uri = Uri.parse(contentProvider);
try {
- cursor = mContext.getContentResolver().query(uri,
- new String[]{COLUMN_URL, COLUMN_TITLE, COLUMN_BOOKMARK}, null, null, null);
- } catch (IllegalArgumentException e) {
- return null;
+ cursor = mContext.getContentResolver().query(uri, null, null, null, null);
+ } catch (Exception e) {
+ Log.e(TAG, "Error Occurred", e);
+ }
+ if (cursor != null) {
+ for (int n = 0; n < cursor.getColumnCount(); n++) {
+ Log.d(TAG, cursor.getColumnName(n));
+ }
+ cursor.close();
}
- return cursor;
}
}
diff --git a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
index 3790146f9..60e61783f 100644
--- a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
+++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
@@ -32,6 +32,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.inject.Inject;
import javax.inject.Singleton;
import acr.browser.lightning.R;
@@ -49,29 +50,20 @@ public class BookmarkManager {
private static final String ORDER = "order";
private static final String FILE_BOOKMARKS = "bookmarks.dat";
- private final String DEFAULT_BOOKMARK_TITLE;
+ @NonNull private final String DEFAULT_BOOKMARK_TITLE;
private Map mBookmarksMap;
- // private final List mBookmarkList = new ArrayList<>();
- private String mCurrentFolder = "";
- private final ExecutorService mExecutor;
- private boolean mReady = false;
- private final File mFilesDir;
+ @NonNull private String mCurrentFolder = "";
+ @NonNull private final ExecutorService mExecutor;
+ private File mFilesDir;
- public BookmarkManager(Context context) {
+ @Inject
+ public BookmarkManager(@NonNull Context context) {
mExecutor = Executors.newSingleThreadExecutor();
- mFilesDir = context.getFilesDir();
DEFAULT_BOOKMARK_TITLE = context.getString(R.string.untitled);
mExecutor.execute(new BookmarkInitializer(context));
}
- /**
- * @return true if the BookmarkManager was initialized, false otherwise
- */
- public boolean isReady() {
- return mReady;
- }
-
/**
* Look for bookmark using the url
*
@@ -97,6 +89,7 @@ public BookmarkInitializer(Context context) {
@Override
public void run() {
synchronized (BookmarkManager.this) {
+ mFilesDir = mContext.getFilesDir();
final Map bookmarks = new HashMap<>();
final File bookmarksFile = new File(mFilesDir, FILE_BOOKMARKS);
@@ -104,10 +97,12 @@ public void run() {
InputStream inputStream = null;
try {
if (bookmarksFile.exists() && bookmarksFile.isFile()) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
inputStream = new FileInputStream(bookmarksFile);
} else {
inputStream = mContext.getResources().openRawResource(R.raw.default_bookmarks);
}
+ //noinspection IOResourceOpenedButNotSafelyClosed
bookmarksReader = new BufferedReader(new InputStreamReader(inputStream));
String line;
while ((line = bookmarksReader.readLine()) != null) {
@@ -132,7 +127,6 @@ public void run() {
Utils.close(inputStream);
}
mBookmarksMap = bookmarks;
- mReady = true;
}
}
@@ -152,11 +146,12 @@ public BookmarksWriter(List bookmarks) {
@Override
public void run() {
final File tempFile = new File(mFilesDir,
- String.format("bm_%d.dat", System.currentTimeMillis()));
+ String.format(Locale.US, "bm_%d.dat", System.currentTimeMillis()));
final File bookmarksFile = new File(mFilesDir, FILE_BOOKMARKS);
boolean success = false;
BufferedWriter bookmarkWriter = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
bookmarkWriter = new BufferedWriter(new FileWriter(tempFile, false));
JSONObject object = new JSONObject();
for (HistoryItem item : mBookmarks) {
@@ -168,7 +163,7 @@ public void run() {
bookmarkWriter.newLine();
}
success = true;
- } catch (IOException | JSONException e) {
+ } catch (@NonNull IOException | JSONException e) {
e.printStackTrace();
} finally {
Utils.close(bookmarkWriter);
@@ -176,6 +171,7 @@ public void run() {
if (success) {
// Overwrite the bookmarks file by renaming the temp file
+ //noinspection ResultOfMethodCallIgnored
tempFile.renameTo(bookmarksFile);
}
}
@@ -200,7 +196,7 @@ public boolean isBookmark(String url) {
*/
public synchronized boolean addBookmark(@NonNull HistoryItem item) {
final String url = item.getUrl();
- if (url == null || mBookmarksMap.containsKey(url)) {
+ if (mBookmarksMap.containsKey(url)) {
return false;
}
mBookmarksMap.put(url, item);
@@ -213,13 +209,13 @@ public synchronized boolean addBookmark(@NonNull HistoryItem item) {
*
* @param list the list of HistoryItems to add to bookmarks
*/
- public synchronized void addBookmarkList(List list) {
+ public synchronized void addBookmarkList(@Nullable List list) {
if (list == null || list.isEmpty()) {
return;
}
for (HistoryItem item : list) {
final String url = item.getUrl();
- if (url != null && !mBookmarksMap.containsKey(url)) {
+ if (!mBookmarksMap.containsKey(url)) {
mBookmarksMap.put(url, item);
}
}
@@ -232,7 +228,7 @@ public synchronized void addBookmarkList(List list) {
*
* @param deleteItem the bookmark item to delete
*/
- public synchronized boolean deleteBookmark(HistoryItem deleteItem) {
+ public synchronized boolean deleteBookmark(@Nullable HistoryItem deleteItem) {
if (deleteItem == null || deleteItem.isFolder()) {
return false;
}
@@ -286,13 +282,23 @@ public synchronized void deleteFolder(@NonNull String name) {
mExecutor.execute(new BookmarksWriter(new LinkedList<>(mBookmarksMap.values())));
}
+ /**
+ * This method deletes ALL bookmarks created
+ * by the user. Use this method carefully and
+ * do not use it without explicit user consent.
+ */
+ public synchronized void deleteAllBookmarks() {
+ mBookmarksMap = new HashMap<>();
+ mExecutor.execute(new BookmarksWriter(new LinkedList<>(mBookmarksMap.values())));
+ }
+
/**
* This method edits a particular bookmark in the bookmark database
*
* @param oldItem This is the old item that you wish to edit
* @param newItem This is the new item that will overwrite the old item
*/
- public synchronized void editBookmark(HistoryItem oldItem, HistoryItem newItem) {
+ public synchronized void editBookmark(@Nullable HistoryItem oldItem, @Nullable HistoryItem newItem) {
if (oldItem == null || newItem == null || oldItem.isFolder()) {
return;
}
@@ -317,7 +323,7 @@ public synchronized void editBookmark(HistoryItem oldItem, HistoryItem newItem)
* This method exports the stored bookmarks to a text file in the device's
* external download directory
*/
- public synchronized void exportBookmarks(Activity activity) {
+ public synchronized void exportBookmarks(@NonNull Activity activity) {
List bookmarkList = getAllBookmarks(true);
File bookmarksExport = new File(
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
@@ -331,6 +337,7 @@ public synchronized void exportBookmarks(Activity activity) {
}
BufferedWriter bookmarkWriter = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
bookmarkWriter = new BufferedWriter(new FileWriter(bookmarksExport,
false));
JSONObject object = new JSONObject();
@@ -344,7 +351,7 @@ public synchronized void exportBookmarks(Activity activity) {
}
Utils.showSnackbar(activity, activity.getString(R.string.bookmark_export_path)
+ ' ' + bookmarksExport.getPath());
- } catch (IOException | JSONException e) {
+ } catch (@NonNull IOException | JSONException e) {
e.printStackTrace();
} finally {
Utils.close(bookmarkWriter);
@@ -360,6 +367,7 @@ public synchronized void exportBookmarks(Activity activity) {
* @param sort force to sort the returned bookmarkList
* @return returns a list of bookmarks that can be sorted
*/
+ @NonNull
public synchronized List getAllBookmarks(boolean sort) {
final List bookmarks = new ArrayList<>(mBookmarksMap.values());
if (sort) {
@@ -377,8 +385,9 @@ public synchronized List getAllBookmarks(boolean sort) {
* @param folder the name of the folder to retrieve bookmarks from
* @return a list of bookmarks found in that folder
*/
- public synchronized List getBookmarksFromFolder(String folder, boolean sort) {
- List bookmarks = new ArrayList<>();
+ @NonNull
+ public synchronized List getBookmarksFromFolder(@Nullable String folder, boolean sort) {
+ List bookmarks = new ArrayList<>(1);
if (folder == null || folder.isEmpty()) {
bookmarks.addAll(getFolders(sort));
folder = "";
@@ -394,6 +403,36 @@ public synchronized List getBookmarksFromFolder(String folder, bool
return bookmarks;
}
+ /**
+ * Different from {@link #getBookmarksFromFolder(String, boolean)} only in
+ * that it doesn't affect the internal state of the bookmark manager which
+ * tracks the current folder used by the bookmark drawer.
+ *
+ * This method returns a list of bookmarks and folders located in the specified folder.
+ * This method should generally be used by the UI when it needs a list to display to the
+ * user as it returns a subset of all bookmarks and includes folders as well which are
+ * really 'fake' bookmarks.
+ *
+ * @param folder the name of the folder to retrieve bookmarks from
+ * @return a list of bookmarks found in that folder
+ */
+ @NonNull
+ public synchronized List getBookmarksCopyFromFolder(@Nullable String folder, boolean sort) {
+ List bookmarks = new ArrayList<>(1);
+ if (folder == null || folder.isEmpty()) {
+ bookmarks.addAll(getFolders(sort));
+ folder = "";
+ }
+ for (HistoryItem item : mBookmarksMap.values()) {
+ if (item.getFolder().equals(folder))
+ bookmarks.add(item);
+ }
+ if (sort) {
+ Collections.sort(bookmarks, new SortIgnoreCase());
+ }
+ return bookmarks;
+ }
+
/**
* Tells you if you are at the root folder or in a subfolder
*
@@ -408,24 +447,11 @@ public boolean isRootFolder() {
*
* @return the current folder
*/
+ @Nullable
public String getCurrentFolder() {
return mCurrentFolder;
}
- /**
- * Method is used internally for searching the bookmarks
- *
- * @return a sorted map of all bookmarks, useful for seeing if a bookmark exists
- */
- private Set getBookmarkUrls(List list) {
- Set set = new HashSet<>();
- for (HistoryItem item : mBookmarksMap.values()) {
- if (!item.isFolder())
- set.add(item.getUrl());
- }
- return set;
- }
-
/**
* This method returns a list of all folders.
* Folders cannot be empty as they are generated from
@@ -433,11 +459,12 @@ private Set getBookmarkUrls(List list) {
*
* @return a list of all folders
*/
+ @NonNull
private synchronized List getFolders(boolean sort) {
final HashMap folders = new HashMap<>();
for (HistoryItem item : mBookmarksMap.values()) {
final String folderName = item.getFolder();
- if (folderName != null && !folderName.isEmpty() && !folders.containsKey(folderName)) {
+ if (!folderName.isEmpty() && !folders.containsKey(folderName)) {
final HistoryItem folder = new HistoryItem();
folder.setIsFolder(true);
folder.setTitle(folderName);
@@ -459,11 +486,12 @@ private synchronized List getFolders(boolean sort) {
*
* @return a list of folder title strings
*/
+ @NonNull
public synchronized List getFolderTitles() {
final Set folders = new HashSet<>();
for (HistoryItem item : mBookmarksMap.values()) {
final String folderName = item.getFolder();
- if (folderName != null && !folderName.isEmpty()) {
+ if (!folderName.isEmpty()) {
folders.add(folderName);
}
}
@@ -476,13 +504,14 @@ public synchronized List getFolderTitles() {
*
* @param file the file to attempt to import bookmarks from
*/
- public synchronized void importBookmarksFromFile(File file, Activity activity) {
+ public synchronized void importBookmarksFromFile(@Nullable File file, @NonNull Activity activity) {
if (file == null) {
return;
}
List list = new ArrayList<>();
BufferedReader bookmarksReader = null;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
bookmarksReader = new BufferedReader(new FileReader(file));
String line;
int number = 0;
@@ -499,7 +528,7 @@ public synchronized void importBookmarksFromFile(File file, Activity activity) {
addBookmarkList(list);
String message = activity.getResources().getString(R.string.message_import);
Utils.showSnackbar(activity, number + " " + message);
- } catch (IOException | JSONException e) {
+ } catch (@NonNull IOException | JSONException e) {
e.printStackTrace();
Utils.createInformativeDialog(activity, R.string.title_error, R.string.import_bookmark_error);
} finally {
@@ -507,29 +536,13 @@ public synchronized void importBookmarksFromFile(File file, Activity activity) {
}
}
- /**
- * find the index of a bookmark in a list using only its URL
- *
- * @param list the list to search
- * @param url the url to compare
- * @return returns the index of the bookmark or -1 if none was found
- */
- public static int getIndexOfBookmark(final List list, final String url) {
- for (int n = 0; n < list.size(); n++) {
- if (list.get(n).getUrl().equals(url)) {
- return n;
- }
- }
- return -1;
- }
-
/**
* This class sorts bookmarks alphabetically, with folders coming after bookmarks
*/
- public static class SortIgnoreCase implements Comparator {
+ private static class SortIgnoreCase implements Comparator {
- public int compare(HistoryItem o1, HistoryItem o2) {
- if (o1 == null || o2 == null || o1.getTitle() == null || o2.getTitle() == null) {
+ public int compare(@Nullable HistoryItem o1, @Nullable HistoryItem o2) {
+ if (o1 == null || o2 == null) {
return 0;
}
if (o1.isFolder() == o2.isFolder()) {
diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
index 82801c557..ecbcfd2cd 100644
--- a/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
+++ b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
@@ -8,13 +8,19 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp;
+@Singleton
public class HistoryDatabase extends SQLiteOpenHelper {
// All Static variables
@@ -33,27 +39,28 @@ public class HistoryDatabase extends SQLiteOpenHelper {
private static final String KEY_TITLE = "title";
private static final String KEY_TIME_VISITED = "time";
- private SQLiteDatabase mDatabase;
-
- private static HistoryDatabase mInstance;
-
- private boolean mLock;
+ @Nullable private SQLiteDatabase mDatabase;
- public static HistoryDatabase getInstance() {
- if (mInstance == null || mInstance.isClosed()) {
- mInstance = new HistoryDatabase(BrowserApp.getAppContext());
- }
- return mInstance;
+ @Inject
+ public HistoryDatabase(@NonNull Context context) {
+ super(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
+ initialize();
}
- private HistoryDatabase(Context context) {
- super(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
- mDatabase = this.getWritableDatabase();
+ private void initialize() {
+ BrowserApp.getTaskThread().execute(new Runnable() {
+ @Override
+ public void run() {
+ synchronized (HistoryDatabase.this) {
+ mDatabase = HistoryDatabase.this.getWritableDatabase();
+ }
+ }
+ });
}
// Creating Tables
@Override
- public void onCreate(SQLiteDatabase db) {
+ public void onCreate(@NonNull SQLiteDatabase db) {
String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + '(' + KEY_ID
+ " INTEGER PRIMARY KEY," + KEY_URL + " TEXT," + KEY_TITLE + " TEXT,"
+ KEY_TIME_VISITED + " INTEGER" + ')';
@@ -62,78 +69,69 @@ public void onCreate(SQLiteDatabase db) {
// Upgrading database
@Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
// Drop older table if it exists
db.execSQL("DROP TABLE IF EXISTS " + TABLE_HISTORY);
// Create tables again
onCreate(db);
}
- public void deleteHistory() {
+ public synchronized void deleteHistory() {
+ mDatabase = openIfNecessary();
mDatabase.delete(TABLE_HISTORY, null, null);
mDatabase.close();
mDatabase = this.getWritableDatabase();
}
- public boolean isClosed() {
- return mDatabase == null || !mDatabase.isOpen();
- }
-
@Override
public synchronized void close() {
- if (!mLock) {
- if (mDatabase != null) {
- mDatabase.close();
- mDatabase = null;
- }
+ if (mDatabase != null) {
+ mDatabase.close();
+ mDatabase = null;
}
super.close();
}
- private void openIfNecessary() {
- if (mDatabase == null) {
+ @NonNull
+ private SQLiteDatabase openIfNecessary() {
+ if (mDatabase == null || !mDatabase.isOpen()) {
mDatabase = this.getWritableDatabase();
}
+ return mDatabase;
}
- public synchronized void deleteHistoryItem(String url) {
- mLock = true;
- openIfNecessary();
+ public synchronized void deleteHistoryItem(@NonNull String url) {
+ mDatabase = openIfNecessary();
mDatabase.delete(TABLE_HISTORY, KEY_URL + " = ?", new String[]{url});
- mLock = false;
}
- public synchronized void visitHistoryItem(String url, String title) {
- mLock = true;
- openIfNecessary();
+ public synchronized void visitHistoryItem(@NonNull String url, @Nullable String title) {
+ mDatabase = openIfNecessary();
ContentValues values = new ContentValues();
- values.put(KEY_TITLE, title);
+ values.put(KEY_TITLE, title == null ? "" : title);
values.put(KEY_TIME_VISITED, System.currentTimeMillis());
Cursor q = mDatabase.query(false, TABLE_HISTORY, new String[]{KEY_URL},
KEY_URL + " = ?", new String[]{url}, null, null, null, "1");
if (q.getCount() > 0) {
mDatabase.update(TABLE_HISTORY, values, KEY_URL + " = ?", new String[]{url});
} else {
- addHistoryItem(new HistoryItem(url, title));
+ addHistoryItem(new HistoryItem(url, title == null ? "" : title));
}
q.close();
- mLock = false;
}
- private synchronized void addHistoryItem(HistoryItem item) {
- mLock = true;
- openIfNecessary();
+ private synchronized void addHistoryItem(@NonNull HistoryItem item) {
+ mDatabase = openIfNecessary();
ContentValues values = new ContentValues();
values.put(KEY_URL, item.getUrl());
values.put(KEY_TITLE, item.getTitle());
values.put(KEY_TIME_VISITED, System.currentTimeMillis());
mDatabase.insert(TABLE_HISTORY, null, values);
- mLock = false;
}
- String getHistoryItem(String url) {
- mLock = true;
- openIfNecessary();
+ @Nullable
+ synchronized String getHistoryItem(@NonNull String url) {
+ mDatabase = openIfNecessary();
Cursor cursor = mDatabase.query(TABLE_HISTORY, new String[]{KEY_ID, KEY_URL, KEY_TITLE},
KEY_URL + " = ?", new String[]{url}, null, null, null, null);
String m = null;
@@ -143,14 +141,16 @@ String getHistoryItem(String url) {
cursor.close();
}
- mLock = false;
return m;
}
- public List findItemsContaining(String search) {
- mLock = true;
- openIfNecessary();
+ @NonNull
+ public synchronized List findItemsContaining(@Nullable String search) {
+ mDatabase = openIfNecessary();
List itemList = new ArrayList<>(5);
+ if (search == null) {
+ return itemList;
+ }
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " WHERE " + KEY_TITLE + " LIKE '%"
+ search + "%' OR " + KEY_URL + " LIKE '%" + search + "%' " + "ORDER BY "
+ KEY_TIME_VISITED + " DESC LIMIT 5";
@@ -168,13 +168,12 @@ public List findItemsContaining(String search) {
} while (cursor.moveToNext() && n < 5);
}
cursor.close();
- mLock = false;
return itemList;
}
- public List getLastHundredItems() {
- mLock = true;
- openIfNecessary();
+ @NonNull
+ public synchronized List getLastHundredItems() {
+ mDatabase = openIfNecessary();
List itemList = new ArrayList<>(100);
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED
+ " DESC";
@@ -192,13 +191,12 @@ public List getLastHundredItems() {
} while (cursor.moveToNext() && counter < 100);
}
cursor.close();
- mLock = false;
return itemList;
}
- public List getAllHistoryItems() {
- mLock = true;
- openIfNecessary();
+ @NonNull
+ public synchronized List getAllHistoryItems() {
+ mDatabase = openIfNecessary();
List itemList = new ArrayList<>();
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED
+ " DESC";
@@ -215,18 +213,15 @@ public List getAllHistoryItems() {
} while (cursor.moveToNext());
}
cursor.close();
- mLock = false;
return itemList;
}
- public int getHistoryItemsCount() {
- mLock = true;
- openIfNecessary();
+ public synchronized int getHistoryItemsCount() {
+ mDatabase = openIfNecessary();
String countQuery = "SELECT * FROM " + TABLE_HISTORY;
Cursor cursor = mDatabase.rawQuery(countQuery, null);
int n = cursor.getCount();
cursor.close();
- mLock = false;
return n;
}
}
diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
index dcc8bc1fd..c0c662689 100644
--- a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
+++ b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
@@ -7,6 +7,8 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import acr.browser.lightning.utils.Preconditions;
+
public class HistoryItem implements Comparable {
// private variables
@@ -26,10 +28,9 @@ public class HistoryItem implements Comparable {
private int mOrder = 0;
private boolean mIsFolder = false;
- // Empty constructor
public HistoryItem() {}
- public HistoryItem(HistoryItem item) {
+ public HistoryItem(@NonNull HistoryItem item) {
this.mUrl = item.mUrl;
this.mTitle = item.mTitle;
this.mFolder = item.mFolder;
@@ -37,15 +38,17 @@ public HistoryItem(HistoryItem item) {
this.mIsFolder = item.mIsFolder;
}
- // constructor
public HistoryItem(@NonNull String url, @NonNull String title) {
+ Preconditions.checkNonNull(url);
+ Preconditions.checkNonNull(title);
this.mUrl = url;
this.mTitle = title;
this.mBitmap = null;
}
- // constructor
public HistoryItem(@NonNull String url, @NonNull String title, int imageId) {
+ Preconditions.checkNonNull(url);
+ Preconditions.checkNonNull(title);
this.mUrl = url;
this.mTitle = title;
this.mBitmap = null;
@@ -64,7 +67,7 @@ public void setBitmap(Bitmap image) {
mBitmap = image;
}
- public void setFolder(String folder) {
+ public void setFolder(@Nullable String folder) {
mFolder = (folder == null) ? "" : folder;
}
@@ -76,31 +79,31 @@ public int getOrder() {
return mOrder;
}
+ @NonNull
public String getFolder() {
return mFolder;
}
+ @Nullable
public Bitmap getBitmap() {
return mBitmap;
}
- // getting name
+ @NonNull
public String getUrl() {
return this.mUrl;
}
- // setting name
- public void setUrl(String url) {
+ public void setUrl(@Nullable String url) {
this.mUrl = (url == null) ? "" : url;
}
- // getting phone number
+ @NonNull
public String getTitle() {
return this.mTitle;
}
- // setting phone number
- public void setTitle(String title) {
+ public void setTitle(@Nullable String title) {
this.mTitle = (title == null) ? "" : title;
}
@@ -112,6 +115,7 @@ public boolean isFolder() {
return mIsFolder;
}
+ @NonNull
@Override
public String toString() {
return mTitle;
@@ -127,7 +131,7 @@ public int compareTo(@NonNull HistoryItem another) {
}
@Override
- public boolean equals(Object object) {
+ public boolean equals(@Nullable Object object) {
if (this == object) return true;
if (object == null) return false;
diff --git a/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
similarity index 51%
rename from app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java
rename to app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
index ec8282c9e..25279f068 100644
--- a/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java
+++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
@@ -1,8 +1,12 @@
package acr.browser.lightning.dialog;
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
import android.content.Context;
import android.content.DialogInterface;
import android.net.Uri;
+import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.ArrayAdapter;
@@ -19,69 +23,75 @@
import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.bus.BookmarkEvents;
+import acr.browser.lightning.bus.BrowserEvents;
+import acr.browser.lightning.constant.BookmarkPage;
import acr.browser.lightning.constant.Constants;
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.Utils;
/**
+ * TODO Rename this class it doesn't build dialogs only for bookmarks
+ *
* Created by Stefano Pacifici on 02/09/15, based on Anthony C. Restaino's code.
*/
-public class BookmarksDialogBuilder {
+public class LightningDialogBuilder {
- @Inject
- BookmarkManager bookmarkManager;
-
- @Inject
- Bus eventBus;
+ @Inject BookmarkManager mBookmarkManager;
+ @Inject PreferenceManager mPreferenceManager;
+ @Inject HistoryDatabase mHistoryDatabase;
+ @Inject Bus mEventBus;
@Inject
- public BookmarksDialogBuilder() {
+ public LightningDialogBuilder() {
BrowserApp.getAppComponent().inject(this);
}
/**
* Show the appropriated dialog for the long pressed link. It means that we try to understand
* if the link is relative to a bookmark or is just a folder.
- * @param context used to show the dialog
- * @param url the long pressed url
+ *
+ * @param context used to show the dialog
+ * @param url the long pressed url
*/
- public void showLongPressedDialogForUrl(final Context context, final String url) {
+ public void showLongPressedDialogForBookmarkUrl(@NonNull final Context context, @NonNull final String url) {
final HistoryItem item;
- if (url.startsWith(Constants.FILE) && url.endsWith(Constants.BOOKMARKS_FILENAME)) {
+ if (url.startsWith(Constants.FILE) && url.endsWith(BookmarkPage.FILENAME)) {
// TODO hacky, make a better bookmark mechanism in the future
final Uri uri = Uri.parse(url);
final String filename = uri.getLastPathSegment();
- final String folderTitle = filename.substring(0, filename.length() - Constants.BOOKMARKS_FILENAME.length() - 1);
+ final String folderTitle = filename.substring(0, filename.length() - BookmarkPage.FILENAME.length() - 1);
item = new HistoryItem();
item.setIsFolder(true);
item.setTitle(folderTitle);
item.setImageId(R.drawable.ic_folder);
item.setUrl(Constants.FOLDER + folderTitle);
} else {
- item = bookmarkManager.findBookmarkForUrl(url);
+ item = mBookmarkManager.findBookmarkForUrl(url);
}
if (item != null) {
if (item.isFolder()) {
showBookmarkFolderLongPressedDialog(context, item);
} else {
- showLongPressedDialogForUrl(context, item);
+ showLongPressedDialogForBookmarkUrl(context, item);
}
}
}
- public void showLongPressedDialogForUrl(final Context context, final HistoryItem item) {
+ public void showLongPressedDialogForBookmarkUrl(@NonNull final Context context, @NonNull final HistoryItem item) {
final DialogInterface.OnClickListener dialogClickListener =
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
- eventBus.post(new BookmarkEvents.AsNewTab(item));
+ mEventBus.post(new BrowserEvents.OpenUrlInNewTab(item.getUrl()));
break;
case DialogInterface.BUTTON_NEGATIVE:
- if (bookmarkManager.deleteBookmark(item)) {
- eventBus.post(new BookmarkEvents.Deleted(item));
+ if (mBookmarkManager.deleteBookmark(item)) {
+ mEventBus.post(new BookmarkEvents.Deleted(item));
}
break;
case DialogInterface.BUTTON_NEUTRAL:
@@ -101,7 +111,7 @@ public void onClick(DialogInterface dialog, int which) {
.show();
}
- private void showEditBookmarkDialog(final Context context, final HistoryItem item) {
+ private void showEditBookmarkDialog(@NonNull final Context context, @NonNull final HistoryItem item) {
final AlertDialog.Builder editBookmarkDialog = new AlertDialog.Builder(context);
editBookmarkDialog.setTitle(R.string.title_edit_bookmark);
final View dialogLayout = View.inflate(context, R.layout.dialog_edit_bookmark, null);
@@ -113,7 +123,7 @@ private void showEditBookmarkDialog(final Context context, final HistoryItem ite
(AutoCompleteTextView) dialogLayout.findViewById(R.id.bookmark_folder);
getFolder.setHint(R.string.folder);
getFolder.setText(item.getFolder());
- final List folders = bookmarkManager.getFolderTitles();
+ final List folders = mBookmarkManager.getFolderTitles();
final ArrayAdapter suggestionsAdapter = new ArrayAdapter<>(context,
android.R.layout.simple_dropdown_item_1line, folders);
getFolder.setThreshold(1);
@@ -129,14 +139,14 @@ public void onClick(DialogInterface dialog, int which) {
editedItem.setUrl(getUrl.getText().toString());
editedItem.setUrl(getUrl.getText().toString());
editedItem.setFolder(getFolder.getText().toString());
- bookmarkManager.editBookmark(item, editedItem);
- eventBus.post(new BookmarkEvents.BookmarkChanged(item, editedItem));
+ mBookmarkManager.editBookmark(item, editedItem);
+ mEventBus.post(new BookmarkEvents.BookmarkChanged(item, editedItem));
}
});
editBookmarkDialog.show();
}
- public void showBookmarkFolderLongPressedDialog(final Context context, final HistoryItem item) {
+ public void showBookmarkFolderLongPressedDialog(@NonNull final Context context, @NonNull final HistoryItem item) {
// assert item.isFolder();
final DialogInterface.OnClickListener dialogClickListener =
new DialogInterface.OnClickListener() {
@@ -148,9 +158,9 @@ public void onClick(DialogInterface dialog, int which) {
break;
case DialogInterface.BUTTON_NEGATIVE:
- bookmarkManager.deleteFolder(item.getTitle());
+ mBookmarkManager.deleteFolder(item.getTitle());
// setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
- eventBus.post(new BookmarkEvents.Deleted(item));
+ mEventBus.post(new BookmarkEvents.Deleted(item));
break;
}
}
@@ -165,7 +175,7 @@ public void onClick(DialogInterface dialog, int which) {
.show();
}
- private void showRenameFolderDialog(final Context context, final HistoryItem item) {
+ private void showRenameFolderDialog(@NonNull final Context context, @NonNull final HistoryItem item) {
// assert item.isFolder();
final AlertDialog.Builder editFolderDialog = new AlertDialog.Builder(context);
editFolderDialog.setTitle(R.string.title_rename_folder);
@@ -191,10 +201,105 @@ public void onClick(DialogInterface dialog, int which) {
editedItem.setUrl(Constants.FOLDER + newTitle);
editedItem.setFolder(item.getFolder());
editedItem.setIsFolder(true);
- bookmarkManager.renameFolder(oldTitle, newTitle);
- eventBus.post(new BookmarkEvents.BookmarkChanged(item, editedItem));
+ mBookmarkManager.renameFolder(oldTitle, newTitle);
+ mEventBus.post(new BookmarkEvents.BookmarkChanged(item, editedItem));
}
});
editFolderDialog.show();
}
+
+ public void showLongPressedHistoryLinkDialog(final Context context, @NonNull final String url) {
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ mEventBus.post(new BrowserEvents.OpenUrlInNewTab(url));
+ break;
+ case DialogInterface.BUTTON_NEGATIVE:
+ mHistoryDatabase.deleteHistoryItem(url);
+ // openHistory();
+ mEventBus.post(new BrowserEvents.OpenHistoryInCurrentTab());
+ break;
+ case DialogInterface.BUTTON_NEUTRAL:
+ mEventBus.post(new BrowserEvents.OpenUrlInCurrentTab(url));
+ break;
+ default:
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ builder.setTitle(R.string.action_history)
+ .setMessage(R.string.dialog_history_long_press)
+ .setCancelable(true)
+ .setPositiveButton(R.string.action_new_tab, dialogClickListener)
+ .setNegativeButton(R.string.action_delete, dialogClickListener)
+ .setNeutralButton(R.string.action_open, dialogClickListener)
+ .show();
+ }
+
+ // TODO There should be a way in which we do not need an activity reference to dowload a file
+ public void showLongPressImageDialog(@NonNull final Activity activity, @NonNull final String url,
+ @NonNull final String userAgent) {
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ mEventBus.post(new BrowserEvents.OpenUrlInNewTab(url));
+ break;
+ case DialogInterface.BUTTON_NEGATIVE:
+ mEventBus.post(new BrowserEvents.OpenUrlInCurrentTab(url));
+ break;
+ case DialogInterface.BUTTON_NEUTRAL:
+ Utils.downloadFile(activity, mPreferenceManager, url, userAgent, "attachment");
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ builder.setTitle(url.replace(Constants.HTTP, ""))
+ .setCancelable(true)
+ .setMessage(R.string.dialog_image)
+ .setPositiveButton(R.string.action_new_tab, dialogClickListener)
+ .setNegativeButton(R.string.action_open, dialogClickListener)
+ .setNeutralButton(R.string.action_download, dialogClickListener)
+ .show();
+ }
+
+ public void showLongPressLinkDialog(@NonNull final Context context, final String url) {
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ mEventBus.post(new BrowserEvents.OpenUrlInNewTab(url));
+ break;
+
+ case DialogInterface.BUTTON_NEGATIVE:
+ mEventBus.post(new BrowserEvents.OpenUrlInCurrentTab(url));
+ break;
+
+ case DialogInterface.BUTTON_NEUTRAL:
+ ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+ ClipData clip = ClipData.newPlainText("label", url);
+ clipboard.setPrimaryClip(clip);
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(context); // dialog
+ builder.setTitle(url)
+ .setCancelable(true)
+ .setMessage(R.string.dialog_link)
+ .setPositiveButton(R.string.action_new_tab, dialogClickListener)
+ .setNegativeButton(R.string.action_open, dialogClickListener)
+ .setNeutralButton(R.string.action_copy, dialogClickListener)
+ .show();
+ }
+
}
diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java
index 82d25aaf3..03350fbe5 100644
--- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java
+++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java
@@ -3,29 +3,35 @@
*/
package acr.browser.lightning.download;
-import android.app.Activity;
import android.app.DownloadManager;
import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
+import android.os.Build;
import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import android.webkit.CookieManager;
import android.webkit.URLUtil;
+import com.squareup.otto.Bus;
+
import java.io.File;
import java.io.IOException;
+import acr.browser.lightning.BuildConfig;
import acr.browser.lightning.R;
+import acr.browser.lightning.activity.MainActivity;
+import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.bus.BrowserEvents;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
-import acr.browser.lightning.utils.Utils;
/**
* Handle download requests
@@ -44,14 +50,14 @@ public class DownloadHandler {
* Notify the host application a download should be done, or that the data
* should be streamed if a streaming viewer is available.
*
- * @param activity Activity requesting the download.
+ * @param context The context in which the download was requested.
* @param url The full url to the content that should be downloaded
* @param userAgent User agent of the downloading application.
* @param contentDisposition Content-disposition http header, if present.
* @param mimetype The mimetype of the content reported by the server
*/
- public static void onDownloadStart(Activity activity, String url, String userAgent,
- String contentDisposition, String mimetype) {
+ public static void onDownloadStart(@NonNull Context context, @NonNull PreferenceManager manager, String url, String userAgent,
+ @Nullable String contentDisposition, String mimetype) {
// if we're dealing wih A/V content that's not explicitly marked
// for download, check if it's streamable.
if (contentDisposition == null
@@ -61,18 +67,22 @@ public static void onDownloadStart(Activity activity, String url, String userAge
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(Uri.parse(url), mimetype);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- ResolveInfo info = activity.getPackageManager().resolveActivity(intent,
+ intent.addCategory(Intent.CATEGORY_BROWSABLE);
+ intent.setComponent(null);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+ intent.setSelector(null);
+ }
+ ResolveInfo info = context.getPackageManager().resolveActivity(intent,
PackageManager.MATCH_DEFAULT_ONLY);
if (info != null) {
- ComponentName myName = activity.getComponentName();
// If we resolved to ourselves, we don't want to attempt to
// load the url only to try and download it again.
- if (!myName.getPackageName().equals(info.activityInfo.packageName)
- || !myName.getClassName().equals(info.activityInfo.name)) {
+ if (BuildConfig.APPLICATION_ID.equals(info.activityInfo.packageName)
+ || MainActivity.class.getName().equals(info.activityInfo.name)) {
// someone (other than us) knows how to handle this mime
// type with this scheme, don't download.
try {
- activity.startActivity(intent);
+ context.startActivity(intent);
return;
} catch (ActivityNotFoundException ex) {
// Best behavior is to fall back to a download in this
@@ -81,14 +91,14 @@ public static void onDownloadStart(Activity activity, String url, String userAge
}
}
}
- onDownloadStartNoStream(activity, url, userAgent, contentDisposition, mimetype
- );
+ onDownloadStartNoStream(context, manager, url, userAgent, contentDisposition, mimetype);
}
// This is to work around the fact that java.net.URI throws Exceptions
// instead of just encoding URL's properly
// Helper method for onDownloadStartNoStream
- private static String encodePath(String path) {
+ @NonNull
+ private static String encodePath(@NonNull String path) {
char[] chars = path.toCharArray();
boolean needed = false;
@@ -119,17 +129,18 @@ private static String encodePath(String path) {
* Notify the host application a download should be done, even if there is a
* streaming viewer available for thise type.
*
- * @param activity Activity requesting the download.
+ * @param context The context in which the download is requested.
* @param url The full url to the content that should be downloaded
* @param userAgent User agent of the downloading application.
* @param contentDisposition Content-disposition http header, if present.
* @param mimetype The mimetype of the content reported by the server
*/
/* package */
- private static void onDownloadStartNoStream(final Activity activity, String url, String userAgent,
- String contentDisposition, String mimetype) {
-
- String filename = URLUtil.guessFileName(url, contentDisposition, mimetype);
+ private static void onDownloadStartNoStream(@NonNull final Context context, @NonNull PreferenceManager preferences,
+ String url, String userAgent,
+ String contentDisposition, @Nullable String mimetype) {
+ final Bus eventBus = BrowserApp.getBus(context);
+ final String filename = URLUtil.guessFileName(url, contentDisposition, mimetype);
// Check to see if we have an SDCard
String status = Environment.getExternalStorageState();
@@ -139,14 +150,14 @@ private static void onDownloadStartNoStream(final Activity activity, String url,
// Check to see if the SDCard is busy, same as the music app
if (status.equals(Environment.MEDIA_SHARED)) {
- msg = activity.getString(R.string.download_sdcard_busy_dlg_msg);
+ msg = context.getString(R.string.download_sdcard_busy_dlg_msg);
title = R.string.download_sdcard_busy_dlg_title;
} else {
- msg = activity.getString(R.string.download_no_sdcard_dlg_msg, filename);
+ msg = context.getString(R.string.download_no_sdcard_dlg_msg);
title = R.string.download_no_sdcard_dlg_title;
}
- new AlertDialog.Builder(activity).setTitle(title)
+ new AlertDialog.Builder(context).setTitle(title)
.setIcon(android.R.drawable.ic_dialog_alert).setMessage(msg)
.setPositiveButton(R.string.action_ok, null).show();
return;
@@ -162,7 +173,7 @@ private static void onDownloadStartNoStream(final Activity activity, String url,
// This only happens for very bad urls, we want to catch the
// exception here
Log.e(TAG, "Exception while trying to parse url '" + url + '\'', e);
- Utils.showSnackbar(activity, R.string.problem_download);
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.problem_download));
return;
}
@@ -172,7 +183,7 @@ private static void onDownloadStartNoStream(final Activity activity, String url,
try {
request = new DownloadManager.Request(uri);
} catch (IllegalArgumentException e) {
- Utils.showSnackbar(activity, R.string.cannot_download);
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.cannot_download));
return;
}
request.setMimeType(mimetype);
@@ -180,26 +191,20 @@ private static void onDownloadStartNoStream(final Activity activity, String url,
// or, should it be set to one of several Environment.DIRECTORY* dirs
// depending on mimetype?
- String location = PreferenceManager.getInstance().getDownloadDirectory();
+ String location = preferences.getDownloadDirectory();
Uri downloadFolder;
- if (location != null) {
- location = addNecessarySlashes(location);
- downloadFolder = Uri.parse(location);
- } else {
- location = addNecessarySlashes(DEFAULT_DOWNLOAD_PATH);
- downloadFolder = Uri.parse(location);
- PreferenceManager.getInstance().setDownloadDirectory(location);
- }
+ location = addNecessarySlashes(location);
+ downloadFolder = Uri.parse(location);
File dir = new File(downloadFolder.getPath());
if (!dir.isDirectory() && !dir.mkdirs()) {
// Cannot make the directory
- Utils.showSnackbar(activity, R.string.problem_location_download);
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.problem_location_download));
return;
}
if (!isWriteAccessAvailable(downloadFolder)) {
- Utils.showSnackbar(activity, R.string.problem_location_download);
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.problem_location_download));
return;
}
request.setDestinationUri(Uri.parse(Constants.FILE + location + filename));
@@ -214,32 +219,30 @@ private static void onDownloadStartNoStream(final Activity activity, String url,
request.addRequestHeader(COOKIE_REQUEST_HEADER, cookies);
request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
if (mimetype == null) {
+ Log.d(TAG, "Mimetype is null");
if (TextUtils.isEmpty(addressString)) {
return;
}
// We must have long pressed on a link or image to download it. We
// are not sure of the mimetype in this case, so do a head request
- new FetchUrlMimeType(activity, request, addressString, cookies, userAgent).start();
+ new FetchUrlMimeType(context, request, addressString, cookies, userAgent).start();
} else {
- final DownloadManager manager = (DownloadManager) activity
+ Log.d(TAG, "Valid mimetype, attempting to download");
+ final DownloadManager manager = (DownloadManager) context
.getSystemService(Context.DOWNLOAD_SERVICE);
- new Thread() {
- @Override
- public void run() {
- try {
- manager.enqueue(request);
- } catch (IllegalArgumentException e) {
- // Probably got a bad URL or something
- e.printStackTrace();
- Utils.showSnackbar(activity, R.string.cannot_download);
- } catch (SecurityException e) {
- // TODO write a download utility that downloads files rather than rely on the system
- // because the system can only handle Environment.getExternal... as a path
- Utils.showSnackbar(activity, R.string.problem_location_download);
- }
- }
- }.start();
- Utils.showSnackbar(activity, activity.getString(R.string.download_pending) + ' ' + filename);
+ try {
+ manager.enqueue(request);
+ } catch (IllegalArgumentException e) {
+ // Probably got a bad URL or something
+ Log.e(TAG, "Unable to enqueue request", e);
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.cannot_download));
+ } catch (SecurityException e) {
+ // TODO write a download utility that downloads files rather than rely on the system
+ // because the system can only handle Environment.getExternal... as a path
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(R.string.problem_location_download));
+ }
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(
+ context.getString(R.string.download_pending) + ' ' + filename));
}
}
@@ -255,7 +258,7 @@ public void run() {
* @return returns true if the directory can be written to or is in a directory that can
* be written to. false if there is no write access.
*/
- public static boolean isWriteAccessAvailable(String directory) {
+ public static boolean isWriteAccessAvailable(@Nullable String directory) {
if (directory == null || directory.isEmpty()) {
return false;
}
@@ -266,6 +269,7 @@ public static boolean isWriteAccessAvailable(String directory) {
if (!file.exists()) {
try {
if (file.createNewFile()) {
+ //noinspection ResultOfMethodCallIgnored
file.delete();
}
return true;
@@ -286,34 +290,38 @@ public static boolean isWriteAccessAvailable(String directory) {
* @param directory the directory to find the first existent parent
* @return the first existent parent
*/
- private static String getFirstRealParentDirectory(String directory) {
- if (directory == null || directory.isEmpty()) {
- return "/";
- }
- directory = addNecessarySlashes(directory);
- File file = new File(directory);
- if (!file.isDirectory()) {
- int indexSlash = directory.lastIndexOf('/');
- if (indexSlash > 0) {
- String parent = directory.substring(0, indexSlash);
- int previousIndex = parent.lastIndexOf('/');
- if (previousIndex > 0) {
- return getFirstRealParentDirectory(parent.substring(0, previousIndex));
+ @Nullable
+ private static String getFirstRealParentDirectory(@Nullable String directory) {
+ while (true) {
+ if (directory == null || directory.isEmpty()) {
+ return "/";
+ }
+ directory = addNecessarySlashes(directory);
+ File file = new File(directory);
+ if (!file.isDirectory()) {
+ int indexSlash = directory.lastIndexOf('/');
+ if (indexSlash > 0) {
+ String parent = directory.substring(0, indexSlash);
+ int previousIndex = parent.lastIndexOf('/');
+ if (previousIndex > 0) {
+ directory = parent.substring(0, previousIndex);
+ } else {
+ return "/";
+ }
} else {
return "/";
}
} else {
- return "/";
+ return directory;
}
- } else {
- return directory;
}
}
- private static boolean isWriteAccessAvailable(Uri fileUri) {
+ private static boolean isWriteAccessAvailable(@NonNull Uri fileUri) {
File file = new File(fileUri.getPath());
try {
if (file.createNewFile()) {
+ //noinspection ResultOfMethodCallIgnored
file.delete();
}
return true;
@@ -322,7 +330,8 @@ private static boolean isWriteAccessAvailable(Uri fileUri) {
}
}
- public static String addNecessarySlashes(String originalPath) {
+ @NonNull
+ public static String addNecessarySlashes(@Nullable String originalPath) {
if (originalPath == null || originalPath.length() == 0) {
return "/";
}
diff --git a/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java
index 39da66f66..de9d7f648 100644
--- a/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java
+++ b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java
@@ -3,19 +3,24 @@
*/
package acr.browser.lightning.download;
-import android.app.Activity;
import android.app.DownloadManager;
import android.content.Context;
import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.NonNull;
import android.webkit.MimeTypeMap;
import android.webkit.URLUtil;
+import com.squareup.otto.Bus;
+
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import acr.browser.lightning.R;
-import acr.browser.lightning.utils.Utils;
+import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.bus.BrowserEvents;
/**
* This class is used to pull down the http headers of a given URL so that we
@@ -27,7 +32,7 @@
*/
class FetchUrlMimeType extends Thread {
- private final Activity mActivity;
+ private final Context mContext;
private final DownloadManager.Request mRequest;
@@ -37,9 +42,9 @@ class FetchUrlMimeType extends Thread {
private final String mUserAgent;
- public FetchUrlMimeType(Activity activity, DownloadManager.Request request, String uri,
+ public FetchUrlMimeType(Context context, DownloadManager.Request request, String uri,
String cookies, String userAgent) {
- mActivity = activity;
+ mContext = context;
mRequest = request;
mUri = uri;
mCookies = cookies;
@@ -50,6 +55,7 @@ public FetchUrlMimeType(Activity activity, DownloadManager.Request request, Stri
public void run() {
// User agent is likely to be null, though the AndroidHttpClient
// seems ok with that.
+ final Bus eventBus = BrowserApp.getBus(mContext);
String mimeType = null;
String contentDisposition = null;
HttpURLConnection connection = null;
@@ -78,7 +84,7 @@ public void run() {
contentDisposition = contentDispositionHeader;
}
}
- } catch (IllegalArgumentException | IOException ex) {
+ } catch (@NonNull IllegalArgumentException | IOException ex) {
if (connection != null)
connection.disconnect();
} finally {
@@ -101,9 +107,16 @@ public void run() {
}
// Start the download
- DownloadManager manager = (DownloadManager) mActivity
+ DownloadManager manager = (DownloadManager) mContext
.getSystemService(Context.DOWNLOAD_SERVICE);
manager.enqueue(mRequest);
- Utils.showSnackbar(mActivity, mActivity.getString(R.string.download_pending) + ' ' + filename);
+ Handler handler = new Handler(Looper.getMainLooper());
+ final String file = filename;
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ eventBus.post(new BrowserEvents.ShowSnackBarMessage(mContext.getString(R.string.download_pending) + ' ' + file));
+ }
+ });
}
}
diff --git a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java
index 72f3ab8cf..946e71f30 100644
--- a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java
+++ b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java
@@ -3,6 +3,7 @@
*/
package acr.browser.lightning.download;
+import android.Manifest;
import android.app.Activity;
import android.content.DialogInterface;
import android.support.v7.app.AlertDialog;
@@ -11,43 +12,64 @@
import android.webkit.URLUtil;
import acr.browser.lightning.R;
+import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants;
+import acr.browser.lightning.preference.PreferenceManager;
+
+import com.anthonycr.grant.PermissionsManager;
+import com.anthonycr.grant.PermissionsResultAction;
+
+import javax.inject.Inject;
public class LightningDownloadListener implements DownloadListener {
private final Activity mActivity;
- public LightningDownloadListener(Activity activity) {
- mActivity = activity;
+ @Inject PreferenceManager mPreferenceManager;
+
+ public LightningDownloadListener(Activity context) {
+ BrowserApp.getAppComponent().inject(this);
+ mActivity = context;
}
@Override
public void onDownloadStart(final String url, final String userAgent,
- final String contentDisposition, final String mimetype, long contentLength) {
- String fileName = URLUtil.guessFileName(url, contentDisposition, mimetype);
- DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- switch (which) {
- case DialogInterface.BUTTON_POSITIVE:
- DownloadHandler.onDownloadStart(mActivity, url, userAgent,
- contentDisposition, mimetype);
- break;
-
- case DialogInterface.BUTTON_NEGATIVE:
- break;
- }
- }
- };
-
- AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); // dialog
- builder.setTitle(fileName)
- .setMessage(mActivity.getResources().getString(R.string.dialog_download))
- .setPositiveButton(mActivity.getResources().getString(R.string.action_download),
- dialogClickListener)
- .setNegativeButton(mActivity.getResources().getString(R.string.action_cancel),
- dialogClickListener).show();
- Log.i(Constants.TAG, "Downloading" + fileName);
+ final String contentDisposition, final String mimetype, long contentLength) {
+ PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(mActivity,
+ new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE},
+ new PermissionsResultAction() {
+ @Override
+ public void onGranted() {
+ String fileName = URLUtil.guessFileName(url, contentDisposition, mimetype);
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ DownloadHandler.onDownloadStart(mActivity, mPreferenceManager, url, userAgent,
+ contentDisposition, mimetype);
+ break;
+
+ case DialogInterface.BUTTON_NEGATIVE:
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); // dialog
+ builder.setTitle(fileName)
+ .setMessage(mActivity.getResources().getString(R.string.dialog_download))
+ .setPositiveButton(mActivity.getResources().getString(R.string.action_download),
+ dialogClickListener)
+ .setNegativeButton(mActivity.getResources().getString(R.string.action_cancel),
+ dialogClickListener).show();
+ Log.i(Constants.TAG, "Downloading" + fileName);
+ }
+ @Override
+ public void onDenied(String permission) {
+ //TODO show message
+ }
+ });
}
}
diff --git a/app/src/main/java/acr/browser/lightning/download/WebAddress.java b/app/src/main/java/acr/browser/lightning/download/WebAddress.java
index 96852a660..c50bf2561 100644
--- a/app/src/main/java/acr/browser/lightning/download/WebAddress.java
+++ b/app/src/main/java/acr/browser/lightning/download/WebAddress.java
@@ -4,6 +4,7 @@
package acr.browser.lightning.download;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import java.util.Locale;
import java.util.regex.Matcher;
@@ -35,17 +36,17 @@ class WebAddress {
private static final int MATCH_GROUP_PORT = 4;
private static final int MATCH_GROUP_PATH = 5;
private static final Pattern sAddressPattern = Pattern.compile(
- /* scheme */"(?:(http|https|file)\\:\\/\\/)?" +
- /* authority */"(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
+ /* scheme */"(?:(http|https|file)://)?" +
+ /* authority */"(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?::[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
/* host */"([" + GOOD_IRI_CHAR + "%_-][" + GOOD_IRI_CHAR + "%_\\.-]*|\\[[0-9a-fA-F:\\.]+\\])?" +
- /* port */"(?:\\:([0-9]*))?" +
- /* path */"(\\/?[^#]*)?" +
+ /* port */"(?::([0-9]*))?" +
+ /* path */"(/?[^#]*)?" +
/* anchor */".*", Pattern.CASE_INSENSITIVE);
/**
* Parses given URI-like string.
*/
- public WebAddress(String address) throws IllegalArgumentException {
+ public WebAddress(@Nullable String address) throws IllegalArgumentException {
if (address == null) {
throw new IllegalArgumentException("address can't be null");
@@ -113,6 +114,7 @@ public WebAddress(String address) throws IllegalArgumentException {
}
}
+ @NonNull
@Override
public String toString() {
diff --git a/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java
index 4f4b7a657..2b4fcd5d5 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java
@@ -8,7 +8,7 @@
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import java.util.Arrays;
@@ -16,9 +16,8 @@
import acr.browser.lightning.R;
import acr.browser.lightning.constant.Constants;
-import acr.browser.lightning.preference.PreferenceManager;
-public class AdvancedSettingsFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+public class AdvancedSettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
private static final String SETTINGS_NEWWINDOW = "allow_new_window";
private static final String SETTINGS_ENABLECOOKIES = "allow_cookies";
@@ -29,7 +28,6 @@ public class AdvancedSettingsFragment extends PreferenceFragment implements Pref
private static final String SETTINGS_TEXTENCODING = "text_encoding";
private Activity mActivity;
- private PreferenceManager mPreferences;
private CheckBoxPreference cbAllowPopups, cbenablecookies, cbcookiesInkognito, cbrestoreTabs;
private Preference renderingmode, urlcontent, textEncoding;
private CharSequence[] mUrlOptions;
@@ -46,8 +44,6 @@ public void onCreate(Bundle savedInstanceState) {
}
private void initPrefs() {
- // mPreferences storage
- mPreferences = PreferenceManager.getInstance();
renderingmode = findPreference(SETTINGS_RENDERINGMODE);
textEncoding = findPreference(SETTINGS_TEXTENCODING);
@@ -65,7 +61,7 @@ private void initPrefs() {
cbcookiesInkognito.setOnPreferenceChangeListener(this);
cbrestoreTabs.setOnPreferenceChangeListener(this);
- switch (mPreferences.getRenderingMode()) {
+ switch (mPreferenceManager.getRenderingMode()) {
case 0:
renderingmode.setSummary(getString(R.string.name_normal));
break;
@@ -78,22 +74,25 @@ private void initPrefs() {
case 3:
renderingmode.setSummary(getString(R.string.name_inverted_grayscale));
break;
+ case 4:
+ renderingmode.setSummary(getString(R.string.name_increase_contrast));
+ break;
}
- textEncoding.setSummary(mPreferences.getTextEncoding());
+ textEncoding.setSummary(mPreferenceManager.getTextEncoding());
mUrlOptions = getResources().getStringArray(R.array.url_content_array);
- int option = mPreferences.getUrlBoxContentChoice();
+ int option = mPreferenceManager.getUrlBoxContentChoice();
urlcontent.setSummary(mUrlOptions[option]);
- cbAllowPopups.setChecked(mPreferences.getPopupsEnabled());
- cbenablecookies.setChecked(mPreferences.getCookiesEnabled());
- cbcookiesInkognito.setChecked(mPreferences.getIncognitoCookiesEnabled());
- cbrestoreTabs.setChecked(mPreferences.getRestoreLostTabsEnabled());
+ cbAllowPopups.setChecked(mPreferenceManager.getPopupsEnabled());
+ cbenablecookies.setChecked(mPreferenceManager.getCookiesEnabled());
+ cbcookiesInkognito.setChecked(mPreferenceManager.getIncognitoCookiesEnabled());
+ cbrestoreTabs.setChecked(mPreferenceManager.getRestoreLostTabsEnabled());
}
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull Preference preference) {
switch (preference.getKey()) {
case SETTINGS_RENDERINGMODE:
renderPicker();
@@ -110,23 +109,23 @@ public boolean onPreferenceClick(Preference preference) {
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
+ public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
// switch preferences
switch (preference.getKey()) {
case SETTINGS_NEWWINDOW:
- mPreferences.setPopupsEnabled((Boolean) newValue);
+ mPreferenceManager.setPopupsEnabled((Boolean) newValue);
cbAllowPopups.setChecked((Boolean) newValue);
return true;
case SETTINGS_ENABLECOOKIES:
- mPreferences.setCookiesEnabled((Boolean) newValue);
+ mPreferenceManager.setCookiesEnabled((Boolean) newValue);
cbenablecookies.setChecked((Boolean) newValue);
return true;
case SETTINGS_COOKIESINKOGNITO:
- mPreferences.setIncognitoCookiesEnabled((Boolean) newValue);
+ mPreferenceManager.setIncognitoCookiesEnabled((Boolean) newValue);
cbcookiesInkognito.setChecked((Boolean) newValue);
return true;
case SETTINGS_RESTORETABS:
- mPreferences.setRestoreLostTabsEnabled((Boolean) newValue);
+ mPreferenceManager.setRestoreLostTabsEnabled((Boolean) newValue);
cbrestoreTabs.setChecked((Boolean) newValue);
return true;
default:
@@ -140,14 +139,15 @@ private void renderPicker() {
CharSequence[] chars = {mActivity.getString(R.string.name_normal),
mActivity.getString(R.string.name_inverted),
mActivity.getString(R.string.name_grayscale),
- mActivity.getString(R.string.name_inverted_grayscale)};
+ mActivity.getString(R.string.name_inverted_grayscale),
+ mActivity.getString(R.string.name_increase_contrast)};
- int n = mPreferences.getRenderingMode();
+ int n = mPreferenceManager.getRenderingMode();
picker.setSingleChoiceItems(chars, n, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setRenderingMode(which);
+ mPreferenceManager.setRenderingMode(which);
switch (which) {
case 0:
renderingmode.setSummary(getString(R.string.name_normal));
@@ -161,6 +161,9 @@ public void onClick(DialogInterface dialog, int which) {
case 3:
renderingmode.setSummary(getString(R.string.name_inverted_grayscale));
break;
+ case 4:
+ renderingmode.setSummary(getString(R.string.name_increase_contrast));
+ break;
}
}
});
@@ -172,12 +175,12 @@ private void textEncodingPicker() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.text_encoding));
final List textEncodingList = Arrays.asList(Constants.TEXT_ENCODINGS);
- int n = textEncodingList.indexOf(mPreferences.getTextEncoding());
+ int n = textEncodingList.indexOf(mPreferenceManager.getTextEncoding());
picker.setSingleChoiceItems(Constants.TEXT_ENCODINGS, n, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setTextEncoding(Constants.TEXT_ENCODINGS[which]);
+ mPreferenceManager.setTextEncoding(Constants.TEXT_ENCODINGS[which]);
textEncoding.setSummary(Constants.TEXT_ENCODINGS[which]);
}
});
@@ -189,12 +192,12 @@ private void urlBoxPicker() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.url_contents));
- int n = mPreferences.getUrlBoxContentChoice();
+ int n = mPreferenceManager.getUrlBoxContentChoice();
picker.setSingleChoiceItems(mUrlOptions, n, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setUrlBoxContentChoice(which);
+ mPreferenceManager.setUrlBoxContentChoice(which);
if (which < mUrlOptions.length) {
urlcontent.setSummary(mUrlOptions[which]);
}
diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
index 8698603ba..3246821c4 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
@@ -6,15 +6,26 @@
import android.Manifest;
import android.app.Activity;
import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.Preference;
import android.preference.PreferenceFragment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.widget.ArrayAdapter;
+
+import com.anthonycr.grant.PermissionsManager;
+import com.anthonycr.grant.PermissionsResultAction;
import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@@ -23,10 +34,14 @@
import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.database.BookmarkLocalSync;
+import acr.browser.lightning.database.BookmarkLocalSync.Source;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.database.HistoryItem;
-import acr.browser.lightning.utils.PermissionsManager;
+import acr.browser.lightning.react.OnSubscribe;
+import acr.browser.lightning.react.Schedulers;
+import acr.browser.lightning.utils.Preconditions;
import acr.browser.lightning.utils.Utils;
public class BookmarkSettingsFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener {
@@ -34,13 +49,15 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
private static final String SETTINGS_EXPORT = "export_bookmark";
private static final String SETTINGS_IMPORT = "import_bookmark";
private static final String SETTINGS_IMPORT_BROWSER = "import_browser";
+ private static final String SETTINGS_DELETE_BOOKMARKS = "delete_bookmarks";
+
+ @Nullable private Activity mActivity;
- private Activity mActivity;
- @Inject
- BookmarkManager mBookmarkManager;
+ @Inject BookmarkManager mBookmarkManager;
private File[] mFileList;
private String[] mFileNameList;
- private BookmarkLocalSync mSync;
+ @Nullable private BookmarkLocalSync mSync;
+
private static final String[] REQUIRED_PERMISSIONS = new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE
@@ -48,16 +65,38 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
private static final File mPath = new File(Environment.getExternalStorageDirectory().toString());
private class ImportBookmarksTask extends AsyncTask {
+
+ @NonNull private final WeakReference mActivityReference;
+ private final Source mSource;
+
+ public ImportBookmarksTask(Activity activity, Source source) {
+ mActivityReference = new WeakReference<>(activity);
+ mSource = source;
+ }
+
@Override
protected Integer doInBackground(Void... params) {
- List list = null;
- if (mSync.isStockSupported()) {
- list = mSync.getBookmarksFromStockBrowser();
- } else if (mSync.isChromeSupported()) {
- list = mSync.getBookmarksFromChrome();
+ List list;
+ Log.d(Constants.TAG, "Loading bookmarks from: " + mSource.name());
+ switch (mSource) {
+ case STOCK:
+ list = getSync().getBookmarksFromStockBrowser();
+ break;
+ case CHROME_STABLE:
+ list = getSync().getBookmarksFromChrome();
+ break;
+ case CHROME_BETA:
+ list = getSync().getBookmarksFromChromeBeta();
+ break;
+ case CHROME_DEV:
+ list = getSync().getBookmarksFromChromeDev();
+ break;
+ default:
+ list = new ArrayList<>(0);
+ break;
}
int count = 0;
- if (list != null && !list.isEmpty()) {
+ if (!list.isEmpty()) {
mBookmarkManager.addBookmarkList(list);
count = list.size();
}
@@ -67,14 +106,25 @@ protected Integer doInBackground(Void... params) {
@Override
protected void onPostExecute(Integer num) {
super.onPostExecute(num);
- if (mActivity != null) {
+ Activity activity = mActivityReference.get();
+ if (activity != null) {
int number = num;
- final String message = mActivity.getResources().getString(R.string.message_import);
- Utils.showSnackbar(mActivity, number + " " + message);
+ final String message = activity.getResources().getString(R.string.message_import);
+ Utils.showSnackbar(activity, number + " " + message);
}
}
}
+ @NonNull
+ private BookmarkLocalSync getSync() {
+ Preconditions.checkNonNull(mActivity);
+ if (mSync == null) {
+ mSync = new BookmarkLocalSync(mActivity);
+ }
+
+ return mSync;
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -83,12 +133,13 @@ public void onCreate(Bundle savedInstanceState) {
addPreferencesFromResource(R.xml.preference_bookmarks);
mActivity = getActivity();
+ mSync = new BookmarkLocalSync(mActivity);
initPrefs();
PermissionsManager permissionsManager = PermissionsManager.getInstance();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- permissionsManager.requestPermissionsIfNecessary(getActivity(), REQUIRED_PERMISSIONS);
+ permissionsManager.requestPermissionsIfNecessaryForResult(getActivity(), REQUIRED_PERMISSIONS, null);
}
}
@@ -100,49 +151,184 @@ public void onDestroy() {
private void initPrefs() {
- Preference exportpref = findPreference(SETTINGS_EXPORT);
- Preference importpref = findPreference(SETTINGS_IMPORT);
+ Preference exportPref = findPreference(SETTINGS_EXPORT);
+ Preference importPref = findPreference(SETTINGS_IMPORT);
+ Preference deletePref = findPreference(SETTINGS_DELETE_BOOKMARKS);
- mSync = new BookmarkLocalSync(mActivity);
+ exportPref.setOnPreferenceClickListener(this);
+ importPref.setOnPreferenceClickListener(this);
+ deletePref.setOnPreferenceClickListener(this);
- exportpref.setOnPreferenceClickListener(this);
- importpref.setOnPreferenceClickListener(this);
+ BrowserApp.getTaskThread().execute(new Runnable() {
+ @Override
+ public void run() {
+ final boolean isBrowserImportSupported = getSync().isBrowserImportSupported();
+ Schedulers.main().execute(new Runnable() {
+ @Override
+ public void run() {
+ Preference importStock = findPreference(SETTINGS_IMPORT_BROWSER);
+ importStock.setEnabled(isBrowserImportSupported);
+ importStock.setOnPreferenceClickListener(BookmarkSettingsFragment.this);
+ }
+ });
+ }
+ });
- new Thread(mInitializeImportPreference).start();
}
- private final Runnable mInitializeImportPreference = new Runnable() {
- @Override
- public void run() {
- Preference importStock = findPreference(SETTINGS_IMPORT_BROWSER);
- importStock.setEnabled(mSync.isStockSupported() || mSync.isChromeSupported());
- importStock.setOnPreferenceClickListener(BookmarkSettingsFragment.this);
- }
- };
-
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull Preference preference) {
switch (preference.getKey()) {
case SETTINGS_EXPORT:
- if (PermissionsManager.checkPermissions(getActivity(), REQUIRED_PERMISSIONS)) {
- mBookmarkManager.exportBookmarks(getActivity());
- }
+ PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(getActivity(), REQUIRED_PERMISSIONS,
+ new PermissionsResultAction() {
+ @Override
+ public void onGranted() {
+ mBookmarkManager.exportBookmarks(getActivity());
+ }
+
+ @Override
+ public void onDenied(String permission) {
+ //TODO Show message
+ }
+ });
return true;
case SETTINGS_IMPORT:
- if (PermissionsManager.checkPermissions(getActivity(), REQUIRED_PERMISSIONS)) {
- loadFileList(null);
- createDialog();
- }
+ PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(getActivity(), REQUIRED_PERMISSIONS,
+ new PermissionsResultAction() {
+ @Override
+ public void onGranted() {
+ loadFileList(null);
+ createDialog();
+ }
+
+ @Override
+ public void onDenied(String permission) {
+ //TODO Show message
+ }
+ });
return true;
case SETTINGS_IMPORT_BROWSER:
- new ImportBookmarksTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ getSync().getSupportedBrowsers().subscribeOn(Schedulers.worker())
+ .observeOn(Schedulers.main()).subscribe(new OnSubscribe>() {
+ @Override
+ public void onNext(@Nullable List items) {
+ Activity activity = getActivity();
+ if (items == null || activity == null) {
+ return;
+ }
+ List titles = buildTitleList(activity, items);
+ showChooserDialog(activity, titles);
+ }
+ });
+ return true;
+ case SETTINGS_DELETE_BOOKMARKS:
+ showDeleteBookmarksDialog();
return true;
default:
return false;
}
}
- private void loadFileList(File path) {
+ private void showDeleteBookmarksDialog() {
+ Activity activity = getActivity();
+ if (activity == null) {
+ return;
+ }
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ builder.setTitle(R.string.action_delete);
+ builder.setMessage(R.string.action_delete_all_bookmarks);
+ builder.setNegativeButton(R.string.no, null);
+ builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ mBookmarkManager.deleteAllBookmarks();
+ }
+ });
+ builder.show();
+ }
+
+ @NonNull
+ private List buildTitleList(@NonNull Activity activity, @NonNull List items) {
+ List titles = new ArrayList<>();
+ String title;
+ for (Source source : items) {
+ switch (source) {
+ case STOCK:
+ titles.add(getString(R.string.stock_browser));
+ break;
+ case CHROME_STABLE:
+ title = getTitle(activity, "com.android.chrome");
+ if (title != null) {
+ titles.add(title);
+ }
+ break;
+ case CHROME_BETA:
+ title = getTitle(activity, "com.chrome.beta");
+ if (title != null) {
+ titles.add(title);
+ }
+ break;
+ case CHROME_DEV:
+ title = getTitle(activity, "com.chrome.beta");
+ if (title != null) {
+ titles.add(title);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return titles;
+ }
+
+ private void showChooserDialog(final Activity activity, List list) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ final ArrayAdapter adapter = new ArrayAdapter<>(activity,
+ android.R.layout.simple_list_item_1);
+ for (String title : list) {
+ adapter.add(title);
+ }
+ builder.setTitle(R.string.supported_browsers_title);
+ builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ String title = adapter.getItem(which);
+ Source source = null;
+ if (title.equals(getString(R.string.stock_browser))) {
+ source = Source.STOCK;
+ } else if (title.equals(getTitle(activity, "com.android.chrome"))) {
+ source = Source.CHROME_STABLE;
+ } else if (title.equals(getTitle(activity, "com.android.beta"))) {
+ source = Source.CHROME_BETA;
+ } else if (title.equals(getTitle(activity, "com.android.dev"))) {
+ source = Source.CHROME_DEV;
+ }
+ if (source != null) {
+ new ImportBookmarksTask(activity, source).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+ }
+ });
+ builder.show();
+ }
+
+ @Nullable
+ private static String getTitle(@NonNull Activity activity, @NonNull String packageName) {
+ PackageManager pm = activity.getPackageManager();
+ try {
+ ApplicationInfo info = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
+ CharSequence title = pm.getApplicationLabel(info);
+ if (title != null) {
+ return title.toString();
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private void loadFileList(@Nullable File path) {
File file;
if (path != null) {
file = path;
@@ -175,7 +361,7 @@ private void loadFileList(File path) {
private static class SortName implements Comparator {
@Override
- public int compare(File a, File b) {
+ public int compare(@NonNull File a, @NonNull File b) {
if (a.isDirectory() && b.isDirectory())
return a.getName().compareTo(b.getName());
diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
index 80aa3f96d..4560d52b5 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
@@ -2,6 +2,7 @@
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.PorterDuff;
import android.os.Bundle;
@@ -30,40 +31,50 @@
import com.squareup.otto.Subscribe;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
import acr.browser.lightning.R;
-import acr.browser.lightning.activity.BrowserActivity;
+import acr.browser.lightning.activity.ReadingActivity;
+import acr.browser.lightning.activity.TabsManager;
import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.async.AsyncExecutor;
import acr.browser.lightning.bus.BookmarkEvents;
import acr.browser.lightning.bus.BrowserEvents;
+import acr.browser.lightning.constant.Constants;
+import acr.browser.lightning.controller.UIController;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.database.HistoryItem;
-import acr.browser.lightning.dialog.BookmarksDialogBuilder;
+import acr.browser.lightning.dialog.LightningDialogBuilder;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.async.ImageDownloadTask;
+import acr.browser.lightning.react.Action;
+import acr.browser.lightning.react.Observable;
+import acr.browser.lightning.react.OnSubscribe;
+import acr.browser.lightning.react.Schedulers;
+import acr.browser.lightning.react.Subscriber;
import acr.browser.lightning.utils.ThemeUtils;
+import acr.browser.lightning.view.LightningView;
-/**
- * Created by Stefano Pacifici on 25/08/15. Based on Anthony C. Restaino's code.
- */
public class BookmarksFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener {
+ private final static String TAG = BookmarksFragment.class.getSimpleName();
+
+ public final static String INCOGNITO_MODE = TAG + ".INCOGNITO_MODE";
+
// Managers
- @Inject
- BookmarkManager mBookmarkManager;
+ @Inject BookmarkManager mBookmarkManager;
// Event bus
- @Inject
- Bus mEventBus;
+ @Inject Bus mEventBus;
// Dialog builder
- @Inject
- BookmarksDialogBuilder mBookmarksDialogBuilder;
+ @Inject LightningDialogBuilder mBookmarksDialogBuilder;
+
+ @Inject PreferenceManager mPreferenceManager;
+
+ private TabsManager mTabsManager;
// Adapter
private BookmarkViewAdapter mBookmarkAdapter;
@@ -81,21 +92,36 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
// Colors
private int mIconColor, mScrollIndex;
- // Init asynchronously the bookmark manager
- private final Runnable mInitBookmarkManager = new Runnable() {
- @Override
- public void run() {
- final Context context = getContext();
- mBookmarkAdapter = new BookmarkViewAdapter(context, mBookmarks);
- setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
- mBookmarksListView.setAdapter(mBookmarkAdapter);
- }
- };
+ private boolean mIsIncognito;
+
+ private Observable initBookmarkManager() {
+ return Observable.create(new Action() {
+ @Override
+ public void onSubscribe(@NonNull Subscriber subscriber) {
+ Context context = getContext();
+ if (context != null) {
+ mBookmarkAdapter = new BookmarkViewAdapter(context, mBookmarks);
+ setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
+ subscriber.onNext(mBookmarkAdapter);
+ }
+ subscriber.onComplete();
+ }
+ });
+ }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
BrowserApp.getAppComponent().inject(this);
+ final Bundle arguments = getArguments();
+ final Context context = getContext();
+ mTabsManager = ((UIController) context).getTabModel();
+ mIsIncognito = arguments.getBoolean(INCOGNITO_MODE, false);
+ boolean darkTheme = mPreferenceManager.getUseTheme() != 0 || mIsIncognito;
+ mWebpageBitmap = ThemeUtils.getThemedBitmap(context, R.drawable.ic_webpage, darkTheme);
+ mFolderBitmap = ThemeUtils.getThemedBitmap(context, R.drawable.ic_folder, darkTheme);
+ mIconColor = darkTheme ? ThemeUtils.getIconDarkThemeColor(context) :
+ ThemeUtils.getIconLightThemeColor(context);
}
// Handle bookmark click
@@ -107,7 +133,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id)
mScrollIndex = mBookmarksListView.getFirstVisiblePosition();
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(item.getTitle(), true), true);
} else {
- mEventBus.post(new BookmarkEvents.Clicked(item));
+ mEventBus.post(new BrowserEvents.OpenUrlInCurrentTab(item.getUrl()));
}
}
};
@@ -116,7 +142,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id)
@Override
public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
final HistoryItem item = mBookmarks.get(position);
- handleLongPress(item, position);
+ handleLongPress(item);
return true;
}
};
@@ -124,17 +150,20 @@ public boolean onItemLongClick(AdapterView parent, View view, int position, l
@Override
public void onResume() {
super.onResume();
- setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
+ if (mBookmarkAdapter != null) {
+ setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
+ }
}
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.bookmark_drawer, container, false);
mBookmarksListView = (ListView) view.findViewById(R.id.right_drawer_list);
mBookmarksListView.setOnItemClickListener(mItemClickListener);
mBookmarksListView.setOnItemLongClickListener(mItemLongClickListener);
mBookmarkTitleImage = (ImageView) view.findViewById(R.id.starIcon);
+ mBookmarkTitleImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
mBookmarkImage = (ImageView) view.findViewById(R.id.icon_star);
final View backView = view.findViewById(R.id.bookmark_back_button);
backView.setOnClickListener(new View.OnClickListener() {
@@ -148,26 +177,20 @@ public void onClick(View v) {
}
});
setupNavigationButton(view, R.id.action_add_bookmark, R.id.icon_star);
-
- // Must be called here, only here we have a reference to the ListView
- new Thread(mInitBookmarkManager).run();
+ setupNavigationButton(view, R.id.action_reading, R.id.icon_reading);
+ setupNavigationButton(view, R.id.action_toggle_desktop, R.id.icon_desktop);
+
+ initBookmarkManager().subscribeOn(Schedulers.io())
+ .observeOn(Schedulers.main())
+ .subscribe(new OnSubscribe() {
+ @Override
+ public void onNext(@Nullable BookmarkViewAdapter item) {
+ mBookmarksListView.setAdapter(mBookmarkAdapter);
+ }
+ });
return view;
}
- @Override
- public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- // TODO remove dependency on BrowserActivity
- super.onActivityCreated(savedInstanceState);
- final Activity activity = getActivity();
- final PreferenceManager preferenceManager = PreferenceManager.getInstance();
- boolean darkTheme = preferenceManager.getUseTheme() != 0 || ((BrowserActivity) activity).isIncognito();
- mWebpageBitmap = ThemeUtils.getThemedBitmap(activity, R.drawable.ic_webpage, darkTheme);
- mFolderBitmap = ThemeUtils.getThemedBitmap(activity, R.drawable.ic_folder, darkTheme);
- mIconColor = darkTheme ? ThemeUtils.getIconDarkThemeColor(activity) :
- ThemeUtils.getIconLightThemeColor(activity);
- mBookmarkTitleImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
- }
-
@Override
public void onStart() {
super.onStart();
@@ -180,21 +203,30 @@ public void onStop() {
mEventBus.unregister(this);
}
- @Subscribe
- public void addBookmark(final BrowserEvents.AddBookmark event) {
- final HistoryItem item = new HistoryItem(event.url, event.title);
- if (mBookmarkManager.addBookmark(item)) {
- mBookmarks.add(item);
- Collections.sort(mBookmarks, new BookmarkManager.SortIgnoreCase());
- mBookmarkAdapter.notifyDataSetChanged();
- mEventBus.post(new BookmarkEvents.Added(item));
- updateBookmarkIndicator(event.url);
+ public void reinitializePreferences() {
+ Activity activity = getActivity();
+ if (activity == null) {
+ return;
}
+ boolean darkTheme = mPreferenceManager.getUseTheme() != 0 || mIsIncognito;
+ mWebpageBitmap = ThemeUtils.getThemedBitmap(activity, R.drawable.ic_webpage, darkTheme);
+ mFolderBitmap = ThemeUtils.getThemedBitmap(activity, R.drawable.ic_folder, darkTheme);
+ mIconColor = darkTheme ? ThemeUtils.getIconDarkThemeColor(activity) :
+ ThemeUtils.getIconLightThemeColor(activity);
+ }
+
+ @Subscribe
+ public void addBookmark(@NonNull final BrowserEvents.BookmarkAdded event) {
+ updateBookmarkIndicator(event.url);
+ String folder = mBookmarkManager.getCurrentFolder();
+ setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(folder, true), false);
}
@Subscribe
- public void currentPageInfo(final BrowserEvents.CurrentPageUrl event) {
+ public void currentPageInfo(@NonNull final BrowserEvents.CurrentPageUrl event) {
updateBookmarkIndicator(event.url);
+ String folder = mBookmarkManager.getCurrentFolder();
+ setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(folder, true), false);
}
@Subscribe
@@ -224,7 +256,7 @@ public void userPressedBack(final BrowserEvents.UserPressedBack event) {
}
@Subscribe
- public void bookmarkDeleted(final BookmarkEvents.Deleted event) {
+ public void bookmarkDeleted(@NonNull final BookmarkEvents.Deleted event) {
mBookmarks.remove(event.item);
if (event.item.isFolder()) {
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false);
@@ -233,7 +265,7 @@ public void bookmarkDeleted(final BookmarkEvents.Deleted event) {
}
}
- private void setBookmarkDataSet(List items, boolean animate) {
+ private void setBookmarkDataSet(@NonNull List items, boolean animate) {
mBookmarks.clear();
mBookmarks.addAll(items);
mBookmarkAdapter.notifyDataSetChanged();
@@ -291,19 +323,35 @@ private void setupNavigationButton(@NonNull View view, @IdRes int buttonId, @IdR
buttonImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
}
- private void handleLongPress(final HistoryItem item, final int position) {
+ private void handleLongPress(@NonNull final HistoryItem item) {
if (item.isFolder()) {
mBookmarksDialogBuilder.showBookmarkFolderLongPressedDialog(getContext(), item);
} else {
- mBookmarksDialogBuilder.showLongPressedDialogForUrl(getContext(), item);
+ mBookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(getContext(), item);
}
}
@Override
- public void onClick(View v) {
+ public void onClick(@NonNull View v) {
switch (v.getId()) {
case R.id.action_add_bookmark:
- mEventBus.post(new BookmarkEvents.WantToBookmarkCurrentPage());
+ mEventBus.post(new BookmarkEvents.ToggleBookmarkForCurrentPage());
+ break;
+ case R.id.action_reading:
+ LightningView currentTab = mTabsManager.getCurrentTab();
+ if (currentTab != null) {
+ Intent read = new Intent(getActivity(), ReadingActivity.class);
+ read.putExtra(Constants.LOAD_READING_URL, currentTab.getUrl());
+ startActivity(read);
+ }
+ break;
+ case R.id.action_toggle_desktop:
+ LightningView current = mTabsManager.getCurrentTab();
+ if (current != null) {
+ current.toggleDesktopUA(getActivity());
+ current.reload();
+ // TODO add back drawer closing
+ }
break;
default:
break;
@@ -319,7 +367,7 @@ private class BookmarkViewAdapter extends ArrayAdapter {
final Context context;
- public BookmarkViewAdapter(Context context, List data) {
+ public BookmarkViewAdapter(Context context, @NonNull List data) {
super(context, R.layout.bookmark_list_item, data);
this.context = context;
}
@@ -349,7 +397,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
holder.favicon.setImageBitmap(mFolderBitmap);
} else if (web.getBitmap() == null) {
holder.favicon.setImageBitmap(mWebpageBitmap);
- new ImageDownloadTask(holder.favicon, web, mWebpageBitmap)
+ new ImageDownloadTask(holder.favicon, web, mWebpageBitmap, context)
.executeOnExecutor(AsyncExecutor.getInstance());
} else {
holder.favicon.setImageBitmap(web.getBitmap());
diff --git a/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java
index 23180e933..772d13584 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/DisplaySettingsFragment.java
@@ -8,7 +8,7 @@
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -19,9 +19,8 @@
import android.widget.TextView;
import acr.browser.lightning.R;
-import acr.browser.lightning.preference.PreferenceManager;
-public class DisplaySettingsFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+public class DisplaySettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
private static final String SETTINGS_HIDESTATUSBAR = "fullScreenOption";
private static final String SETTINGS_FULLSCREEN = "fullscreen";
@@ -38,7 +37,6 @@ public class DisplaySettingsFragment extends PreferenceFragment implements Prefe
private static final float XSMALL = 10.0f;
private Activity mActivity;
- private PreferenceManager mPreferences;
private CheckBoxPreference cbstatus, cbfullscreen, cbviewport, cboverview, cbreflow;
private Preference theme;
private String[] mThemeOptions;
@@ -57,9 +55,8 @@ public void onCreate(Bundle savedInstanceState) {
private void initPrefs() {
// mPreferences storage
- mPreferences = PreferenceManager.getInstance();
mThemeOptions = this.getResources().getStringArray(R.array.themes);
- mCurrentTheme = mPreferences.getUseTheme();
+ mCurrentTheme = mPreferenceManager.getUseTheme();
theme = findPreference(SETTINGS_THEME);
Preference textsize = findPreference(SETTINGS_TEXTSIZE);
@@ -77,17 +74,17 @@ private void initPrefs() {
cboverview.setOnPreferenceChangeListener(this);
cbreflow.setOnPreferenceChangeListener(this);
- cbstatus.setChecked(mPreferences.getHideStatusBarEnabled());
- cbfullscreen.setChecked(mPreferences.getFullScreenEnabled());
- cbviewport.setChecked(mPreferences.getUseWideViewportEnabled());
- cboverview.setChecked(mPreferences.getOverviewModeEnabled());
- cbreflow.setChecked(mPreferences.getTextReflowEnabled());
+ cbstatus.setChecked(mPreferenceManager.getHideStatusBarEnabled());
+ cbfullscreen.setChecked(mPreferenceManager.getFullScreenEnabled());
+ cbviewport.setChecked(mPreferenceManager.getUseWideViewportEnabled());
+ cboverview.setChecked(mPreferenceManager.getOverviewModeEnabled());
+ cbreflow.setChecked(mPreferenceManager.getTextReflowEnabled());
- theme.setSummary(mThemeOptions[mPreferences.getUseTheme()]);
+ theme.setSummary(mThemeOptions[mPreferenceManager.getUseTheme()]);
}
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull Preference preference) {
switch (preference.getKey()) {
case SETTINGS_THEME:
themePicker();
@@ -101,27 +98,27 @@ public boolean onPreferenceClick(Preference preference) {
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
+ public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
// switch preferences
switch (preference.getKey()) {
case SETTINGS_HIDESTATUSBAR:
- mPreferences.setHideStatusBarEnabled((Boolean) newValue);
+ mPreferenceManager.setHideStatusBarEnabled((Boolean) newValue);
cbstatus.setChecked((Boolean) newValue);
return true;
case SETTINGS_FULLSCREEN:
- mPreferences.setFullScreenEnabled((Boolean) newValue);
+ mPreferenceManager.setFullScreenEnabled((Boolean) newValue);
cbfullscreen.setChecked((Boolean) newValue);
return true;
case SETTINGS_VIEWPORT:
- mPreferences.setUseWideViewportEnabled((Boolean) newValue);
+ mPreferenceManager.setUseWideViewportEnabled((Boolean) newValue);
cbviewport.setChecked((Boolean) newValue);
return true;
case SETTINGS_OVERVIEWMODE:
- mPreferences.setOverviewModeEnabled((Boolean) newValue);
+ mPreferenceManager.setOverviewModeEnabled((Boolean) newValue);
cboverview.setChecked((Boolean) newValue);
return true;
case SETTINGS_REFLOW:
- mPreferences.setTextReflowEnabled((Boolean) newValue);
+ mPreferenceManager.setTextReflowEnabled((Boolean) newValue);
cbreflow.setChecked((Boolean) newValue);
return true;
default:
@@ -142,14 +139,14 @@ private void textSizePicker() {
bar.setOnSeekBarChangeListener(new TextSeekBarListener(sample));
final int MAX = 5;
bar.setMax(MAX);
- bar.setProgress(MAX - mPreferences.getTextSize());
+ bar.setProgress(MAX - mPreferenceManager.getTextSize());
builder.setView(view);
builder.setTitle(R.string.title_text_size);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface arg0, int arg1) {
- mPreferences.setTextSize(MAX - bar.getProgress());
+ mPreferenceManager.setTextSize(MAX - bar.getProgress());
}
});
@@ -179,12 +176,12 @@ private void themePicker() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.theme));
- int n = mPreferences.getUseTheme();
+ int n = mPreferenceManager.getUseTheme();
picker.setSingleChoiceItems(mThemeOptions, n, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setUseTheme(which);
+ mPreferenceManager.setUseTheme(which);
if (which < mThemeOptions.length) {
theme.setSummary(mThemeOptions[which]);
}
@@ -195,7 +192,7 @@ public void onClick(DialogInterface dialog, int which) {
@Override
public void onClick(DialogInterface dialog, int which) {
- if (mCurrentTheme != mPreferences.getUseTheme()) {
+ if (mCurrentTheme != mPreferenceManager.getUseTheme()) {
getActivity().onBackPressed();
}
}
@@ -203,7 +200,7 @@ public void onClick(DialogInterface dialog, int which) {
picker.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
- if (mCurrentTheme != mPreferences.getUseTheme()) {
+ if (mCurrentTheme != mPreferenceManager.getUseTheme()) {
getActivity().onBackPressed();
}
}
diff --git a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java
index 951b6b987..5896f5065 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java
@@ -5,11 +5,12 @@
import android.app.Activity;
import android.content.DialogInterface;
+import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@@ -23,12 +24,11 @@
import acr.browser.lightning.R;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.download.DownloadHandler;
-import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.utils.ProxyUtils;
import acr.browser.lightning.utils.ThemeUtils;
import acr.browser.lightning.utils.Utils;
-public class GeneralSettingsFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+public class GeneralSettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
private static final String SETTINGS_PROXY = "proxy";
private static final String SETTINGS_FLASH = "cb_flash";
@@ -45,13 +45,11 @@ public class GeneralSettingsFragment extends PreferenceFragment implements Prefe
private Activity mActivity;
private static final int API = android.os.Build.VERSION.SDK_INT;
- private PreferenceManager mPreferences;
private CharSequence[] mProxyChoices;
private Preference proxy, useragent, downloadloc, home, searchengine;
private String mDownloadLocation;
private int mAgentChoice;
private String mHomepage;
- private CheckBoxPreference cbFlash, cbAds, cbImages, cbJsScript, cbColorMode, cbgooglesuggest, cbDrawerTabs;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -65,22 +63,19 @@ public void onCreate(Bundle savedInstanceState) {
}
private void initPrefs() {
- // mPreferences storage
- mPreferences = PreferenceManager.getInstance();
-
proxy = findPreference(SETTINGS_PROXY);
useragent = findPreference(SETTINGS_USERAGENT);
downloadloc = findPreference(SETTINGS_DOWNLOAD);
home = findPreference(SETTINGS_HOME);
searchengine = findPreference(SETTINGS_SEARCHENGINE);
- cbFlash = (CheckBoxPreference) findPreference(SETTINGS_FLASH);
- cbAds = (CheckBoxPreference) findPreference(SETTINGS_ADS);
- cbImages = (CheckBoxPreference) findPreference(SETTINGS_IMAGES);
- cbJsScript = (CheckBoxPreference) findPreference(SETTINGS_JAVASCRIPT);
- cbColorMode = (CheckBoxPreference) findPreference(SETTINGS_COLORMODE);
- cbgooglesuggest = (CheckBoxPreference) findPreference(SETTINGS_GOOGLESUGGESTIONS);
- cbDrawerTabs = (CheckBoxPreference) findPreference(SETTINGS_DRAWERTABS);
+ CheckBoxPreference cbFlash = (CheckBoxPreference) findPreference(SETTINGS_FLASH);
+ CheckBoxPreference cbAds = (CheckBoxPreference) findPreference(SETTINGS_ADS);
+ CheckBoxPreference cbImages = (CheckBoxPreference) findPreference(SETTINGS_IMAGES);
+ CheckBoxPreference cbJsScript = (CheckBoxPreference) findPreference(SETTINGS_JAVASCRIPT);
+ CheckBoxPreference cbColorMode = (CheckBoxPreference) findPreference(SETTINGS_COLORMODE);
+ CheckBoxPreference cbgooglesuggest = (CheckBoxPreference) findPreference(SETTINGS_GOOGLESUGGESTIONS);
+ CheckBoxPreference cbDrawerTabs = (CheckBoxPreference) findPreference(SETTINGS_DRAWERTABS);
proxy.setOnPreferenceClickListener(this);
useragent.setOnPreferenceClickListener(this);
@@ -95,23 +90,23 @@ private void initPrefs() {
cbgooglesuggest.setOnPreferenceChangeListener(this);
cbDrawerTabs.setOnPreferenceChangeListener(this);
- mAgentChoice = mPreferences.getUserAgentChoice();
- mHomepage = mPreferences.getHomepage();
- mDownloadLocation = mPreferences.getDownloadDirectory();
+ mAgentChoice = mPreferenceManager.getUserAgentChoice();
+ mHomepage = mPreferenceManager.getHomepage();
+ mDownloadLocation = mPreferenceManager.getDownloadDirectory();
mProxyChoices = getResources().getStringArray(R.array.proxy_choices_array);
- int choice = mPreferences.getProxyChoice();
+ int choice = mPreferenceManager.getProxyChoice();
if (choice == Constants.PROXY_MANUAL) {
- proxy.setSummary(mPreferences.getProxyHost() + ':' + mPreferences.getProxyPort());
+ proxy.setSummary(mPreferenceManager.getProxyHost() + ':' + mPreferenceManager.getProxyPort());
} else {
proxy.setSummary(mProxyChoices[choice]);
}
- if (API >= 19) {
- mPreferences.setFlashSupport(0);
+ if (API >= Build.VERSION_CODES.KITKAT) {
+ mPreferenceManager.setFlashSupport(0);
}
- setSearchEngineSummary(mPreferences.getSearchChoice());
+ setSearchEngineSummary(mPreferenceManager.getSearchChoice());
downloadloc.setSummary(mDownloadLocation);
@@ -139,28 +134,27 @@ private void initPrefs() {
useragent.setSummary(getResources().getString(R.string.agent_custom));
}
- int flashNum = mPreferences.getFlashSupport();
- boolean imagesBool = mPreferences.getBlockImagesEnabled();
- boolean enableJSBool = mPreferences.getJavaScriptEnabled();
+ int flashNum = mPreferenceManager.getFlashSupport();
+ boolean imagesBool = mPreferenceManager.getBlockImagesEnabled();
+ boolean enableJSBool = mPreferenceManager.getJavaScriptEnabled();
-// proxy.setEnabled(Constants.FULL_VERSION);
cbAds.setEnabled(Constants.FULL_VERSION);
- cbFlash.setEnabled(API < 19);
+ cbFlash.setEnabled(API < Build.VERSION_CODES.KITKAT);
cbImages.setChecked(imagesBool);
cbJsScript.setChecked(enableJSBool);
cbFlash.setChecked(flashNum > 0);
- cbAds.setChecked(Constants.FULL_VERSION && mPreferences.getAdBlockEnabled());
- cbColorMode.setChecked(mPreferences.getColorModeEnabled());
- cbgooglesuggest.setChecked(mPreferences.getGoogleSearchSuggestionsEnabled());
- cbDrawerTabs.setChecked(mPreferences.getShowTabsInDrawer(true));
+ cbAds.setChecked(Constants.FULL_VERSION && mPreferenceManager.getAdBlockEnabled());
+ cbColorMode.setChecked(mPreferenceManager.getColorModeEnabled());
+ cbgooglesuggest.setChecked(mPreferenceManager.getGoogleSearchSuggestionsEnabled());
+ cbDrawerTabs.setChecked(mPreferenceManager.getShowTabsInDrawer(true));
}
private void searchUrlPicker() {
final AlertDialog.Builder urlPicker = new AlertDialog.Builder(mActivity);
urlPicker.setTitle(getResources().getString(R.string.custom_url));
final EditText getSearchUrl = new EditText(mActivity);
- String mSearchUrl = mPreferences.getSearchUrl();
+ String mSearchUrl = mPreferenceManager.getSearchUrl();
getSearchUrl.setText(mSearchUrl);
urlPicker.setView(getSearchUrl);
urlPicker.setPositiveButton(getResources().getString(R.string.action_ok),
@@ -168,7 +162,7 @@ private void searchUrlPicker() {
@Override
public void onClick(DialogInterface dialog, int which) {
String text = getSearchUrl.getText().toString();
- mPreferences.setSearchUrl(text);
+ mPreferenceManager.setSearchUrl(text);
searchengine.setSummary(getResources().getString(R.string.custom_url) + ": "
+ text);
}
@@ -185,7 +179,7 @@ private void getFlashChoice() {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
- mPreferences.setFlashSupport(1);
+ mPreferenceManager.setFlashSupport(1);
}
})
.setNegativeButton(getResources().getString(R.string.action_auto),
@@ -193,13 +187,13 @@ public void onClick(DialogInterface dialog, int id) {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setFlashSupport(2);
+ mPreferenceManager.setFlashSupport(2);
}
}).setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
- mPreferences.setFlashSupport(0);
+ mPreferenceManager.setFlashSupport(0);
}
});
@@ -210,7 +204,7 @@ public void onCancel(DialogInterface dialog) {
private void proxyChoicePicker() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.http_proxy));
- picker.setSingleChoiceItems(mProxyChoices, mPreferences.getProxyChoice(),
+ picker.setSingleChoiceItems(mProxyChoices, mPreferenceManager.getProxyChoice(),
new DialogInterface.OnClickListener() {
@Override
@@ -235,7 +229,7 @@ private void setProxyChoice(int choice) {
break;
}
- mPreferences.setProxyChoice(choice);
+ mPreferenceManager.setProxyChoice(choice);
if (choice < mProxyChoices.length)
proxy.setSummary(mProxyChoices[choice]);
}
@@ -253,8 +247,8 @@ private void manualProxyPicker() {
filterArray[0] = new InputFilter.LengthFilter(maxCharacters - 1);
eProxyPort.setFilters(filterArray);
- eProxyHost.setText(mPreferences.getProxyHost());
- eProxyPort.setText(Integer.toString(mPreferences.getProxyPort()));
+ eProxyHost.setText(mPreferenceManager.getProxyHost());
+ eProxyPort.setText(Integer.toString(mPreferenceManager.getProxyPort()));
new AlertDialog.Builder(mActivity)
.setTitle(R.string.manual_proxy)
@@ -269,10 +263,10 @@ public void onClick(DialogInterface dialogInterface, int i) {
// larger than max integer
proxyPort = Integer.parseInt(eProxyPort.getText().toString());
} catch (NumberFormatException ignored) {
- proxyPort = mPreferences.getProxyPort();
+ proxyPort = mPreferenceManager.getProxyPort();
}
- mPreferences.setProxyHost(proxyHost);
- mPreferences.setProxyPort(proxyPort);
+ mPreferenceManager.setProxyHost(proxyHost);
+ mPreferenceManager.setProxyPort(proxyPort);
proxy.setSummary(proxyHost + ':' + proxyPort);
}
}).show();
@@ -286,13 +280,13 @@ private void searchDialog() {
"DuckDuckGo (Privacy)", "DuckDuckGo Lite (Privacy)", "Baidu (Chinese)",
"Yandex (Russian)"};
- int n = mPreferences.getSearchChoice();
+ int n = mPreferenceManager.getSearchChoice();
picker.setSingleChoiceItems(chars, n, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setSearchChoice(which);
+ mPreferenceManager.setSearchChoice(which);
setSearchEngineSummary(which);
}
});
@@ -303,7 +297,7 @@ public void onClick(DialogInterface dialog, int which) {
private void homepageDialog() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.home));
- mHomepage = mPreferences.getHomepage();
+ mHomepage = mPreferenceManager.getHomepage();
int n;
if (mHomepage.contains("about:home")) {
n = 1;
@@ -321,15 +315,15 @@ private void homepageDialog() {
public void onClick(DialogInterface dialog, int which) {
switch (which + 1) {
case 1:
- mPreferences.setHomepage("about:home");
+ mPreferenceManager.setHomepage("about:home");
home.setSummary(getResources().getString(R.string.action_homepage));
break;
case 2:
- mPreferences.setHomepage("about:blank");
+ mPreferenceManager.setHomepage("about:blank");
home.setSummary(getResources().getString(R.string.action_blank));
break;
case 3:
- mPreferences.setHomepage("about:bookmarks");
+ mPreferenceManager.setHomepage("about:bookmarks");
home.setSummary(getResources().getString(R.string.action_bookmarks));
break;
case 4:
@@ -346,11 +340,12 @@ private void homePicker() {
final AlertDialog.Builder homePicker = new AlertDialog.Builder(mActivity);
homePicker.setTitle(getResources().getString(R.string.title_custom_homepage));
final EditText getHome = new EditText(mActivity);
- mHomepage = mPreferences.getHomepage();
+ mHomepage = mPreferenceManager.getHomepage();
if (!mHomepage.startsWith("about:")) {
getHome.setText(mHomepage);
} else {
- getHome.setText("http://www.google.com");
+ String defaultUrl = "https://www.google.com";
+ getHome.setText(defaultUrl);
}
homePicker.setView(getHome);
homePicker.setPositiveButton(getResources().getString(R.string.action_ok),
@@ -358,7 +353,7 @@ private void homePicker() {
@Override
public void onClick(DialogInterface dialog, int which) {
String text = getHome.getText().toString();
- mPreferences.setHomepage(text);
+ mPreferenceManager.setHomepage(text);
home.setSummary(text);
}
});
@@ -368,7 +363,7 @@ public void onClick(DialogInterface dialog, int which) {
private void downloadLocDialog() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.title_download_location));
- mDownloadLocation = mPreferences.getDownloadDirectory();
+ mDownloadLocation = mPreferenceManager.getDownloadDirectory();
int n;
if (mDownloadLocation.contains(Environment.DIRECTORY_DOWNLOADS)) {
n = 0;
@@ -382,7 +377,7 @@ private void downloadLocDialog() {
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case 0:
- mPreferences.setDownloadDirectory(DownloadHandler.DEFAULT_DOWNLOAD_PATH);
+ mPreferenceManager.setDownloadDirectory(DownloadHandler.DEFAULT_DOWNLOAD_PATH);
downloadloc.setSummary(DownloadHandler.DEFAULT_DOWNLOAD_PATH);
break;
case 1:
@@ -398,12 +393,12 @@ public void onClick(DialogInterface dialog, int which) {
private void agentDialog() {
AlertDialog.Builder agentPicker = new AlertDialog.Builder(mActivity);
agentPicker.setTitle(getResources().getString(R.string.title_user_agent));
- mAgentChoice = mPreferences.getUserAgentChoice();
+ mAgentChoice = mPreferenceManager.getUserAgentChoice();
agentPicker.setSingleChoiceItems(R.array.user_agent, mAgentChoice - 1,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- mPreferences.setUserAgentChoice(which + 1);
+ mPreferenceManager.setUserAgentChoice(which + 1);
switch (which + 1) {
case 1:
useragent.setSummary(getResources().getString(R.string.agent_default));
@@ -435,7 +430,7 @@ private void agentPicker() {
@Override
public void onClick(DialogInterface dialog, int which) {
String text = getAgent.getText().toString();
- mPreferences.setUserAgentString(text);
+ mPreferenceManager.setUserAgentString(text);
useragent.setSummary(getResources().getString(R.string.agent_custom));
}
});
@@ -449,12 +444,12 @@ private void downPicker() {
final EditText getDownload = new EditText(mActivity);
getDownload.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
- getDownload.setText(PreferenceManager.getInstance().getDownloadDirectory());
+ getDownload.setText(mPreferenceManager.getDownloadDirectory());
final int errorColor = ContextCompat.getColor(getActivity(), R.color.error_red);
final int regularColor = ThemeUtils.getTextColor(getActivity());
getDownload.setTextColor(regularColor);
getDownload.addTextChangedListener(new DownloadLocationTextWatcher(getDownload, errorColor, regularColor));
- getDownload.setText(mPreferences.getDownloadDirectory());
+ getDownload.setText(mPreferenceManager.getDownloadDirectory());
layout.addView(getDownload);
downLocationPicker.setView(layout);
@@ -464,7 +459,7 @@ private void downPicker() {
public void onClick(DialogInterface dialog, int which) {
String text = getDownload.getText().toString();
text = DownloadHandler.addNecessarySlashes(text);
- mPreferences.setDownloadDirectory(text);
+ mPreferenceManager.setDownloadDirectory(text);
downloadloc.setSummary(text);
}
});
@@ -509,7 +504,7 @@ private void setSearchEngineSummary(int which) {
}
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull Preference preference) {
switch (preference.getKey()) {
case SETTINGS_PROXY:
proxyChoicePicker();
@@ -532,45 +527,43 @@ public boolean onPreferenceClick(Preference preference) {
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- // switch preferences
+ public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
+ boolean checked = false;
+ if (newValue instanceof Boolean) {
+ checked = (Boolean) newValue;
+ }
switch (preference.getKey()) {
case SETTINGS_FLASH:
- if (cbFlash.isChecked()) {
- getFlashChoice();
- } else {
- mPreferences.setFlashSupport(0);
- }
- if (!Utils.isFlashInstalled(mActivity) && cbFlash.isChecked()) {
+ if (!Utils.isFlashInstalled(mActivity) && checked) {
Utils.createInformativeDialog(mActivity, R.string.title_warning, R.string.dialog_adobe_not_installed);
- cbFlash.setEnabled(false);
- mPreferences.setFlashSupport(0);
+ mPreferenceManager.setFlashSupport(0);
+ return false;
+ } else {
+ if (checked) {
+ getFlashChoice();
+ } else {
+ mPreferenceManager.setFlashSupport(0);
+ }
}
- cbFlash.setChecked((Boolean) newValue);
return true;
case SETTINGS_ADS:
- mPreferences.setAdBlockEnabled((Boolean) newValue);
- cbAds.setChecked((Boolean) newValue);
+ mPreferenceManager.setAdBlockEnabled(checked);
return true;
case SETTINGS_IMAGES:
- mPreferences.setBlockImagesEnabled((Boolean) newValue);
- cbImages.setChecked((Boolean) newValue);
+ mPreferenceManager.setBlockImagesEnabled(checked);
return true;
case SETTINGS_JAVASCRIPT:
- mPreferences.setJavaScriptEnabled((Boolean) newValue);
- cbJsScript.setChecked((Boolean) newValue);
+ mPreferenceManager.setJavaScriptEnabled(checked);
return true;
case SETTINGS_COLORMODE:
- mPreferences.setColorModeEnabled((Boolean) newValue);
- cbColorMode.setChecked((Boolean) newValue);
+ mPreferenceManager.setColorModeEnabled(checked);
return true;
case SETTINGS_GOOGLESUGGESTIONS:
- mPreferences.setGoogleSearchSuggestionsEnabled((Boolean) newValue);
- cbgooglesuggest.setChecked((Boolean) newValue);
+ mPreferenceManager.setGoogleSearchSuggestionsEnabled(checked);
return true;
case SETTINGS_DRAWERTABS:
- mPreferences.setShowTabsInDrawer((Boolean) newValue);
- cbDrawerTabs.setChecked((Boolean) newValue);
+ mPreferenceManager.setShowTabsInDrawer(checked);
+ return true;
default:
return false;
}
@@ -594,7 +587,7 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
public void onTextChanged(CharSequence s, int start, int before, int count) {}
@Override
- public void afterTextChanged(Editable s) {
+ public void afterTextChanged(@NonNull Editable s) {
if (!DownloadHandler.isWriteAccessAvailable(s.toString())) {
this.getDownload.setTextColor(this.errorColor);
} else {
diff --git a/app/src/main/java/acr/browser/lightning/fragment/LightningPreferenceFragment.java b/app/src/main/java/acr/browser/lightning/fragment/LightningPreferenceFragment.java
new file mode 100644
index 000000000..ab7c48d95
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/fragment/LightningPreferenceFragment.java
@@ -0,0 +1,27 @@
+package acr.browser.lightning.fragment;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+import javax.inject.Inject;
+
+import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.preference.PreferenceManager;
+
+/**
+ * Simplify {@link PreferenceManager} inject in all the PreferenceFragments
+ *
+ * @author Stefano Pacifici
+ * @date 2015/09/16
+ */
+public class LightningPreferenceFragment extends PreferenceFragment {
+
+ @Inject
+ PreferenceManager mPreferenceManager;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ BrowserApp.getAppComponent().inject(this);
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/fragment/PrivacySettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/PrivacySettingsFragment.java
index 9fc225c87..24162a1dc 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/PrivacySettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/PrivacySettingsFragment.java
@@ -11,16 +11,20 @@
import android.os.Message;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.webkit.WebView;
+import javax.inject.Inject;
+
import acr.browser.lightning.R;
-import acr.browser.lightning.preference.PreferenceManager;
+import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.database.HistoryDatabase;
import acr.browser.lightning.utils.Utils;
import acr.browser.lightning.utils.WebUtils;
+import acr.browser.lightning.view.LightningView;
-public class PrivacySettingsFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+public class PrivacySettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
private static final String SETTINGS_LOCATION = "location";
private static final String SETTINGS_THIRDPCOOKIES = "third_party";
@@ -33,16 +37,18 @@ public class PrivacySettingsFragment extends PreferenceFragment implements Prefe
private static final String SETTINGS_CLEARCOOKIES = "clear_cookies";
private static final String SETTINGS_CLEARWEBSTORAGE = "clear_webstorage";
private static final String SETTINGS_WEBSTORAGEEXIT = "clear_webstorage_exit";
+ private static final String SETTINGS_DONOTTRACK = "do_not_track";
+ private static final String SETTINGS_IDENTIFYINGHEADERS = "remove_identifying_headers";
private Activity mActivity;
- private PreferenceManager mPreferences;
- private CheckBoxPreference cblocation, cb3cookies, cbsavepasswords, cbcacheexit, cbhistoryexit,
- cbcookiesexit, cbwebstorageexit;
- private Handler messageHandler;
+ private Handler mMessageHandler;
+
+ @Inject HistoryDatabase mHistoryDatabase;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ BrowserApp.getAppComponent().inject(this);
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.preference_privacy);
@@ -52,21 +58,20 @@ public void onCreate(Bundle savedInstanceState) {
}
private void initPrefs() {
- // mPreferences storage
- mPreferences = PreferenceManager.getInstance();
-
Preference clearcache = findPreference(SETTINGS_CLEARCACHE);
Preference clearhistory = findPreference(SETTINGS_CLEARHISTORY);
Preference clearcookies = findPreference(SETTINGS_CLEARCOOKIES);
Preference clearwebstorage = findPreference(SETTINGS_CLEARWEBSTORAGE);
- cblocation = (CheckBoxPreference) findPreference(SETTINGS_LOCATION);
- cb3cookies = (CheckBoxPreference) findPreference(SETTINGS_THIRDPCOOKIES);
- cbsavepasswords = (CheckBoxPreference) findPreference(SETTINGS_SAVEPASSWORD);
- cbcacheexit = (CheckBoxPreference) findPreference(SETTINGS_CACHEEXIT);
- cbhistoryexit = (CheckBoxPreference) findPreference(SETTINGS_HISTORYEXIT);
- cbcookiesexit = (CheckBoxPreference) findPreference(SETTINGS_COOKIEEXIT);
- cbwebstorageexit = (CheckBoxPreference) findPreference(SETTINGS_WEBSTORAGEEXIT);
+ CheckBoxPreference cblocation = (CheckBoxPreference) findPreference(SETTINGS_LOCATION);
+ CheckBoxPreference cb3cookies = (CheckBoxPreference) findPreference(SETTINGS_THIRDPCOOKIES);
+ CheckBoxPreference cbsavepasswords = (CheckBoxPreference) findPreference(SETTINGS_SAVEPASSWORD);
+ CheckBoxPreference cbcacheexit = (CheckBoxPreference) findPreference(SETTINGS_CACHEEXIT);
+ CheckBoxPreference cbhistoryexit = (CheckBoxPreference) findPreference(SETTINGS_HISTORYEXIT);
+ CheckBoxPreference cbcookiesexit = (CheckBoxPreference) findPreference(SETTINGS_COOKIEEXIT);
+ CheckBoxPreference cbwebstorageexit = (CheckBoxPreference) findPreference(SETTINGS_WEBSTORAGEEXIT);
+ CheckBoxPreference cbDoNotTrack = (CheckBoxPreference) findPreference(SETTINGS_DONOTTRACK);
+ CheckBoxPreference cbIdentifyingHeaders = (CheckBoxPreference) findPreference(SETTINGS_IDENTIFYINGHEADERS);
clearcache.setOnPreferenceClickListener(this);
clearhistory.setOnPreferenceClickListener(this);
@@ -80,18 +85,28 @@ private void initPrefs() {
cbhistoryexit.setOnPreferenceChangeListener(this);
cbcookiesexit.setOnPreferenceChangeListener(this);
cbwebstorageexit.setOnPreferenceChangeListener(this);
+ cbDoNotTrack.setOnPreferenceChangeListener(this);
+ cbIdentifyingHeaders.setOnPreferenceChangeListener(this);
+
+ cblocation.setChecked(mPreferenceManager.getLocationEnabled());
+ cbsavepasswords.setChecked(mPreferenceManager.getSavePasswordsEnabled());
+ cbcacheexit.setChecked(mPreferenceManager.getClearCacheExit());
+ cbhistoryexit.setChecked(mPreferenceManager.getClearHistoryExitEnabled());
+ cbcookiesexit.setChecked(mPreferenceManager.getClearCookiesExitEnabled());
+ cb3cookies.setChecked(mPreferenceManager.getBlockThirdPartyCookiesEnabled());
+ cbwebstorageexit.setChecked(mPreferenceManager.getClearWebStorageExitEnabled());
+ cbDoNotTrack.setChecked(mPreferenceManager.getDoNotTrackEnabled() && Utils.doesSupportHeaders());
+ cbIdentifyingHeaders.setChecked(mPreferenceManager.getRemoveIdentifyingHeadersEnabled() && Utils.doesSupportHeaders());
- cblocation.setChecked(mPreferences.getLocationEnabled());
- cbsavepasswords.setChecked(mPreferences.getSavePasswordsEnabled());
- cbcacheexit.setChecked(mPreferences.getClearCacheExit());
- cbhistoryexit.setChecked(mPreferences.getClearHistoryExitEnabled());
- cbcookiesexit.setChecked(mPreferences.getClearCookiesExitEnabled());
- cb3cookies.setChecked(mPreferences.getBlockThirdPartyCookiesEnabled());
- cbwebstorageexit.setChecked(mPreferences.getClearWebStorageExitEnabled());
+ cbDoNotTrack.setEnabled(Utils.doesSupportHeaders());
+ cbIdentifyingHeaders.setEnabled(Utils.doesSupportHeaders());
+
+ String identifyingHeadersSummary = LightningView.HEADER_REQUESTED_WITH + ", " + LightningView.HEADER_WAP_PROFILE;
+ cbIdentifyingHeaders.setSummary(identifyingHeadersSummary);
cb3cookies.setEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP);
- messageHandler = new MessageHandler(mActivity);
+ mMessageHandler = new MessageHandler(mActivity);
}
private static class MessageHandler extends Handler {
@@ -103,7 +118,7 @@ public MessageHandler(Activity context) {
}
@Override
- public void handleMessage(Message msg) {
+ public void handleMessage(@NonNull Message msg) {
switch (msg.what) {
case 1:
Utils.showSnackbar(mHandlerContext, R.string.message_clear_history);
@@ -117,7 +132,7 @@ public void handleMessage(Message msg) {
}
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull Preference preference) {
switch (preference.getKey()) {
case SETTINGS_CLEARCACHE:
clearCache();
@@ -144,13 +159,12 @@ private void clearHistoryDialog() {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface arg0, int arg1) {
- Thread clear = new Thread(new Runnable() {
+ BrowserApp.getIOThread().execute(new Runnable() {
@Override
public void run() {
clearHistory();
}
});
- clear.start();
}
})
.setNegativeButton(getResources().getString(R.string.action_no), null).show();
@@ -164,13 +178,12 @@ private void clearCookiesDialog() {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface arg0, int arg1) {
- Thread clear = new Thread(new Runnable() {
+ BrowserApp.getTaskThread().execute(new Runnable() {
@Override
public void run() {
clearCookies();
}
});
- clear.start();
}
})
.setNegativeButton(getResources().getString(R.string.action_no), null).show();
@@ -184,13 +197,13 @@ private void clearCache() {
}
private void clearHistory() {
- WebUtils.clearHistory(getActivity());
- messageHandler.sendEmptyMessage(1);
+ WebUtils.clearHistory(getActivity(), mHistoryDatabase);
+ mMessageHandler.sendEmptyMessage(1);
}
private void clearCookies() {
WebUtils.clearCookies(getActivity());
- messageHandler.sendEmptyMessage(2);
+ mMessageHandler.sendEmptyMessage(2);
}
private void clearWebStorage() {
@@ -199,36 +212,34 @@ private void clearWebStorage() {
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- // switch preferences
+ public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
switch (preference.getKey()) {
case SETTINGS_LOCATION:
- mPreferences.setLocationEnabled((Boolean) newValue);
- cblocation.setChecked((Boolean) newValue);
+ mPreferenceManager.setLocationEnabled((Boolean) newValue);
return true;
case SETTINGS_THIRDPCOOKIES:
- mPreferences.setBlockThirdPartyCookiesEnabled((Boolean) newValue);
- cb3cookies.setChecked((Boolean) newValue);
+ mPreferenceManager.setBlockThirdPartyCookiesEnabled((Boolean) newValue);
return true;
case SETTINGS_SAVEPASSWORD:
- mPreferences.setSavePasswordsEnabled((Boolean) newValue);
- cbsavepasswords.setChecked((Boolean) newValue);
+ mPreferenceManager.setSavePasswordsEnabled((Boolean) newValue);
return true;
case SETTINGS_CACHEEXIT:
- mPreferences.setClearCacheExit((Boolean) newValue);
- cbcacheexit.setChecked((Boolean) newValue);
+ mPreferenceManager.setClearCacheExit((Boolean) newValue);
return true;
case SETTINGS_HISTORYEXIT:
- mPreferences.setClearHistoryExitEnabled((Boolean) newValue);
- cbhistoryexit.setChecked((Boolean) newValue);
+ mPreferenceManager.setClearHistoryExitEnabled((Boolean) newValue);
return true;
case SETTINGS_COOKIEEXIT:
- mPreferences.setClearCookiesExitEnabled((Boolean) newValue);
- cbcookiesexit.setChecked((Boolean) newValue);
+ mPreferenceManager.setClearCookiesExitEnabled((Boolean) newValue);
return true;
case SETTINGS_WEBSTORAGEEXIT:
- mPreferences.setClearWebStorageExitEnabled((Boolean) newValue);
- cbwebstorageexit.setChecked((Boolean) newValue);
+ mPreferenceManager.setClearWebStorageExitEnabled((Boolean) newValue);
+ return true;
+ case SETTINGS_DONOTTRACK:
+ mPreferenceManager.setDoNotTrackEnabled((Boolean) newValue);
+ return true;
+ case SETTINGS_IDENTIFYINGHEADERS:
+ mPreferenceManager.setRemoveIdentifyingHeadersEnabled((Boolean) newValue);
return true;
default:
return false;
diff --git a/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
new file mode 100644
index 000000000..7d9c5a360
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
@@ -0,0 +1,413 @@
+package acr.browser.lightning.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.TextViewCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.LayoutManager;
+import android.support.v7.widget.SimpleItemAnimator;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.squareup.otto.Bus;
+
+import javax.inject.Inject;
+
+import acr.browser.lightning.R;
+import acr.browser.lightning.activity.TabsManager;
+import acr.browser.lightning.app.BrowserApp;
+import acr.browser.lightning.browser.TabsView;
+import acr.browser.lightning.bus.NavigationEvents;
+import acr.browser.lightning.bus.TabEvents;
+import acr.browser.lightning.controller.UIController;
+import acr.browser.lightning.fragment.anim.HorizontalItemAnimator;
+import acr.browser.lightning.fragment.anim.VerticalItemAnimator;
+import acr.browser.lightning.preference.PreferenceManager;
+import acr.browser.lightning.utils.ThemeUtils;
+import acr.browser.lightning.utils.Utils;
+import acr.browser.lightning.view.LightningView;
+
+/**
+ * A fragment that holds and manages the tabs and interaction with the tabs.
+ * It is reliant on the BrowserController in order to get the current UI state
+ * of the browser. It also uses the BrowserController to signal that the UI needs
+ * to change. This class contains the adapter used by both the drawer tabs and
+ * the desktop tabs. It delegates touch events for the tab UI appropriately.
+ */
+public class TabsFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener, TabsView {
+
+ private static final String TAG = TabsFragment.class.getSimpleName();
+
+ /**
+ * Arguments boolean to tell the fragment it is displayed in the drawner or on the tab strip
+ * If true, the fragment is in the left drawner in the strip otherwise.
+ */
+ public static final String VERTICAL_MODE = TAG + ".VERTICAL_MODE";
+ public static final String IS_INCOGNITO = TAG + ".IS_INCOGNITO";
+
+ private boolean mIsIncognito, mDarkTheme;
+ private int mIconColor;
+ private boolean mColorMode = true;
+ private boolean mShowInNavigationDrawer;
+
+ @Nullable private LightningViewAdapter mTabsAdapter;
+ private UIController mUiController;
+ private RecyclerView mRecyclerView;
+
+ private TabsManager mTabsManager;
+ @Inject Bus mBus;
+ @Inject PreferenceManager mPreferences;
+
+ public TabsFragment() {
+ BrowserApp.getAppComponent().inject(this);
+ }
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ final Bundle arguments = getArguments();
+ final Context context = getContext();
+ mUiController = (UIController) getActivity();
+ mTabsManager = mUiController.getTabModel();
+ mIsIncognito = arguments.getBoolean(IS_INCOGNITO, false);
+ mShowInNavigationDrawer = arguments.getBoolean(VERTICAL_MODE, true);
+ mDarkTheme = mPreferences.getUseTheme() != 0 || mIsIncognito;
+ mColorMode = mPreferences.getColorModeEnabled();
+ mColorMode &= !mDarkTheme;
+ mIconColor = mDarkTheme ?
+ ThemeUtils.getIconDarkThemeColor(context) :
+ ThemeUtils.getIconLightThemeColor(context);
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ final View view;
+ final LayoutManager layoutManager;
+ if (mShowInNavigationDrawer) {
+ view = inflater.inflate(R.layout.tab_drawer, container, false);
+ layoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
+ setupFrameLayoutButton(view, R.id.tab_header_button, R.id.plusIcon);
+ setupFrameLayoutButton(view, R.id.new_tab_button, R.id.icon_plus);
+ setupFrameLayoutButton(view, R.id.action_back, R.id.icon_back);
+ setupFrameLayoutButton(view, R.id.action_forward, R.id.icon_forward);
+ setupFrameLayoutButton(view, R.id.action_home, R.id.icon_home);
+ } else {
+ view = inflater.inflate(R.layout.tab_strip, container, false);
+ layoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false);
+ ImageView newTab = (ImageView) view.findViewById(R.id.new_tab_button);
+ newTab.setColorFilter(ThemeUtils.getIconDarkThemeColor(getActivity()));
+ newTab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mUiController.newTabClicked();
+ }
+ });
+ }
+ mRecyclerView = (RecyclerView) view.findViewById(R.id.tabs_list);
+ SimpleItemAnimator animator;
+ if (mShowInNavigationDrawer) {
+ animator = new VerticalItemAnimator();
+ } else {
+ animator = new HorizontalItemAnimator();
+ }
+ animator.setSupportsChangeAnimations(false);
+ animator.setAddDuration(200);
+ animator.setChangeDuration(0);
+ animator.setRemoveDuration(200);
+ animator.setMoveDuration(200);
+ mRecyclerView.setLayerType(View.LAYER_TYPE_NONE, null);
+ mRecyclerView.setItemAnimator(animator);
+ mRecyclerView.setLayoutManager(layoutManager);
+ mTabsAdapter = new LightningViewAdapter(mShowInNavigationDrawer);
+ mRecyclerView.setAdapter(mTabsAdapter);
+ mRecyclerView.setHasFixedSize(true);
+ return view;
+ }
+
+ private void setupFrameLayoutButton(@NonNull final View root, @IdRes final int buttonId,
+ @IdRes final int imageId) {
+ final View frameButton = root.findViewById(buttonId);
+ final ImageView buttonImage = (ImageView) root.findViewById(imageId);
+ frameButton.setOnClickListener(this);
+ frameButton.setOnLongClickListener(this);
+ buttonImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ mTabsAdapter = null;
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ mBus.register(this);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ // Force adapter refresh
+ if (mTabsAdapter != null) {
+ mTabsAdapter.notifyDataSetChanged();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ mBus.unregister(this);
+ }
+
+ public void reinitializePreferences() {
+ Activity activity = getActivity();
+ if (activity == null) {
+ return;
+ }
+ mDarkTheme = mPreferences.getUseTheme() != 0 || mIsIncognito;
+ mColorMode = mPreferences.getColorModeEnabled();
+ mColorMode &= !mDarkTheme;
+ mIconColor = mDarkTheme ?
+ ThemeUtils.getIconDarkThemeColor(activity) :
+ ThemeUtils.getIconLightThemeColor(activity);
+ if (mTabsAdapter != null) {
+ mTabsAdapter.notifyDataSetChanged();
+ }
+ }
+
+ @Override
+ public void onClick(@NonNull View v) {
+ switch (v.getId()) {
+ case R.id.tab_header_button:
+ mUiController.showCloseDialog(mTabsManager.indexOfCurrentTab());
+ break;
+ case R.id.new_tab_button:
+ mBus.post(new TabEvents.NewTab());
+ break;
+ case R.id.action_back:
+ mBus.post(new NavigationEvents.GoBack());
+ break;
+ case R.id.action_forward:
+ mBus.post(new NavigationEvents.GoForward());
+ break;
+ case R.id.action_home:
+ mBus.post(new NavigationEvents.GoHome());
+ default:
+ break;
+ }
+ }
+
+ @Override
+ public boolean onLongClick(@NonNull View v) {
+ switch (v.getId()) {
+ case R.id.action_new_tab:
+ mBus.post(new TabEvents.NewTabLongPress());
+ break;
+ default:
+ break;
+ }
+ return true;
+ }
+
+ @Override
+ public void tabAdded() {
+ if (mTabsAdapter != null) {
+ mTabsAdapter.notifyItemInserted(mTabsManager.last());
+ mRecyclerView.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ mRecyclerView.smoothScrollToPosition(mTabsAdapter.getItemCount() - 1);
+ }
+ }, 500);
+ }
+ }
+
+ @Override
+ public void tabRemoved(int position) {
+ if (mTabsAdapter != null) {
+ mTabsAdapter.notifyItemRemoved(position);
+ }
+ }
+
+ @Override
+ public void tabChanged(int position) {
+ if (mTabsAdapter != null) {
+ mTabsAdapter.notifyItemChanged(position);
+ }
+ }
+
+ private class LightningViewAdapter extends RecyclerView.Adapter {
+
+ private final int mLayoutResourceId;
+ @Nullable private final Drawable mBackgroundTabDrawable;
+ @Nullable private final Drawable mForegroundTabDrawable;
+ @Nullable private final Bitmap mForegroundTabBitmap;
+ private ColorMatrix mColorMatrix;
+ private Paint mPaint;
+ private ColorFilter mFilter;
+ private static final float DESATURATED = 0.5f;
+
+ private final boolean mDrawerTabs;
+
+ public LightningViewAdapter(final boolean vertical) {
+ this.mLayoutResourceId = vertical ? R.layout.tab_list_item : R.layout.tab_list_item_horizontal;
+ this.mDrawerTabs = vertical;
+
+ if (vertical) {
+ mBackgroundTabDrawable = null;
+ mForegroundTabBitmap = null;
+ mForegroundTabDrawable = ThemeUtils.getSelectedBackground(getContext(), mDarkTheme);
+ } else {
+ int backgroundColor = Utils.mixTwoColors(ThemeUtils.getPrimaryColor(getContext()), Color.BLACK, 0.75f);
+ Bitmap backgroundTabBitmap = Bitmap.createBitmap(Utils.dpToPx(175), Utils.dpToPx(30), Bitmap.Config.ARGB_8888);
+ Utils.drawTrapezoid(new Canvas(backgroundTabBitmap), backgroundColor, true);
+ mBackgroundTabDrawable = new BitmapDrawable(getResources(), backgroundTabBitmap);
+
+ int foregroundColor = ThemeUtils.getPrimaryColor(getContext());
+ mForegroundTabBitmap = Bitmap.createBitmap(Utils.dpToPx(175), Utils.dpToPx(30), Bitmap.Config.ARGB_8888);
+ Utils.drawTrapezoid(new Canvas(mForegroundTabBitmap), foregroundColor, false);
+ mForegroundTabDrawable = null;
+ }
+ }
+
+ @NonNull
+ @Override
+ public LightningViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+ LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+ View view = inflater.inflate(mLayoutResourceId, viewGroup, false);
+ return new LightningViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull final LightningViewHolder holder, int position) {
+ holder.exitButton.setTag(position);
+
+ ViewCompat.jumpDrawablesToCurrentState(holder.exitButton);
+
+ LightningView web = mTabsManager.getTabAtPosition(position);
+ if (web == null) {
+ return;
+ }
+ holder.txtTitle.setText(web.getTitle());
+
+ final Bitmap favicon = web.getFavicon();
+ if (web.isForegroundTab()) {
+ TextViewCompat.setTextAppearance(holder.txtTitle, R.style.boldText);
+ Drawable foregroundDrawable;
+ if (!mDrawerTabs) {
+ foregroundDrawable = new BitmapDrawable(getResources(), mForegroundTabBitmap);
+ if (!mIsIncognito && mColorMode) {
+ foregroundDrawable.setColorFilter(mUiController.getUiColor(), PorterDuff.Mode.SRC_IN);
+ }
+ } else {
+ foregroundDrawable = mForegroundTabDrawable;
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ holder.layout.setBackground(foregroundDrawable);
+ } else {
+ holder.layout.setBackgroundDrawable(foregroundDrawable);
+ }
+ if (!mIsIncognito && mColorMode) {
+ mUiController.changeToolbarBackground(favicon, foregroundDrawable);
+ }
+ holder.favicon.setImageBitmap(favicon);
+ } else {
+ TextViewCompat.setTextAppearance(holder.txtTitle, R.style.normalText);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ holder.layout.setBackground(mBackgroundTabDrawable);
+ } else {
+ holder.layout.setBackgroundDrawable(mBackgroundTabDrawable);
+ }
+ holder.favicon.setImageBitmap(getDesaturatedBitmap(favicon));
+ }
+ }
+
+ @Override
+ public int getItemCount() {
+ return mTabsManager.size();
+ }
+
+ public Bitmap getDesaturatedBitmap(@NonNull Bitmap favicon) {
+ Bitmap grayscaleBitmap = Bitmap.createBitmap(favicon.getWidth(),
+ favicon.getHeight(), Bitmap.Config.ARGB_8888);
+
+ Canvas c = new Canvas(grayscaleBitmap);
+ if (mColorMatrix == null || mFilter == null || mPaint == null) {
+ mPaint = new Paint();
+ mColorMatrix = new ColorMatrix();
+ mColorMatrix.setSaturation(DESATURATED);
+ mFilter = new ColorMatrixColorFilter(mColorMatrix);
+ mPaint.setColorFilter(mFilter);
+ }
+
+ c.drawBitmap(favicon, 0, 0, mPaint);
+ return grayscaleBitmap;
+ }
+
+ public class LightningViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+
+ public LightningViewHolder(@NonNull View view) {
+ super(view);
+ txtTitle = (TextView) view.findViewById(R.id.textTab);
+ favicon = (ImageView) view.findViewById(R.id.faviconTab);
+ exit = (ImageView) view.findViewById(R.id.deleteButton);
+ layout = (LinearLayout) view.findViewById(R.id.tab_item_background);
+ exitButton = (FrameLayout) view.findViewById(R.id.deleteAction);
+ exit.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
+
+ exitButton.setOnClickListener(this);
+ layout.setOnClickListener(this);
+ layout.setOnLongClickListener(this);
+ }
+
+ @NonNull final TextView txtTitle;
+ @NonNull final ImageView favicon;
+ @NonNull final ImageView exit;
+ @NonNull final FrameLayout exitButton;
+ @NonNull final LinearLayout layout;
+
+ @Override
+ public void onClick(View v) {
+ if (v == exitButton) {
+ // Close tab
+ mBus.post(new TabEvents.CloseTab(getAdapterPosition()));
+ }
+ if (v == layout) {
+ mBus.post(new TabEvents.ShowTab(getAdapterPosition()));
+ }
+ }
+
+ @Override
+ public boolean onLongClick(View v) {
+ // Show close dialog
+ mBus.post(new TabEvents.ShowCloseDialog(getAdapterPosition()));
+ return true;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/fragment/anim/HorizontalItemAnimator.java b/app/src/main/java/acr/browser/lightning/fragment/anim/HorizontalItemAnimator.java
new file mode 100644
index 000000000..2015f3c8d
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/fragment/anim/HorizontalItemAnimator.java
@@ -0,0 +1,675 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package acr.browser.lightning.fragment.anim;
+
+import android.support.v4.animation.AnimatorCompatHelper;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPropertyAnimatorCompat;
+import android.support.v4.view.ViewPropertyAnimatorListener;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.SimpleItemAnimator;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This implementation of {@link RecyclerView.ItemAnimator} provides basic
+ * animations on remove, add, and move events that happen to the items in
+ * a RecyclerView. RecyclerView uses a HorizontalItemAnimator by default.
+ *
+ * @see RecyclerView#setItemAnimator(RecyclerView.ItemAnimator)
+ */
+public class HorizontalItemAnimator extends SimpleItemAnimator {
+ private static final boolean DEBUG = false;
+
+ private ArrayList mPendingRemovals = new ArrayList<>();
+ private ArrayList mPendingAdditions = new ArrayList<>();
+ private ArrayList mPendingMoves = new ArrayList<>();
+ private ArrayList mPendingChanges = new ArrayList<>();
+
+ private ArrayList> mAdditionsList = new ArrayList<>();
+ private ArrayList> mMovesList = new ArrayList<>();
+ private ArrayList> mChangesList = new ArrayList<>();
+
+ private ArrayList mAddAnimations = new ArrayList<>();
+ private ArrayList mMoveAnimations = new ArrayList<>();
+ private ArrayList mRemoveAnimations = new ArrayList<>();
+ private ArrayList mChangeAnimations = new ArrayList<>();
+
+ private static class MoveInfo {
+ public ViewHolder holder;
+ public int fromX, fromY, toX, toY;
+
+ private MoveInfo(ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+ this.holder = holder;
+ this.fromX = fromX;
+ this.fromY = fromY;
+ this.toX = toX;
+ this.toY = toY;
+ }
+ }
+
+ private static class ChangeInfo {
+ public ViewHolder oldHolder, newHolder;
+ public int fromX, fromY, toX, toY;
+
+ private ChangeInfo(ViewHolder oldHolder, ViewHolder newHolder) {
+ this.oldHolder = oldHolder;
+ this.newHolder = newHolder;
+ }
+
+ private ChangeInfo(ViewHolder oldHolder, ViewHolder newHolder,
+ int fromX, int fromY, int toX, int toY) {
+ this(oldHolder, newHolder);
+ this.fromX = fromX;
+ this.fromY = fromY;
+ this.toX = toX;
+ this.toY = toY;
+ }
+
+ @Override
+ public String toString() {
+ return "ChangeInfo{" +
+ "oldHolder=" + oldHolder +
+ ", newHolder=" + newHolder +
+ ", fromX=" + fromX +
+ ", fromY=" + fromY +
+ ", toX=" + toX +
+ ", toY=" + toY +
+ '}';
+ }
+ }
+
+ @Override
+ public void runPendingAnimations() {
+ boolean removalsPending = !mPendingRemovals.isEmpty();
+ boolean movesPending = !mPendingMoves.isEmpty();
+ boolean changesPending = !mPendingChanges.isEmpty();
+ boolean additionsPending = !mPendingAdditions.isEmpty();
+ if (!removalsPending && !movesPending && !additionsPending && !changesPending) {
+ // nothing to animate
+ return;
+ }
+ // First, remove stuff
+ for (ViewHolder holder : mPendingRemovals) {
+ animateRemoveImpl(holder);
+ }
+ mPendingRemovals.clear();
+ // Next, move stuff
+ if (movesPending) {
+ final ArrayList moves = new ArrayList<>();
+ moves.addAll(mPendingMoves);
+ mMovesList.add(moves);
+ mPendingMoves.clear();
+ Runnable mover = new Runnable() {
+ @Override
+ public void run() {
+ for (MoveInfo moveInfo : moves) {
+ animateMoveImpl(moveInfo.holder, moveInfo.fromX, moveInfo.fromY,
+ moveInfo.toX, moveInfo.toY);
+ }
+ moves.clear();
+ mMovesList.remove(moves);
+ }
+ };
+ if (removalsPending) {
+ View view = moves.get(0).holder.itemView;
+ ViewCompat.postOnAnimationDelayed(view, mover, getRemoveDuration());
+ } else {
+ mover.run();
+ }
+ }
+ // Next, change stuff, to run in parallel with move animations
+ if (changesPending) {
+ final ArrayList changes = new ArrayList<>();
+ changes.addAll(mPendingChanges);
+ mChangesList.add(changes);
+ mPendingChanges.clear();
+ Runnable changer = new Runnable() {
+ @Override
+ public void run() {
+ for (ChangeInfo change : changes) {
+ animateChangeImpl(change);
+ }
+ changes.clear();
+ mChangesList.remove(changes);
+ }
+ };
+ if (removalsPending) {
+ ViewHolder holder = changes.get(0).oldHolder;
+ ViewCompat.postOnAnimationDelayed(holder.itemView, changer, getRemoveDuration());
+ } else {
+ changer.run();
+ }
+ }
+ // Next, add stuff
+ if (additionsPending) {
+ final ArrayList additions = new ArrayList<>();
+ additions.addAll(mPendingAdditions);
+ mAdditionsList.add(additions);
+ mPendingAdditions.clear();
+ Runnable adder = new Runnable() {
+ public void run() {
+ for (ViewHolder holder : additions) {
+ animateAddImpl(holder);
+ }
+ additions.clear();
+ mAdditionsList.remove(additions);
+ }
+ };
+ if (removalsPending || movesPending || changesPending) {
+ long removeDuration = removalsPending ? getRemoveDuration() : 0;
+ long moveDuration = movesPending ? getMoveDuration() : 0;
+ long changeDuration = changesPending ? getChangeDuration() : 0;
+ long totalDelay = removeDuration + Math.max(moveDuration, changeDuration);
+ View view = additions.get(0).itemView;
+ ViewCompat.postOnAnimationDelayed(view, adder, totalDelay);
+ } else {
+ adder.run();
+ }
+ }
+ }
+
+ @Override
+ public boolean animateRemove(final ViewHolder holder) {
+ resetAnimation(holder);
+ mPendingRemovals.add(holder);
+ return true;
+ }
+
+ private void animateRemoveImpl(final ViewHolder holder) {
+ final View view = holder.itemView;
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mRemoveAnimations.add(holder);
+ animation.setDuration(getRemoveDuration())
+ .alpha(0).translationY(holder.itemView.getHeight())
+ .setInterpolator(new AccelerateInterpolator()).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchRemoveStarting(holder);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ ViewCompat.setAlpha(view, 1);
+ ViewCompat.setTranslationY(view, 0);
+ dispatchRemoveFinished(holder);
+ mRemoveAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateAdd(final ViewHolder holder) {
+ resetAnimation(holder);
+ ViewCompat.setAlpha(holder.itemView, 0);
+ ViewCompat.setTranslationY(holder.itemView, holder.itemView.getHeight());
+ mPendingAdditions.add(holder);
+ return true;
+ }
+
+ private void animateAddImpl(final ViewHolder holder) {
+ final View view = holder.itemView;
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mAddAnimations.add(holder);
+ animation.alpha(1).translationY(0)
+ .setInterpolator(new DecelerateInterpolator()).setDuration(getAddDuration())
+ .setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchAddStarting(holder);
+ }
+
+ @Override
+ public void onAnimationCancel(View view) {
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setAlpha(view, 1);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ dispatchAddFinished(holder);
+ mAddAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateMove(final ViewHolder holder, int fromX, int fromY,
+ int toX, int toY) {
+ final View view = holder.itemView;
+ fromX += ViewCompat.getTranslationX(holder.itemView);
+ fromY += ViewCompat.getTranslationY(holder.itemView);
+ int deltaX = toX - fromX;
+ int deltaY = toY - fromY;
+ if (deltaX == 0 && deltaY == 0) {
+ dispatchMoveFinished(holder);
+ return false;
+ }
+ resetAnimation(holder);
+ if (deltaX != 0) {
+ ViewCompat.setTranslationX(view, -deltaX);
+ }
+ if (deltaY != 0) {
+ ViewCompat.setTranslationY(view, -deltaY);
+ }
+ mPendingMoves.add(new MoveInfo(holder, fromX, fromY, toX, toY));
+ return true;
+ }
+
+ private void animateMoveImpl(final ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+ final View view = holder.itemView;
+ final int deltaX = toX - fromX;
+ final int deltaY = toY - fromY;
+ if (deltaX != 0) {
+ ViewCompat.animate(view).translationX(0);
+ }
+ if (deltaY != 0) {
+ ViewCompat.animate(view).translationY(0);
+ }
+ // TODO: make EndActions end listeners instead, since end actions aren't called when
+ // vpas are canceled (and can't end them. why?)
+ // need listener functionality in VPACompat for this. Ick.
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mMoveAnimations.add(holder);
+ animation.setDuration(getMoveDuration()).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchMoveStarting(holder);
+ }
+
+ @Override
+ public void onAnimationCancel(View view) {
+ if (deltaX != 0) {
+ ViewCompat.setTranslationX(view, 0);
+ }
+ if (deltaY != 0) {
+ ViewCompat.setTranslationY(view, 0);
+ }
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ dispatchMoveFinished(holder);
+ mMoveAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateChange(ViewHolder oldHolder, ViewHolder newHolder,
+ int fromX, int fromY, int toX, int toY) {
+// if (oldHolder != newHolder) {
+// if (oldHolder != null) {
+// dispatchChangeFinished(oldHolder, true);
+// }
+// if (newHolder != null) {
+// dispatchChangeFinished(newHolder, false);
+// }
+// } else if (oldHolder != null) {
+// dispatchChangeFinished(oldHolder, true);
+// }
+// return false;
+ if (oldHolder == newHolder) {
+ // Don't know how to run change animations when the same view holder is re-used.
+ // run a move animation to handle position changes.
+ if ((fromX - toX) == 0 && (fromY - toY) == 0) {
+ dispatchMoveFinished(oldHolder);
+ return false;
+ }
+ return animateMove(oldHolder, fromX, fromY, toX, toY);
+ }
+ final float prevTranslationX = ViewCompat.getTranslationX(oldHolder.itemView);
+ final float prevTranslationY = ViewCompat.getTranslationY(oldHolder.itemView);
+ final float prevAlpha = ViewCompat.getAlpha(oldHolder.itemView);
+ resetAnimation(oldHolder);
+ int deltaX = (int) (toX - fromX - prevTranslationX);
+ int deltaY = (int) (toY - fromY - prevTranslationY);
+ // recover prev translation state after ending animation
+ ViewCompat.setTranslationX(oldHolder.itemView, prevTranslationX);
+ ViewCompat.setTranslationY(oldHolder.itemView, prevTranslationY);
+ ViewCompat.setAlpha(oldHolder.itemView, prevAlpha);
+ if (newHolder != null) {
+ // carry over translation values
+ resetAnimation(newHolder);
+ ViewCompat.setTranslationX(newHolder.itemView, -deltaX);
+ ViewCompat.setTranslationY(newHolder.itemView, -deltaY);
+ ViewCompat.setAlpha(newHolder.itemView, 0);
+ }
+ mPendingChanges.add(new ChangeInfo(oldHolder, newHolder, fromX, fromY, toX, toY));
+ return true;
+ }
+
+ private void animateChangeImpl(final ChangeInfo changeInfo) {
+ final ViewHolder holder = changeInfo.oldHolder;
+ final View view = holder == null ? null : holder.itemView;
+ final ViewHolder newHolder = changeInfo.newHolder;
+ final View newView = newHolder != null ? newHolder.itemView : null;
+ if (view != null) {
+ final ViewPropertyAnimatorCompat oldViewAnim = ViewCompat.animate(view).setDuration(
+ getChangeDuration());
+ mChangeAnimations.add(changeInfo.oldHolder);
+ oldViewAnim.translationX(changeInfo.toX - changeInfo.fromX);
+ oldViewAnim.translationY(changeInfo.toY - changeInfo.fromY);
+ oldViewAnim.alpha(0).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchChangeStarting(changeInfo.oldHolder, true);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ oldViewAnim.setListener(null);
+ ViewCompat.setAlpha(view, 1);
+ ViewCompat.setTranslationX(view, 0);
+ ViewCompat.setTranslationY(view, 0);
+ dispatchChangeFinished(changeInfo.oldHolder, true);
+ mChangeAnimations.remove(changeInfo.oldHolder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+ if (newView != null) {
+ final ViewPropertyAnimatorCompat newViewAnimation = ViewCompat.animate(newView);
+ mChangeAnimations.add(changeInfo.newHolder);
+ newViewAnimation.translationX(0).translationY(0).setDuration(getChangeDuration()).
+ alpha(1).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchChangeStarting(changeInfo.newHolder, false);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ newViewAnimation.setListener(null);
+ ViewCompat.setAlpha(newView, 1);
+ ViewCompat.setTranslationX(newView, 0);
+ ViewCompat.setTranslationY(newView, 0);
+ dispatchChangeFinished(changeInfo.newHolder, false);
+ mChangeAnimations.remove(changeInfo.newHolder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+ }
+
+ private void endChangeAnimation(List infoList, ViewHolder item) {
+ for (int i = infoList.size() - 1; i >= 0; i--) {
+ ChangeInfo changeInfo = infoList.get(i);
+ if (endChangeAnimationIfNecessary(changeInfo, item)) {
+ if (changeInfo.oldHolder == null && changeInfo.newHolder == null) {
+ infoList.remove(changeInfo);
+ }
+ }
+ }
+ }
+
+ private void endChangeAnimationIfNecessary(ChangeInfo changeInfo) {
+ if (changeInfo.oldHolder != null) {
+ endChangeAnimationIfNecessary(changeInfo, changeInfo.oldHolder);
+ }
+ if (changeInfo.newHolder != null) {
+ endChangeAnimationIfNecessary(changeInfo, changeInfo.newHolder);
+ }
+ }
+
+ private boolean endChangeAnimationIfNecessary(ChangeInfo changeInfo, ViewHolder item) {
+ boolean oldItem = false;
+ if (changeInfo.newHolder == item) {
+ changeInfo.newHolder = null;
+ } else if (changeInfo.oldHolder == item) {
+ changeInfo.oldHolder = null;
+ oldItem = true;
+ } else {
+ return false;
+ }
+ ViewCompat.setAlpha(item.itemView, 1);
+ ViewCompat.setTranslationX(item.itemView, 0);
+ ViewCompat.setTranslationY(item.itemView, 0);
+ dispatchChangeFinished(item, oldItem);
+ return true;
+ }
+
+ @Override
+ public void endAnimation(ViewHolder item) {
+ final View view = item.itemView;
+ // this will trigger end callback which should set properties to their target values.
+ ViewCompat.animate(view).cancel();
+ // TODO if some other animations are chained to end, how do we cancel them as well?
+ for (int i = mPendingMoves.size() - 1; i >= 0; i--) {
+ MoveInfo moveInfo = mPendingMoves.get(i);
+ if (moveInfo.holder == item) {
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item);
+ mPendingMoves.remove(i);
+ }
+ }
+ endChangeAnimation(mPendingChanges, item);
+ if (mPendingRemovals.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchRemoveFinished(item);
+ }
+ if (mPendingAdditions.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ }
+
+ for (int i = mChangesList.size() - 1; i >= 0; i--) {
+ ArrayList changes = mChangesList.get(i);
+ endChangeAnimation(changes, item);
+ if (changes.isEmpty()) {
+ mChangesList.remove(i);
+ }
+ }
+ for (int i = mMovesList.size() - 1; i >= 0; i--) {
+ ArrayList moves = mMovesList.get(i);
+ for (int j = moves.size() - 1; j >= 0; j--) {
+ MoveInfo moveInfo = moves.get(j);
+ if (moveInfo.holder == item) {
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item);
+ moves.remove(j);
+ if (moves.isEmpty()) {
+ mMovesList.remove(i);
+ }
+ break;
+ }
+ }
+ }
+ for (int i = mAdditionsList.size() - 1; i >= 0; i--) {
+ ArrayList additions = mAdditionsList.get(i);
+ if (additions.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ if (additions.isEmpty()) {
+ mAdditionsList.remove(i);
+ }
+ }
+ }
+
+ // animations should be ended by the cancel above.
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mRemoveAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mRemoveAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mAddAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mAddAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mChangeAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mChangeAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mMoveAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mMoveAnimations list");
+ }
+ dispatchFinishedWhenDone();
+ }
+
+ private void resetAnimation(ViewHolder holder) {
+ AnimatorCompatHelper.clearInterpolator(holder.itemView);
+ endAnimation(holder);
+ }
+
+ @Override
+ public boolean isRunning() {
+ return (!mPendingAdditions.isEmpty() ||
+ !mPendingChanges.isEmpty() ||
+ !mPendingMoves.isEmpty() ||
+ !mPendingRemovals.isEmpty() ||
+ !mMoveAnimations.isEmpty() ||
+ !mRemoveAnimations.isEmpty() ||
+ !mAddAnimations.isEmpty() ||
+ !mChangeAnimations.isEmpty() ||
+ !mMovesList.isEmpty() ||
+ !mAdditionsList.isEmpty() ||
+ !mChangesList.isEmpty());
+ }
+
+ /**
+ * Check the state of currently pending and running animations. If there are none
+ * pending/running, call {@link #dispatchAnimationsFinished()} to notify any
+ * listeners.
+ */
+ private void dispatchFinishedWhenDone() {
+ if (!isRunning()) {
+ dispatchAnimationsFinished();
+ }
+ }
+
+ @Override
+ public void endAnimations() {
+ int count = mPendingMoves.size();
+ for (int i = count - 1; i >= 0; i--) {
+ MoveInfo item = mPendingMoves.get(i);
+ View view = item.holder.itemView;
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item.holder);
+ mPendingMoves.remove(i);
+ }
+ count = mPendingRemovals.size();
+ for (int i = count - 1; i >= 0; i--) {
+ ViewHolder item = mPendingRemovals.get(i);
+ dispatchRemoveFinished(item);
+ mPendingRemovals.remove(i);
+ }
+ count = mPendingAdditions.size();
+ for (int i = count - 1; i >= 0; i--) {
+ ViewHolder item = mPendingAdditions.get(i);
+ View view = item.itemView;
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ mPendingAdditions.remove(i);
+ }
+ count = mPendingChanges.size();
+ for (int i = count - 1; i >= 0; i--) {
+ endChangeAnimationIfNecessary(mPendingChanges.get(i));
+ }
+ mPendingChanges.clear();
+ if (!isRunning()) {
+ return;
+ }
+
+ int listCount = mMovesList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList moves = mMovesList.get(i);
+ count = moves.size();
+ for (int j = count - 1; j >= 0; j--) {
+ MoveInfo moveInfo = moves.get(j);
+ ViewHolder item = moveInfo.holder;
+ View view = item.itemView;
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(moveInfo.holder);
+ moves.remove(j);
+ if (moves.isEmpty()) {
+ mMovesList.remove(moves);
+ }
+ }
+ }
+ listCount = mAdditionsList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList additions = mAdditionsList.get(i);
+ count = additions.size();
+ for (int j = count - 1; j >= 0; j--) {
+ ViewHolder item = additions.get(j);
+ View view = item.itemView;
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ additions.remove(j);
+ if (additions.isEmpty()) {
+ mAdditionsList.remove(additions);
+ }
+ }
+ }
+ listCount = mChangesList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList changes = mChangesList.get(i);
+ count = changes.size();
+ for (int j = count - 1; j >= 0; j--) {
+ endChangeAnimationIfNecessary(changes.get(j));
+ if (changes.isEmpty()) {
+ mChangesList.remove(changes);
+ }
+ }
+ }
+
+ cancelAll(mRemoveAnimations);
+ cancelAll(mMoveAnimations);
+ cancelAll(mAddAnimations);
+ cancelAll(mChangeAnimations);
+
+ dispatchAnimationsFinished();
+ }
+
+ static void cancelAll(List viewHolders) {
+ for (int i = viewHolders.size() - 1; i >= 0; i--) {
+ ViewCompat.animate(viewHolders.get(i).itemView).cancel();
+ }
+ }
+
+ private static class VpaListenerAdapter implements ViewPropertyAnimatorListener {
+ @Override
+ public void onAnimationStart(View view) {}
+
+ @Override
+ public void onAnimationEnd(View view) {}
+
+ @Override
+ public void onAnimationCancel(View view) {}
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/fragment/anim/VerticalItemAnimator.java b/app/src/main/java/acr/browser/lightning/fragment/anim/VerticalItemAnimator.java
new file mode 100644
index 000000000..3db62e913
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/fragment/anim/VerticalItemAnimator.java
@@ -0,0 +1,674 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package acr.browser.lightning.fragment.anim;
+
+import android.support.v4.animation.AnimatorCompatHelper;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPropertyAnimatorCompat;
+import android.support.v4.view.ViewPropertyAnimatorListener;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.SimpleItemAnimator;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This implementation of {@link RecyclerView.ItemAnimator} provides basic
+ * animations on remove, add, and move events that happen to the items in
+ * a RecyclerView. RecyclerView uses a VerticalItemAnimator by default.
+ *
+ * @see RecyclerView#setItemAnimator(RecyclerView.ItemAnimator)
+ */
+public class VerticalItemAnimator extends SimpleItemAnimator {
+ private static final boolean DEBUG = false;
+
+ private ArrayList mPendingRemovals = new ArrayList<>();
+ private ArrayList mPendingAdditions = new ArrayList<>();
+ private ArrayList mPendingMoves = new ArrayList<>();
+ private ArrayList mPendingChanges = new ArrayList<>();
+
+ private ArrayList> mAdditionsList = new ArrayList<>();
+ private ArrayList> mMovesList = new ArrayList<>();
+ private ArrayList> mChangesList = new ArrayList<>();
+
+ private ArrayList mAddAnimations = new ArrayList<>();
+ private ArrayList mMoveAnimations = new ArrayList<>();
+ private ArrayList mRemoveAnimations = new ArrayList<>();
+ private ArrayList mChangeAnimations = new ArrayList<>();
+
+ private static class MoveInfo {
+ public ViewHolder holder;
+ public int fromX, fromY, toX, toY;
+
+ private MoveInfo(ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+ this.holder = holder;
+ this.fromX = fromX;
+ this.fromY = fromY;
+ this.toX = toX;
+ this.toY = toY;
+ }
+ }
+
+ private static class ChangeInfo {
+ public ViewHolder oldHolder, newHolder;
+ public int fromX, fromY, toX, toY;
+
+ private ChangeInfo(ViewHolder oldHolder, ViewHolder newHolder) {
+ this.oldHolder = oldHolder;
+ this.newHolder = newHolder;
+ }
+
+ private ChangeInfo(ViewHolder oldHolder, ViewHolder newHolder,
+ int fromX, int fromY, int toX, int toY) {
+ this(oldHolder, newHolder);
+ this.fromX = fromX;
+ this.fromY = fromY;
+ this.toX = toX;
+ this.toY = toY;
+ }
+
+ @Override
+ public String toString() {
+ return "ChangeInfo{" +
+ "oldHolder=" + oldHolder +
+ ", newHolder=" + newHolder +
+ ", fromX=" + fromX +
+ ", fromY=" + fromY +
+ ", toX=" + toX +
+ ", toY=" + toY +
+ '}';
+ }
+ }
+
+ @Override
+ public void runPendingAnimations() {
+ boolean removalsPending = !mPendingRemovals.isEmpty();
+ boolean movesPending = !mPendingMoves.isEmpty();
+ boolean changesPending = !mPendingChanges.isEmpty();
+ boolean additionsPending = !mPendingAdditions.isEmpty();
+ if (!removalsPending && !movesPending && !additionsPending && !changesPending) {
+ // nothing to animate
+ return;
+ }
+ // First, remove stuff
+ for (ViewHolder holder : mPendingRemovals) {
+ animateRemoveImpl(holder);
+ }
+ mPendingRemovals.clear();
+ // Next, move stuff
+ if (movesPending) {
+ final ArrayList moves = new ArrayList<>();
+ moves.addAll(mPendingMoves);
+ mMovesList.add(moves);
+ mPendingMoves.clear();
+ Runnable mover = new Runnable() {
+ @Override
+ public void run() {
+ for (MoveInfo moveInfo : moves) {
+ animateMoveImpl(moveInfo.holder, moveInfo.fromX, moveInfo.fromY,
+ moveInfo.toX, moveInfo.toY);
+ }
+ moves.clear();
+ mMovesList.remove(moves);
+ }
+ };
+ if (removalsPending) {
+ View view = moves.get(0).holder.itemView;
+ ViewCompat.postOnAnimationDelayed(view, mover, getRemoveDuration());
+ } else {
+ mover.run();
+ }
+ }
+ // Next, change stuff, to run in parallel with move animations
+ if (changesPending) {
+ final ArrayList changes = new ArrayList<>();
+ changes.addAll(mPendingChanges);
+ mChangesList.add(changes);
+ mPendingChanges.clear();
+ Runnable changer = new Runnable() {
+ @Override
+ public void run() {
+ for (ChangeInfo change : changes) {
+ animateChangeImpl(change);
+ }
+ changes.clear();
+ mChangesList.remove(changes);
+ }
+ };
+ if (removalsPending) {
+ ViewHolder holder = changes.get(0).oldHolder;
+ ViewCompat.postOnAnimationDelayed(holder.itemView, changer, getRemoveDuration());
+ } else {
+ changer.run();
+ }
+ }
+ // Next, add stuff
+ if (additionsPending) {
+ final ArrayList additions = new ArrayList<>();
+ additions.addAll(mPendingAdditions);
+ mAdditionsList.add(additions);
+ mPendingAdditions.clear();
+ Runnable adder = new Runnable() {
+ public void run() {
+ for (ViewHolder holder : additions) {
+ animateAddImpl(holder);
+ }
+ additions.clear();
+ mAdditionsList.remove(additions);
+ }
+ };
+ if (removalsPending || movesPending || changesPending) {
+ long removeDuration = removalsPending ? getRemoveDuration() : 0;
+ long moveDuration = movesPending ? getMoveDuration() : 0;
+ long changeDuration = changesPending ? getChangeDuration() : 0;
+ long totalDelay = removeDuration + Math.max(moveDuration, changeDuration);
+ View view = additions.get(0).itemView;
+ ViewCompat.postOnAnimationDelayed(view, adder, totalDelay);
+ } else {
+ adder.run();
+ }
+ }
+ }
+
+ @Override
+ public boolean animateRemove(final ViewHolder holder) {
+ resetAnimation(holder);
+ mPendingRemovals.add(holder);
+ return true;
+ }
+
+ private void animateRemoveImpl(final ViewHolder holder) {
+ final View view = holder.itemView;
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mRemoveAnimations.add(holder);
+ animation.setDuration(getRemoveDuration())
+ .alpha(0).translationX(-holder.itemView.getWidth() / 2)
+ .setInterpolator(new AccelerateInterpolator()).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchRemoveStarting(holder);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ ViewCompat.setAlpha(view, 1);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchRemoveFinished(holder);
+ mRemoveAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateAdd(final ViewHolder holder) {
+ resetAnimation(holder);
+ ViewCompat.setAlpha(holder.itemView, 0);
+ ViewCompat.setTranslationX(holder.itemView, -holder.itemView.getWidth() / 2);
+ mPendingAdditions.add(holder);
+ return true;
+ }
+
+ private void animateAddImpl(final ViewHolder holder) {
+ final View view = holder.itemView;
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mAddAnimations.add(holder);
+ animation.alpha(1).translationX(0).setDuration(getAddDuration())
+ .setInterpolator(new DecelerateInterpolator()).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchAddStarting(holder);
+ }
+
+ @Override
+ public void onAnimationCancel(View view) {
+ ViewCompat.setAlpha(view, 1);
+ ViewCompat.setTranslationX(view, 0);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ dispatchAddFinished(holder);
+ mAddAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateMove(final ViewHolder holder, int fromX, int fromY,
+ int toX, int toY) {
+ final View view = holder.itemView;
+ fromX += ViewCompat.getTranslationX(holder.itemView);
+ fromY += ViewCompat.getTranslationY(holder.itemView);
+ int deltaX = toX - fromX;
+ int deltaY = toY - fromY;
+ if (deltaX == 0 && deltaY == 0) {
+ dispatchMoveFinished(holder);
+ return false;
+ }
+ resetAnimation(holder);
+ if (deltaX != 0) {
+ ViewCompat.setTranslationX(view, -deltaX);
+ }
+ if (deltaY != 0) {
+ ViewCompat.setTranslationY(view, -deltaY);
+ }
+ mPendingMoves.add(new MoveInfo(holder, fromX, fromY, toX, toY));
+ return true;
+ }
+
+ private void animateMoveImpl(final ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+ final View view = holder.itemView;
+ final int deltaX = toX - fromX;
+ final int deltaY = toY - fromY;
+ if (deltaX != 0) {
+ ViewCompat.animate(view).translationX(0);
+ }
+ if (deltaY != 0) {
+ ViewCompat.animate(view).translationY(0);
+ }
+ // TODO: make EndActions end listeners instead, since end actions aren't called when
+ // vpas are canceled (and can't end them. why?)
+ // need listener functionality in VPACompat for this. Ick.
+ final ViewPropertyAnimatorCompat animation = ViewCompat.animate(view);
+ mMoveAnimations.add(holder);
+ animation.setDuration(getMoveDuration()).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchMoveStarting(holder);
+ }
+
+ @Override
+ public void onAnimationCancel(View view) {
+ if (deltaX != 0) {
+ ViewCompat.setTranslationX(view, 0);
+ }
+ if (deltaY != 0) {
+ ViewCompat.setTranslationY(view, 0);
+ }
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ animation.setListener(null);
+ dispatchMoveFinished(holder);
+ mMoveAnimations.remove(holder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+
+ @Override
+ public boolean animateChange(ViewHolder oldHolder, ViewHolder newHolder,
+ int fromX, int fromY, int toX, int toY) {
+// if (oldHolder != newHolder) {
+// if (oldHolder != null) {
+// dispatchChangeFinished(oldHolder, true);
+// }
+// if (newHolder != null) {
+// dispatchChangeFinished(newHolder, false);
+// }
+// } else if (oldHolder != null) {
+// dispatchChangeFinished(oldHolder, true);
+// }
+// return false;
+ if (oldHolder == newHolder) {
+ // Don't know how to run change animations when the same view holder is re-used.
+ // run a move animation to handle position changes.
+ if ((fromX - toX) == 0 && (fromY - toY) == 0) {
+ dispatchMoveFinished(oldHolder);
+ return false;
+ }
+ return animateMove(oldHolder, fromX, fromY, toX, toY);
+ }
+ final float prevTranslationX = ViewCompat.getTranslationX(oldHolder.itemView);
+ final float prevTranslationY = ViewCompat.getTranslationY(oldHolder.itemView);
+ final float prevAlpha = ViewCompat.getAlpha(oldHolder.itemView);
+ resetAnimation(oldHolder);
+ int deltaX = (int) (toX - fromX - prevTranslationX);
+ int deltaY = (int) (toY - fromY - prevTranslationY);
+ // recover prev translation state after ending animation
+ ViewCompat.setTranslationX(oldHolder.itemView, prevTranslationX);
+ ViewCompat.setTranslationY(oldHolder.itemView, prevTranslationY);
+ ViewCompat.setAlpha(oldHolder.itemView, prevAlpha);
+ if (newHolder != null) {
+ // carry over translation values
+ resetAnimation(newHolder);
+ ViewCompat.setTranslationX(newHolder.itemView, -deltaX);
+ ViewCompat.setTranslationY(newHolder.itemView, -deltaY);
+ ViewCompat.setAlpha(newHolder.itemView, 0);
+ }
+ mPendingChanges.add(new ChangeInfo(oldHolder, newHolder, fromX, fromY, toX, toY));
+ return true;
+ }
+
+ private void animateChangeImpl(final ChangeInfo changeInfo) {
+ final ViewHolder holder = changeInfo.oldHolder;
+ final View view = holder == null ? null : holder.itemView;
+ final ViewHolder newHolder = changeInfo.newHolder;
+ final View newView = newHolder != null ? newHolder.itemView : null;
+ if (view != null) {
+ final ViewPropertyAnimatorCompat oldViewAnim = ViewCompat.animate(view).setDuration(
+ getChangeDuration());
+ mChangeAnimations.add(changeInfo.oldHolder);
+ oldViewAnim.translationX(changeInfo.toX - changeInfo.fromX);
+ oldViewAnim.translationY(changeInfo.toY - changeInfo.fromY);
+ oldViewAnim.alpha(0).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchChangeStarting(changeInfo.oldHolder, true);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ oldViewAnim.setListener(null);
+ ViewCompat.setAlpha(view, 1);
+ ViewCompat.setTranslationX(view, 0);
+ ViewCompat.setTranslationY(view, 0);
+ dispatchChangeFinished(changeInfo.oldHolder, true);
+ mChangeAnimations.remove(changeInfo.oldHolder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+ if (newView != null) {
+ final ViewPropertyAnimatorCompat newViewAnimation = ViewCompat.animate(newView);
+ mChangeAnimations.add(changeInfo.newHolder);
+ newViewAnimation.translationX(0).translationY(0).setDuration(getChangeDuration()).
+ alpha(1).setListener(new VpaListenerAdapter() {
+ @Override
+ public void onAnimationStart(View view) {
+ dispatchChangeStarting(changeInfo.newHolder, false);
+ }
+
+ @Override
+ public void onAnimationEnd(View view) {
+ newViewAnimation.setListener(null);
+ ViewCompat.setAlpha(newView, 1);
+ ViewCompat.setTranslationX(newView, 0);
+ ViewCompat.setTranslationY(newView, 0);
+ dispatchChangeFinished(changeInfo.newHolder, false);
+ mChangeAnimations.remove(changeInfo.newHolder);
+ dispatchFinishedWhenDone();
+ }
+ }).start();
+ }
+ }
+
+ private void endChangeAnimation(List infoList, ViewHolder item) {
+ for (int i = infoList.size() - 1; i >= 0; i--) {
+ ChangeInfo changeInfo = infoList.get(i);
+ if (endChangeAnimationIfNecessary(changeInfo, item)) {
+ if (changeInfo.oldHolder == null && changeInfo.newHolder == null) {
+ infoList.remove(changeInfo);
+ }
+ }
+ }
+ }
+
+ private void endChangeAnimationIfNecessary(ChangeInfo changeInfo) {
+ if (changeInfo.oldHolder != null) {
+ endChangeAnimationIfNecessary(changeInfo, changeInfo.oldHolder);
+ }
+ if (changeInfo.newHolder != null) {
+ endChangeAnimationIfNecessary(changeInfo, changeInfo.newHolder);
+ }
+ }
+
+ private boolean endChangeAnimationIfNecessary(ChangeInfo changeInfo, ViewHolder item) {
+ boolean oldItem = false;
+ if (changeInfo.newHolder == item) {
+ changeInfo.newHolder = null;
+ } else if (changeInfo.oldHolder == item) {
+ changeInfo.oldHolder = null;
+ oldItem = true;
+ } else {
+ return false;
+ }
+ ViewCompat.setAlpha(item.itemView, 1);
+ ViewCompat.setTranslationX(item.itemView, 0);
+ ViewCompat.setTranslationY(item.itemView, 0);
+ dispatchChangeFinished(item, oldItem);
+ return true;
+ }
+
+ @Override
+ public void endAnimation(ViewHolder item) {
+ final View view = item.itemView;
+ // this will trigger end callback which should set properties to their target values.
+ ViewCompat.animate(view).cancel();
+ // TODO if some other animations are chained to end, how do we cancel them as well?
+ for (int i = mPendingMoves.size() - 1; i >= 0; i--) {
+ MoveInfo moveInfo = mPendingMoves.get(i);
+ if (moveInfo.holder == item) {
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item);
+ mPendingMoves.remove(i);
+ }
+ }
+ endChangeAnimation(mPendingChanges, item);
+ if (mPendingRemovals.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchRemoveFinished(item);
+ }
+ if (mPendingAdditions.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ }
+
+ for (int i = mChangesList.size() - 1; i >= 0; i--) {
+ ArrayList changes = mChangesList.get(i);
+ endChangeAnimation(changes, item);
+ if (changes.isEmpty()) {
+ mChangesList.remove(i);
+ }
+ }
+ for (int i = mMovesList.size() - 1; i >= 0; i--) {
+ ArrayList moves = mMovesList.get(i);
+ for (int j = moves.size() - 1; j >= 0; j--) {
+ MoveInfo moveInfo = moves.get(j);
+ if (moveInfo.holder == item) {
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item);
+ moves.remove(j);
+ if (moves.isEmpty()) {
+ mMovesList.remove(i);
+ }
+ break;
+ }
+ }
+ }
+ for (int i = mAdditionsList.size() - 1; i >= 0; i--) {
+ ArrayList additions = mAdditionsList.get(i);
+ if (additions.remove(item)) {
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ if (additions.isEmpty()) {
+ mAdditionsList.remove(i);
+ }
+ }
+ }
+
+ // animations should be ended by the cancel above.
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mRemoveAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mRemoveAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mAddAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mAddAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mChangeAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mChangeAnimations list");
+ }
+
+ //noinspection PointlessBooleanExpression,ConstantConditions
+ if (mMoveAnimations.remove(item) && DEBUG) {
+ throw new IllegalStateException("after animation is cancelled, item should not be in "
+ + "mMoveAnimations list");
+ }
+ dispatchFinishedWhenDone();
+ }
+
+ private void resetAnimation(ViewHolder holder) {
+ AnimatorCompatHelper.clearInterpolator(holder.itemView);
+ endAnimation(holder);
+ }
+
+ @Override
+ public boolean isRunning() {
+ return (!mPendingAdditions.isEmpty() ||
+ !mPendingChanges.isEmpty() ||
+ !mPendingMoves.isEmpty() ||
+ !mPendingRemovals.isEmpty() ||
+ !mMoveAnimations.isEmpty() ||
+ !mRemoveAnimations.isEmpty() ||
+ !mAddAnimations.isEmpty() ||
+ !mChangeAnimations.isEmpty() ||
+ !mMovesList.isEmpty() ||
+ !mAdditionsList.isEmpty() ||
+ !mChangesList.isEmpty());
+ }
+
+ /**
+ * Check the state of currently pending and running animations. If there are none
+ * pending/running, call {@link #dispatchAnimationsFinished()} to notify any
+ * listeners.
+ */
+ private void dispatchFinishedWhenDone() {
+ if (!isRunning()) {
+ dispatchAnimationsFinished();
+ }
+ }
+
+ @Override
+ public void endAnimations() {
+ int count = mPendingMoves.size();
+ for (int i = count - 1; i >= 0; i--) {
+ MoveInfo item = mPendingMoves.get(i);
+ View view = item.holder.itemView;
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(item.holder);
+ mPendingMoves.remove(i);
+ }
+ count = mPendingRemovals.size();
+ for (int i = count - 1; i >= 0; i--) {
+ ViewHolder item = mPendingRemovals.get(i);
+ dispatchRemoveFinished(item);
+ mPendingRemovals.remove(i);
+ }
+ count = mPendingAdditions.size();
+ for (int i = count - 1; i >= 0; i--) {
+ ViewHolder item = mPendingAdditions.get(i);
+ View view = item.itemView;
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ mPendingAdditions.remove(i);
+ }
+ count = mPendingChanges.size();
+ for (int i = count - 1; i >= 0; i--) {
+ endChangeAnimationIfNecessary(mPendingChanges.get(i));
+ }
+ mPendingChanges.clear();
+ if (!isRunning()) {
+ return;
+ }
+
+ int listCount = mMovesList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList moves = mMovesList.get(i);
+ count = moves.size();
+ for (int j = count - 1; j >= 0; j--) {
+ MoveInfo moveInfo = moves.get(j);
+ ViewHolder item = moveInfo.holder;
+ View view = item.itemView;
+ ViewCompat.setTranslationY(view, 0);
+ ViewCompat.setTranslationX(view, 0);
+ dispatchMoveFinished(moveInfo.holder);
+ moves.remove(j);
+ if (moves.isEmpty()) {
+ mMovesList.remove(moves);
+ }
+ }
+ }
+ listCount = mAdditionsList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList additions = mAdditionsList.get(i);
+ count = additions.size();
+ for (int j = count - 1; j >= 0; j--) {
+ ViewHolder item = additions.get(j);
+ View view = item.itemView;
+ ViewCompat.setAlpha(view, 1);
+ dispatchAddFinished(item);
+ additions.remove(j);
+ if (additions.isEmpty()) {
+ mAdditionsList.remove(additions);
+ }
+ }
+ }
+ listCount = mChangesList.size();
+ for (int i = listCount - 1; i >= 0; i--) {
+ ArrayList changes = mChangesList.get(i);
+ count = changes.size();
+ for (int j = count - 1; j >= 0; j--) {
+ endChangeAnimationIfNecessary(changes.get(j));
+ if (changes.isEmpty()) {
+ mChangesList.remove(changes);
+ }
+ }
+ }
+
+ cancelAll(mRemoveAnimations);
+ cancelAll(mMoveAnimations);
+ cancelAll(mAddAnimations);
+ cancelAll(mChangeAnimations);
+
+ dispatchAnimationsFinished();
+ }
+
+ static void cancelAll(List viewHolders) {
+ for (int i = viewHolders.size() - 1; i >= 0; i--) {
+ ViewCompat.animate(viewHolders.get(i).itemView).cancel();
+ }
+ }
+
+ private static class VpaListenerAdapter implements ViewPropertyAnimatorListener {
+ @Override
+ public void onAnimationStart(View view) {}
+
+ @Override
+ public void onAnimationEnd(View view) {}
+
+ @Override
+ public void onAnimationCancel(View view) {}
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/object/ClickHandler.java b/app/src/main/java/acr/browser/lightning/object/ClickHandler.java
deleted file mode 100644
index 841c03f28..000000000
--- a/app/src/main/java/acr/browser/lightning/object/ClickHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2014 A.C.R. Development
- */
-package acr.browser.lightning.object;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-
-import acr.browser.lightning.controller.BrowserController;
-
-public class ClickHandler extends Handler {
-
- private BrowserController mBrowserController;
-
- public ClickHandler(Context context) {
- try {
- mBrowserController = (BrowserController) context;
- } catch (ClassCastException e) {
- throw new ClassCastException(context + " must implement BrowserController");
- }
- }
-
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- String url = msg.getData().getString("url");
- mBrowserController.longClickPage(url);
- }
-}
diff --git a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
index 0fda30e4f..b0e9af0b2 100644
--- a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
+++ b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
@@ -1,11 +1,17 @@
package acr.browser.lightning.preference;
+import android.content.Context;
import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
-import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.download.DownloadHandler;
+@Singleton
public class PreferenceManager {
private static class Name {
@@ -29,7 +35,6 @@ private static class Name {
public static final String SEARCH_URL = "searchurl";
public static final String TEXT_REFLOW = "textreflow";
public static final String TEXT_SIZE = "textsize";
- public static final String URL_MEMORY = "memory";
public static final String USE_WIDE_VIEWPORT = "wideviewport";
public static final String USER_AGENT = "agentchoose";
public static final String USER_AGENT_STRING = "userAgentString";
@@ -47,6 +52,8 @@ private static class Name {
public static final String TEXT_ENCODING = "textEncoding";
public static final String CLEAR_WEBSTORAGE_EXIT = "clearWebStorageExit";
public static final String SHOW_TABS_IN_DRAWER = "showTabsInDrawer";
+ public static final String DO_NOT_TRACK = "doNotTrack";
+ public static final String IDENTIFYING_HEADERS = "removeIdentifyingHeaders";
public static final String USE_PROXY = "useProxy";
public static final String PROXY_CHOICE = "proxyChoice";
@@ -56,20 +63,13 @@ private static class Name {
public static final String INITIAL_CHECK_FOR_I2P = "checkForI2P";
}
- private static PreferenceManager mInstance;
- private final SharedPreferences mPrefs;
+ @NonNull private final SharedPreferences mPrefs;
private static final String PREFERENCES = "settings";
- public static PreferenceManager getInstance() {
- if (mInstance == null) {
- mInstance = new PreferenceManager();
- }
- return mInstance;
- }
-
- private PreferenceManager() {
- mPrefs = BrowserApp.getAppContext().getSharedPreferences(PREFERENCES, 0);
+ @Inject
+ PreferenceManager(@NonNull final Context context) {
+ mPrefs = context.getSharedPreferences(PREFERENCES, 0);
}
public boolean getAdBlockEnabled() {
@@ -109,13 +109,14 @@ public boolean getClearHistoryExitEnabled() {
}
public boolean getColorModeEnabled() {
- return mPrefs.getBoolean(Name.ENABLE_COLOR_MODE, false);
+ return mPrefs.getBoolean(Name.ENABLE_COLOR_MODE, true);
}
public boolean getCookiesEnabled() {
return mPrefs.getBoolean(Name.COOKIES, true);
}
+ @NonNull
public String getDownloadDirectory() {
return mPrefs.getString(Name.DOWNLOAD_DIRECTORY, DownloadHandler.DEFAULT_DOWNLOAD_PATH);
}
@@ -136,6 +137,7 @@ public boolean getHideStatusBarEnabled() {
return mPrefs.getBoolean(Name.HIDE_STATUS_BAR, false);
}
+ @NonNull
public String getHomepage() {
return mPrefs.getString(Name.HOMEPAGE, Constants.HOMEPAGE);
}
@@ -156,10 +158,6 @@ public boolean getLocationEnabled() {
return mPrefs.getBoolean(Name.LOCATION, false);
}
- public String getMemoryUrl() {
- return mPrefs.getString(Name.URL_MEMORY, "");
- }
-
public boolean getOverviewModeEnabled() {
return mPrefs.getBoolean(Name.OVERVIEW_MODE, true);
}
@@ -168,6 +166,7 @@ public boolean getPopupsEnabled() {
return mPrefs.getBoolean(Name.POPUPS, true);
}
+ @NonNull
public String getProxyHost() {
return mPrefs.getString(Name.USE_PROXY_HOST, "localhost");
}
@@ -188,6 +187,7 @@ public boolean getRestoreLostTabsEnabled() {
return mPrefs.getBoolean(Name.RESTORE_LOST_TABS, true);
}
+ @Nullable
public String getSavedUrl() {
return mPrefs.getString(Name.SAVE_URL, null);
}
@@ -200,6 +200,7 @@ public int getSearchChoice() {
return mPrefs.getInt(Name.SEARCH, 1);
}
+ @NonNull
public String getSearchUrl() {
return mPrefs.getString(Name.SEARCH_URL, Constants.GOOGLE_SEARCH);
}
@@ -232,7 +233,8 @@ public int getUserAgentChoice() {
return mPrefs.getInt(Name.USER_AGENT, 1);
}
- public String getUserAgentString(String def) {
+ @Nullable
+ public String getUserAgentString(@Nullable String def) {
return mPrefs.getString(Name.USER_AGENT_STRING, def);
}
@@ -240,6 +242,7 @@ public boolean getUseWideViewportEnabled() {
return mPrefs.getBoolean(Name.USE_WIDE_VIEWPORT, true);
}
+ @NonNull
public String getTextEncoding() {
return mPrefs.getString(Name.TEXT_ENCODING, Constants.DEFAULT_ENCODING);
}
@@ -248,23 +251,39 @@ public boolean getShowTabsInDrawer(boolean defaultValue) {
return mPrefs.getBoolean(Name.SHOW_TABS_IN_DRAWER, defaultValue);
}
- private void putBoolean(String name, boolean value) {
+ public boolean getDoNotTrackEnabled() {
+ return mPrefs.getBoolean(Name.DO_NOT_TRACK, false);
+ }
+
+ public boolean getRemoveIdentifyingHeadersEnabled() {
+ return mPrefs.getBoolean(Name.IDENTIFYING_HEADERS, false);
+ }
+
+ private void putBoolean(@NonNull String name, boolean value) {
mPrefs.edit().putBoolean(name, value).apply();
}
- private void putInt(String name, int value) {
+ private void putInt(@NonNull String name, int value) {
mPrefs.edit().putInt(name, value).apply();
}
- private void putString(String name, String value) {
+ private void putString(@NonNull String name, @Nullable String value) {
mPrefs.edit().putString(name, value).apply();
}
+ public void setRemoveIdentifyingHeadersEnabled(boolean enabled) {
+ putBoolean(Name.IDENTIFYING_HEADERS, enabled);
+ }
+
+ public void setDoNotTrackEnabled(boolean doNotTrack) {
+ putBoolean(Name.DO_NOT_TRACK, doNotTrack);
+ }
+
public void setShowTabsInDrawer(boolean show) {
putBoolean(Name.SHOW_TABS_IN_DRAWER, show);
}
- public void setTextEncoding(String encoding) {
+ public void setTextEncoding(@NonNull String encoding) {
putString(Name.TEXT_ENCODING, encoding);
}
@@ -312,7 +331,7 @@ public void setCookiesEnabled(boolean enable) {
putBoolean(Name.COOKIES, enable);
}
- public void setDownloadDirectory(String directory) {
+ public void setDownloadDirectory(@NonNull String directory) {
putString(Name.DOWNLOAD_DIRECTORY, directory);
}
@@ -332,7 +351,7 @@ public void setHideStatusBarEnabled(boolean enable) {
putBoolean(Name.HIDE_STATUS_BAR, enable);
}
- public void setHomepage(String homepage) {
+ public void setHomepage(@NonNull String homepage) {
putString(Name.HOMEPAGE, homepage);
}
@@ -352,10 +371,6 @@ public void setLocationEnabled(boolean enable) {
putBoolean(Name.LOCATION, enable);
}
- public void setMemoryUrl(String url) {
- putString(Name.URL_MEMORY, url);
- }
-
public void setOverviewModeEnabled(boolean enable) {
putBoolean(Name.OVERVIEW_MODE, enable);
}
@@ -376,7 +391,7 @@ public void setRestoreLostTabsEnabled(boolean enable) {
putBoolean(Name.RESTORE_LOST_TABS, enable);
}
- public void setSavedUrl(String url) {
+ public void setSavedUrl(@Nullable String url) {
putString(Name.SAVE_URL, url);
}
@@ -388,7 +403,7 @@ public void setSearchChoice(int choice) {
putInt(Name.SEARCH, choice);
}
- public void setSearchUrl(String url) {
+ public void setSearchUrl(@NonNull String url) {
putString(Name.SEARCH_URL, url);
}
@@ -423,7 +438,7 @@ public void setProxyChoice(int choice) {
putInt(Name.PROXY_CHOICE, choice);
}
- public void setProxyHost(String proxyHost) {
+ public void setProxyHost(@NonNull String proxyHost) {
putString(Name.USE_PROXY_HOST, proxyHost);
}
@@ -435,7 +450,7 @@ public void setUserAgentChoice(int choice) {
putInt(Name.USER_AGENT, choice);
}
- public void setUserAgentString(String agent) {
+ public void setUserAgentString(@Nullable String agent) {
putString(Name.USER_AGENT_STRING, agent);
}
diff --git a/app/src/main/java/acr/browser/lightning/react/Action.java b/app/src/main/java/acr/browser/lightning/react/Action.java
new file mode 100644
index 000000000..0c1a22efa
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/Action.java
@@ -0,0 +1,16 @@
+package acr.browser.lightning.react;
+
+import android.support.annotation.NonNull;
+
+public interface Action {
+ /**
+ * Should be overridden to send the subscriber
+ * events such as {@link Subscriber#onNext(Object)}
+ * or {@link Subscriber#onComplete()}.
+ *
+ * @param subscriber the subscriber that is sent in
+ * when the user of the Observable
+ * subscribes.
+ */
+ void onSubscribe(@NonNull Subscriber subscriber);
+}
diff --git a/app/src/main/java/acr/browser/lightning/react/Observable.java b/app/src/main/java/acr/browser/lightning/react/Observable.java
new file mode 100644
index 000000000..700a39ec4
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/Observable.java
@@ -0,0 +1,254 @@
+package acr.browser.lightning.react;
+
+import android.os.Looper;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.util.concurrent.Executor;
+
+import acr.browser.lightning.utils.Preconditions;
+
+/**
+ * An RxJava implementation. This class allows work
+ * to be done on a certain thread and then allows
+ * items to be emitted on a different thread. It is
+ * a replacement for {@link android.os.AsyncTask}.
+ *
+ * @param the type that the Observable will emit.
+ */
+public class Observable {
+
+ private static final String TAG = Observable.class.getSimpleName();
+
+ @NonNull private final Action mAction;
+ @Nullable private Executor mSubscriberThread;
+ @Nullable private Executor mObserverThread;
+ @NonNull private final Executor mDefault;
+
+ private Observable(@NonNull Action action) {
+ mAction = action;
+ Looper looper = Looper.myLooper();
+ Preconditions.checkNonNull(looper);
+ mDefault = new ThreadExecutor(looper);
+ }
+
+ /**
+ * Static creator method that creates an Observable from the
+ * {@link Action} that is passed in as the parameter. Action
+ * must not be null.
+ *
+ * @param action the Action to perform
+ * @param the type that will be emitted to the onSubscribe
+ * @return a valid non-null Observable.
+ */
+ @NonNull
+ public static Observable create(@NonNull Action action) {
+ Preconditions.checkNonNull(action);
+ return new Observable<>(action);
+ }
+
+ /**
+ * Tells the Observable what Executor that the onSubscribe
+ * work should run on.
+ *
+ * @param subscribeExecutor the Executor to run the work on.
+ * @return returns this so that calls can be conveniently chained.
+ */
+ public Observable subscribeOn(@NonNull Executor subscribeExecutor) {
+ mSubscriberThread = subscribeExecutor;
+ return this;
+ }
+
+ /**
+ * Tells the Observable what Executor the onSubscribe should observe
+ * the work on.
+ *
+ * @param observerExecutor the Executor to run to callback on.
+ * @return returns this so that calls can be conveniently chained.
+ */
+ public Observable observeOn(@NonNull Executor observerExecutor) {
+ mObserverThread = observerExecutor;
+ return this;
+ }
+
+ /**
+ * Subscribes immediately to the Observable and ignores
+ * all onComplete and onNext calls.
+ */
+ public void subscribe() {
+ executeOnSubscriberThread(new Runnable() {
+ @Override
+ public void run() {
+ mAction.onSubscribe(new Subscriber() {
+ @Override
+ public void unsubscribe() {}
+
+ @Override
+ public void onComplete() {}
+
+ @Override
+ public void onStart() {}
+
+ @Override
+ public void onError(@NonNull Throwable throwable) {}
+
+ @Override
+ public void onNext(T item) {}
+ });
+ }
+ });
+ }
+
+ /**
+ * Immediately subscribes to the Observable and starts
+ * sending events from the Observable to the {@link OnSubscribe}.
+ *
+ * @param onSubscribe the class that wishes to receive onNext and
+ * onComplete callbacks from the Observable.
+ */
+ public Subscription subscribe(@NonNull OnSubscribe onSubscribe) {
+
+ Preconditions.checkNonNull(onSubscribe);
+
+ final Subscriber subscriber = new SubscriberImpl<>(onSubscribe, this);
+
+ subscriber.onStart();
+
+ executeOnSubscriberThread(new Runnable() {
+ @Override
+ public void run() {
+ mAction.onSubscribe(subscriber);
+ }
+ });
+
+ return subscriber;
+ }
+
+ private void executeOnObserverThread(@NonNull Runnable runnable) {
+ if (mObserverThread != null) {
+ mObserverThread.execute(runnable);
+ } else {
+ mDefault.execute(runnable);
+ }
+ }
+
+ private void executeOnSubscriberThread(@NonNull Runnable runnable) {
+ if (mSubscriberThread != null) {
+ mSubscriberThread.execute(runnable);
+ } else {
+ mDefault.execute(runnable);
+ }
+ }
+
+ private static class SubscriberImpl implements Subscriber {
+
+ @Nullable private volatile OnSubscribe mOnSubscribe;
+ @NonNull private final Observable mObservable;
+ private boolean mOnCompleteExecuted = false;
+ private boolean mOnError = false;
+
+ public SubscriberImpl(@NonNull OnSubscribe onSubscribe, @NonNull Observable observable) {
+ mOnSubscribe = onSubscribe;
+ mObservable = observable;
+ }
+
+ @Override
+ public void unsubscribe() {
+ mOnSubscribe = null;
+ }
+
+ @Override
+ public void onComplete() {
+ OnSubscribe onSubscribe = mOnSubscribe;
+ if (!mOnCompleteExecuted && onSubscribe != null && !mOnError) {
+ mOnCompleteExecuted = true;
+ mObservable.executeOnObserverThread(new OnCompleteRunnable<>(onSubscribe));
+ } else if (!mOnError) {
+ Log.e(TAG, "onComplete called more than once");
+ throw new RuntimeException("onComplete called more than once");
+ }
+ }
+
+ @Override
+ public void onStart() {
+ OnSubscribe onSubscribe = mOnSubscribe;
+ if (onSubscribe != null) {
+ mObservable.executeOnObserverThread(new OnStartRunnable<>(onSubscribe));
+ }
+ }
+
+ @Override
+ public void onError(@NonNull final Throwable throwable) {
+ OnSubscribe onSubscribe = mOnSubscribe;
+ if (onSubscribe != null) {
+ mOnError = true;
+ mObservable.executeOnObserverThread(new OnErrorRunnable<>(onSubscribe, throwable));
+ }
+ }
+
+ @Override
+ public void onNext(final T item) {
+ OnSubscribe onSubscribe = mOnSubscribe;
+ if (!mOnCompleteExecuted && onSubscribe != null) {
+ mObservable.executeOnObserverThread(new OnNextRunnable<>(onSubscribe, item));
+ } else {
+ Log.e(TAG, "onComplete has been already called, onNext should not be called");
+ throw new RuntimeException("onNext should not be called after onComplete has been called");
+ }
+ }
+ }
+
+ private static class OnCompleteRunnable implements Runnable {
+ private final OnSubscribe onSubscribe;
+
+ public OnCompleteRunnable(@NonNull OnSubscribe onSubscribe) {this.onSubscribe = onSubscribe;}
+
+ @Override
+ public void run() {
+ onSubscribe.onComplete();
+ }
+ }
+
+ private static class OnNextRunnable implements Runnable {
+ private final OnSubscribe onSubscribe;
+ private final T item;
+
+ public OnNextRunnable(@NonNull OnSubscribe onSubscribe, T item) {
+ this.onSubscribe = onSubscribe;
+ this.item = item;
+ }
+
+ @Override
+ public void run() {
+ onSubscribe.onNext(item);
+ }
+ }
+
+ private static class OnErrorRunnable implements Runnable {
+ private final OnSubscribe onSubscribe;
+ private final Throwable throwable;
+
+ public OnErrorRunnable(@NonNull OnSubscribe onSubscribe, @NonNull Throwable throwable) {
+ this.onSubscribe = onSubscribe;
+ this.throwable = throwable;
+ }
+
+ @Override
+ public void run() {
+ onSubscribe.onError(throwable);
+ }
+ }
+
+ private static class OnStartRunnable implements Runnable {
+ private final OnSubscribe onSubscribe;
+
+ public OnStartRunnable(@NonNull OnSubscribe onSubscribe) {this.onSubscribe = onSubscribe;}
+
+ @Override
+ public void run() {
+ onSubscribe.onStart();
+ }
+ }
+}
+
diff --git a/app/src/main/java/acr/browser/lightning/react/OnSubscribe.java b/app/src/main/java/acr/browser/lightning/react/OnSubscribe.java
new file mode 100644
index 000000000..fb65d7f5d
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/OnSubscribe.java
@@ -0,0 +1,47 @@
+package acr.browser.lightning.react;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public abstract class OnSubscribe {
+
+ /**
+ * Called when the observable
+ * runs into an error that will
+ * cause it to abort and not finish.
+ * Receiving this callback means that
+ * the observable is dead and no
+ * {@link #onComplete()} or {@link #onNext(Object)}
+ * callbacks will be called.
+ *
+ * @param throwable an optional throwable that could
+ * be sent.
+ */
+ public void onError(@NonNull Throwable throwable) {}
+
+ /**
+ * Called before the observer begins
+ * to process and emit items or complete.
+ */
+ public void onStart() {}
+
+ /**
+ * Called when the Observer emits an
+ * item. It can be called multiple times.
+ * It cannot be called after onComplete
+ * has been called.
+ *
+ * @param item the item that has been emitted,
+ * can be null.
+ */
+ public void onNext(@Nullable T item) {}
+
+ /**
+ * This method is called when the observer is
+ * finished sending the subscriber events. It
+ * is guaranteed that no other methods will be
+ * called on the OnSubscribe after this method
+ * has been called.
+ */
+ public void onComplete() {}
+}
diff --git a/app/src/main/java/acr/browser/lightning/react/Schedulers.java b/app/src/main/java/acr/browser/lightning/react/Schedulers.java
new file mode 100644
index 000000000..4368c96c3
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/Schedulers.java
@@ -0,0 +1,46 @@
+package acr.browser.lightning.react;
+
+import android.os.Looper;
+import android.support.annotation.NonNull;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class Schedulers {
+ private static final Executor sWorker = Executors.newFixedThreadPool(4);
+ private static final Executor sIOWorker = Executors.newSingleThreadExecutor();
+ private static final Executor sMain = new ThreadExecutor(Looper.getMainLooper());
+
+ /**
+ * The worker thread executor, will
+ * execute work on any one of multiple
+ * threads.
+ *
+ * @return a non-null executor.
+ */
+ @NonNull
+ public static Executor worker() {
+ return sWorker;
+ }
+
+ /**
+ * The main thread.
+ *
+ * @return a non-null executor that does work on the main thread.
+ */
+ @NonNull
+ public static Executor main() {
+ return sMain;
+ }
+
+ /**
+ * The io thread.
+ *
+ * @return a non-null executor that does
+ * work on a single thread off the main thread.
+ */
+ @NonNull
+ public static Executor io() {
+ return sIOWorker;
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/react/Subscriber.java b/app/src/main/java/acr/browser/lightning/react/Subscriber.java
new file mode 100644
index 000000000..72920f16b
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/Subscriber.java
@@ -0,0 +1,51 @@
+package acr.browser.lightning.react;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public interface Subscriber extends Subscription {
+
+ /**
+ * Called immediately upon subscribing
+ * and before the Observable begins
+ * emitting items. This should not be
+ * called by the creator of the Observable
+ * and is rather called internally by the
+ * Observable class itself.
+ */
+ void onStart();
+
+ /**
+ * Called when the observable
+ * runs into an error that will
+ * cause it to abort and not finish.
+ * Receiving this callback means that
+ * the observable is dead and no
+ * {@link #onComplete()} or {@link #onNext(Object)}
+ * callbacks will be called.
+ *
+ * @param throwable an optional throwable that could
+ * be sent.
+ */
+ void onError(@NonNull Throwable throwable);
+
+ /**
+ * Called when the Observer emits an
+ * item. It can be called multiple times.
+ * It cannot be called after onComplete
+ * has been called.
+ *
+ * @param item the item that has been emitted,
+ * can be null.
+ */
+ void onNext(@Nullable T item);
+
+ /**
+ * This method is called when the observer is
+ * finished sending the subscriber events. It
+ * is guaranteed that no other methods will be
+ * called on the OnSubscribe after this method
+ * has been called.
+ */
+ void onComplete();
+}
diff --git a/app/src/main/java/acr/browser/lightning/react/Subscription.java b/app/src/main/java/acr/browser/lightning/react/Subscription.java
new file mode 100644
index 000000000..627b60bf7
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/Subscription.java
@@ -0,0 +1,7 @@
+package acr.browser.lightning.react;
+
+public interface Subscription {
+
+ void unsubscribe();
+
+}
diff --git a/app/src/main/java/acr/browser/lightning/react/ThreadExecutor.java b/app/src/main/java/acr/browser/lightning/react/ThreadExecutor.java
new file mode 100644
index 000000000..e3527260a
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/react/ThreadExecutor.java
@@ -0,0 +1,21 @@
+package acr.browser.lightning.react;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.NonNull;
+
+import java.util.concurrent.Executor;
+
+class ThreadExecutor implements Executor {
+
+ private final Handler mHandler;
+
+ public ThreadExecutor(@NonNull Looper looper) {
+ mHandler = new Handler(looper);
+ }
+
+ @Override
+ public void execute(@NonNull Runnable command) {
+ mHandler.post(command);
+ }
+}
diff --git a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
index 07eb8abbc..1de050709 100644
--- a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
+++ b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
@@ -491,8 +491,7 @@ private static Date extractDate(Document doc) {
Element el = elems.get(0);
if (el.hasAttr("content")) {
dateStr = el.attr("content");
- Date parsedDate = parseDate(dateStr);
- return parsedDate;
+ return parseDate(dateStr);
}
}
diff --git a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
index 1af5d3b13..85a186224 100644
--- a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
+++ b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
@@ -33,6 +33,8 @@
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+import acr.browser.lightning.utils.Utils;
+
/**
* Class to fetch articles. This class is thread safe.
*
@@ -49,28 +51,36 @@ public class HtmlFetcher {
}
public static void main(String[] args) throws Exception {
- BufferedReader reader = new BufferedReader(new FileReader("urls.txt"));
- String line;
- Set existing = new LinkedHashSet<>();
- while ((line = reader.readLine()) != null) {
- int index1 = line.indexOf('\"');
- int index2 = line.indexOf('\"', index1 + 1);
- String url = line.substring(index1 + 1, index2);
- String domainStr = SHelper.extractDomain(url, true);
- String counterStr = "";
- // TODO more similarities
- if (existing.contains(domainStr))
- counterStr = "2";
- else
- existing.add(domainStr);
-
- String html = new HtmlFetcher().fetchAsString(url, 2000);
- String outFile = domainStr + counterStr + ".html";
- BufferedWriter writer = new BufferedWriter(new FileWriter(outFile));
- writer.write(html);
- writer.close();
+ BufferedReader reader = null;
+ BufferedWriter writer = null;
+ try {
+
+ //noinspection IOResourceOpenedButNotSafelyClosed
+ reader = new BufferedReader(new FileReader("urls.txt"));
+ String line;
+ Set existing = new LinkedHashSet<>();
+ while ((line = reader.readLine()) != null) {
+ int index1 = line.indexOf('\"');
+ int index2 = line.indexOf('\"', index1 + 1);
+ String url = line.substring(index1 + 1, index2);
+ String domainStr = SHelper.extractDomain(url, true);
+ String counterStr = "";
+ // TODO more similarities
+ if (existing.contains(domainStr))
+ counterStr = "2";
+ else
+ existing.add(domainStr);
+
+ String html = new HtmlFetcher().fetchAsString(url, 2000);
+ String outFile = domainStr + counterStr + ".html";
+ //noinspection IOResourceOpenedButNotSafelyClosed
+ writer = new BufferedWriter(new FileWriter(outFile));
+ writer.write(html);
+ }
+ } finally {
+ Utils.close(reader);
+ Utils.close(writer);
}
- reader.close();
}
private String referrer = "http://jetsli.de/crawler";
@@ -386,8 +396,8 @@ private String getResolvedUrl(String urlAsString, int timeout,
if (responseCode / 100 == 3 && newUrl != null && num_redirects < 5) {
newUrl = SPACE.matcher(newUrl).replaceAll("+");
// some services use (none-standard) utf8 in their location header
- if (urlAsString.startsWith("http://bit.ly")
- || urlAsString.startsWith("http://is.gd"))
+ if (urlAsString.contains("://bit.ly")
+ || urlAsString.contains("://is.gd"))
newUrl = encodeUriFromHeader(newUrl);
// AP: This code is not longer need, instead we always follow
diff --git a/app/src/main/java/acr/browser/lightning/reading/MapEntry.java b/app/src/main/java/acr/browser/lightning/reading/MapEntry.java
index e93106241..7e1bef7b9 100644
--- a/app/src/main/java/acr/browser/lightning/reading/MapEntry.java
+++ b/app/src/main/java/acr/browser/lightning/reading/MapEntry.java
@@ -1,12 +1,12 @@
/**
* Copyright (C) 2010 Peter Karich <>
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@
/**
* Simple impl of Map.Entry. So that we can have ordered maps.
- *
+ *
* @author Peter Karich, peat_hal ‘at’ users ‘dot’ sourceforge ‘dot’
* net
*/
@@ -60,13 +60,12 @@ public String toString() {
public boolean equals(Object obj) {
if (obj == null)
return false;
- if (getClass() != obj.getClass())
- return false;
- final MapEntry other = (MapEntry) obj;
- if (this.key != other.key && (this.key == null || !this.key.equals(other.key)))
+ if (!(obj instanceof Map))
return false;
- return !(this.value != other.value && (this.value == null || !this.value
- .equals(other.value)));
+ final MapEntry other = (MapEntry) obj;
+
+ return !(this.key != other.key && (this.key == null || !this.key.equals(other.key))) &&
+ !(this.value != other.value && (this.value == null || !this.value.equals(other.value)));
}
@Override
diff --git a/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java b/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java
index f57a1da8f..fe63ca443 100644
--- a/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java
+++ b/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java
@@ -23,7 +23,7 @@ public class OutputFormatter {
private static final int MIN_FIRST_PARAGRAPH_TEXT = 50; // Min size of first paragraph
private static final int MIN_PARAGRAPH_TEXT = 30; // Min size of any other paragraphs
private static final List NODES_TO_REPLACE = Arrays.asList("strong", "b", "i");
- private Pattern unlikelyPattern = Pattern.compile("display\\:none|visibility\\:hidden");
+ private Pattern unlikelyPattern = Pattern.compile("display:none|visibility:hidden");
private final int minFirstParagraphText;
private final int minParagraphText;
private final List nodesToReplace;
diff --git a/app/src/main/java/acr/browser/lightning/reading/SHelper.java b/app/src/main/java/acr/browser/lightning/reading/SHelper.java
index 6e2ed97df..1554ed78f 100644
--- a/app/src/main/java/acr/browser/lightning/reading/SHelper.java
+++ b/app/src/main/java/acr/browser/lightning/reading/SHelper.java
@@ -251,9 +251,9 @@ public static void enableUserAgentOverwrite() {
}
public static String getUrlFromUglyGoogleRedirect(String url) {
- if (url.startsWith("http://www.google.com/url?")) {
- url = url.substring("http://www.google.com/url?".length());
- String arr[] = urlDecode(url).split("\\&");
+ if (url.startsWith("https://www.google.com/url?")) {
+ url = url.substring("https://www.google.com/url?".length());
+ String arr[] = urlDecode(url).split("&");
for (String str : arr) {
if (str.startsWith("q="))
return str.substring("q=".length());
@@ -264,8 +264,8 @@ public static String getUrlFromUglyGoogleRedirect(String url) {
}
public static String getUrlFromUglyFacebookRedirect(String url) {
- if (url.startsWith("http://www.facebook.com/l.php?u=")) {
- url = url.substring("http://www.facebook.com/l.php?u=".length());
+ if (url.startsWith("https://www.facebook.com/l.php?u=")) {
+ url = url.substring("https://www.facebook.com/l.php?u=".length());
return urlDecode(url);
}
diff --git a/app/src/main/java/acr/browser/lightning/receiver/NetworkReceiver.java b/app/src/main/java/acr/browser/lightning/receiver/NetworkReceiver.java
index 3c3947518..97ffe389d 100644
--- a/app/src/main/java/acr/browser/lightning/receiver/NetworkReceiver.java
+++ b/app/src/main/java/acr/browser/lightning/receiver/NetworkReceiver.java
@@ -5,14 +5,14 @@
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
+import android.support.annotation.NonNull;
public class NetworkReceiver extends BroadcastReceiver {
@Override
- public void onReceive(Context context, Intent intent) {
- }
+ public void onReceive(Context context, Intent intent) {}
- public static boolean isConnected(Context context) {
+ public static boolean isConnected(@NonNull Context context) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm == null)
return false;
diff --git a/app/src/main/java/acr/browser/lightning/search/RetrieveSuggestionsTask.java b/app/src/main/java/acr/browser/lightning/search/RetrieveSuggestionsTask.java
new file mode 100644
index 000000000..53bf7fa4f
--- /dev/null
+++ b/app/src/main/java/acr/browser/lightning/search/RetrieveSuggestionsTask.java
@@ -0,0 +1,201 @@
+package acr.browser.lightning.search;
+
+import android.app.Application;
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import acr.browser.lightning.R;
+import acr.browser.lightning.database.HistoryItem;
+import acr.browser.lightning.utils.Utils;
+
+class RetrieveSuggestionsTask extends AsyncTask> {
+
+ private static final String TAG = RetrieveSuggestionsTask.class.getSimpleName();
+
+ private static final Pattern SPACE_PATTERN = Pattern.compile(" ", Pattern.LITERAL);
+ private static final String CACHE_FILE_TYPE = ".sgg";
+ private static final String ENCODING = "ISO-8859-1";
+ private static final long INTERVAL_DAY = 86400000;
+ private static final String DEFAULT_LANGUAGE = "en";
+ @Nullable private static XmlPullParser sXpp;
+ @Nullable private static String sLanguage;
+ @NonNull private final WeakReference mResultCallback;
+ @NonNull private final Application mApplication;
+ @NonNull private final String mSearchSubtitle;
+ @NonNull private String mQuery;
+
+ public RetrieveSuggestionsTask(@NonNull String query,
+ @NonNull SuggestionsResult callback,
+ @NonNull Application application) {
+ mQuery = query;
+ mResultCallback = new WeakReference<>(callback);
+ mApplication = application;
+ mSearchSubtitle = mApplication.getString(R.string.suggestion);
+ }
+
+ @NonNull
+ private static synchronized String getLanguage() {
+ if (sLanguage == null) {
+ sLanguage = Locale.getDefault().getLanguage();
+ }
+ if (TextUtils.isEmpty(sLanguage)) {
+ sLanguage = DEFAULT_LANGUAGE;
+ }
+ return sLanguage;
+ }
+
+ @NonNull
+ private static synchronized XmlPullParser getParser() throws XmlPullParserException {
+ if (sXpp == null) {
+ XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ sXpp = factory.newPullParser();
+ }
+ return sXpp;
+ }
+
+ @NonNull
+ @Override
+ protected List doInBackground(Void... voids) {
+ List filter = new ArrayList<>(5);
+ try {
+ mQuery = SPACE_PATTERN.matcher(mQuery).replaceAll("+");
+ URLEncoder.encode(mQuery, ENCODING);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ File cache = downloadSuggestionsForQuery(mQuery, getLanguage(), mApplication);
+ if (!cache.exists()) {
+ return filter;
+ }
+ InputStream fileInput = null;
+ try {
+ fileInput = new BufferedInputStream(new FileInputStream(cache));
+ XmlPullParser parser = getParser();
+ parser.setInput(fileInput, ENCODING);
+ int eventType = parser.getEventType();
+ int counter = 0;
+ while (eventType != XmlPullParser.END_DOCUMENT) {
+ if (eventType == XmlPullParser.START_TAG && "suggestion".equals(parser.getName())) {
+ String suggestion = parser.getAttributeValue(null, "data");
+ filter.add(new HistoryItem(mSearchSubtitle + " \"" + suggestion + '"',
+ suggestion, R.drawable.ic_search));
+ counter++;
+ if (counter >= 5) {
+ break;
+ }
+ }
+ eventType = parser.next();
+ }
+ } catch (Exception e) {
+ return filter;
+ } finally {
+ Utils.close(fileInput);
+ }
+ return filter;
+ }
+
+ @Override
+ protected void onPostExecute(@NonNull List result) {
+ SuggestionsResult callback = mResultCallback.get();
+ if (callback != null) {
+ callback.resultReceived(result);
+ }
+ }
+
+ /**
+ * This method downloads the search suggestions for the specific query.
+ * NOTE: This is a blocking operation, do not run on the UI thread.
+ *
+ * @param query the query to get suggestions for
+ * @return the cache file containing the suggestions
+ */
+ @NonNull
+ private static File downloadSuggestionsForQuery(@NonNull String query, String language, @NonNull Application app) {
+ File cacheFile = new File(app.getCacheDir(), query.hashCode() + CACHE_FILE_TYPE);
+ if (System.currentTimeMillis() - INTERVAL_DAY < cacheFile.lastModified()) {
+ return cacheFile;
+ }
+ if (!isNetworkConnected(app)) {
+ return cacheFile;
+ }
+ InputStream in = null;
+ FileOutputStream fos = null;
+ try {
+ // Old API that doesn't support HTTPS
+ // http://google.com/complete/search?q= + query + &output=toolbar&hl= + language
+ URL url = new URL("https://suggestqueries.google.com/complete/search?output=toolbar&hl="
+ + language + "&q=" + query);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setDoInput(true);
+ connection.connect();
+ if (connection.getResponseCode() >= HttpURLConnection.HTTP_MULT_CHOICE ||
+ connection.getResponseCode() < HttpURLConnection.HTTP_OK) {
+ Log.e(TAG, "Search API Responded with code: " + connection.getResponseCode());
+ connection.disconnect();
+ return cacheFile;
+ }
+ in = connection.getInputStream();
+
+ if (in != null) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
+ fos = new FileOutputStream(cacheFile);
+ int buffer;
+ while ((buffer = in.read()) != -1) {
+ fos.write(buffer);
+ }
+ fos.flush();
+ }
+ connection.disconnect();
+ cacheFile.setLastModified(System.currentTimeMillis());
+ } catch (Exception e) {
+ Log.w(TAG, "Problem getting search suggestions", e);
+ } finally {
+ Utils.close(in);
+ Utils.close(fos);
+ }
+ return cacheFile;
+ }
+
+ private static boolean isNetworkConnected(@NonNull Context context) {
+ NetworkInfo networkInfo = getActiveNetworkInfo(context);
+ return networkInfo != null && networkInfo.isConnected();
+ }
+
+ @Nullable
+ private static NetworkInfo getActiveNetworkInfo(@NonNull Context context) {
+ ConnectivityManager connectivity = (ConnectivityManager) context
+ .getApplicationContext()
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+ if (connectivity == null) {
+ return null;
+ }
+ return connectivity.getActiveNetworkInfo();
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
similarity index 51%
rename from app/src/main/java/acr/browser/lightning/object/SearchAdapter.java
rename to app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
index 6db5ef1ab..4dd83786e 100644
--- a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java
+++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
@@ -1,11 +1,12 @@
-package acr.browser.lightning.object;
+package acr.browser.lightning.search;
+import android.app.Application;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
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;
@@ -15,26 +16,14 @@
import android.widget.ImageView;
import android.widget.TextView;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FilenameFilter;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
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 java.util.regex.Pattern;
import javax.inject.Inject;
@@ -45,86 +34,60 @@
import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.utils.ThemeUtils;
-import acr.browser.lightning.utils.Utils;
-public class SearchAdapter extends BaseAdapter implements Filterable {
+public class SuggestionsAdapter extends BaseAdapter implements Filterable, SuggestionsResult {
+
+ private static final String TAG = SuggestionsAdapter.class.getSimpleName();
- private static final Pattern SPACE_PATTERN = Pattern.compile(" ", Pattern.LITERAL);
private final List mHistory = new ArrayList<>(5);
private final List mBookmarks = new ArrayList<>(5);
private final List mSuggestions = new ArrayList<>(5);
private final List mFilteredList = new ArrayList<>(5);
private final List mAllBookmarks = new ArrayList<>(5);
- private final Object mLock = new Object();
- private HistoryDatabase mDatabaseHandler;
- private final Context mContext;
+
private boolean mUseGoogle = true;
private boolean mIsExecuting = false;
private final boolean mDarkTheme;
private final boolean mIncognito;
- @Inject
- BookmarkManager mBookmarkManager;
private static final String CACHE_FILE_TYPE = ".sgg";
- private static final String ENCODING = "ISO-8859-1";
private static final long INTERVAL_DAY = 86400000;
private static final int MAX_SUGGESTIONS = 5;
- private static final SuggestionsComparator mComparator = new SuggestionsComparator();
- private final String mSearchSubtitle;
- private SearchFilter mFilter;
- private final Drawable mSearchDrawable;
- private final Drawable mHistoryDrawable;
- private final Drawable mBookmarkDrawable;
-
- public SearchAdapter(Context context, boolean dark, boolean incognito) {
+ 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);
- mDatabaseHandler = HistoryDatabase.getInstance();
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
- mUseGoogle = PreferenceManager.getInstance().getGoogleSearchSuggestionsEnabled();
+ mUseGoogle = mPreferenceManager.getGoogleSearchSuggestionsEnabled();
mContext = context;
- mSearchSubtitle = mContext.getString(R.string.suggestion);
mDarkTheme = dark || incognito;
mIncognito = incognito;
- Thread delete = new Thread(new ClearCacheRunnable());
+ 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);
- delete.setPriority(Thread.MIN_PRIORITY);
- delete.start();
- }
-
- private static void deleteOldCacheFiles() {
- File dir = new File(BrowserApp.getAppContext().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, String filename) {
- return filename.endsWith(CACHE_FILE_TYPE);
- }
-
}
public void refreshPreferences() {
- mUseGoogle = PreferenceManager.getInstance().getGoogleSearchSuggestionsEnabled();
+ mUseGoogle = mPreferenceManager.getGoogleSearchSuggestionsEnabled();
if (!mUseGoogle) {
synchronized (mSuggestions) {
mSuggestions.clear();
}
}
- mDatabaseHandler = HistoryDatabase.getInstance();
}
public void refreshBookmarks() {
- synchronized (mLock) {
+ synchronized (SuggestionsAdapter.this) {
mAllBookmarks.clear();
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
}
@@ -145,8 +108,15 @@ public long getItemId(int position) {
return 0;
}
+ private static class SuggestionHolder {
+ ImageView mImage;
+ TextView mTitle;
+ TextView mUrl;
+ }
+
+ @Nullable
@Override
- public View getView(int position, View convertView, ViewGroup parent) {
+ public View getView(int position, @Nullable View convertView, ViewGroup parent) {
SuggestionHolder holder;
if (convertView == null) {
@@ -208,30 +178,56 @@ public Filter getFilter() {
private static class ClearCacheRunnable implements Runnable {
+ @NonNull
+ private final Application app;
+
+ public ClearCacheRunnable(@NonNull Application app) {
+ this.app = app;
+ }
+
@Override
public void run() {
- deleteOldCacheFiles();
+ 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(CharSequence constraint) {
+ 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) {
- new RetrieveSearchSuggestions().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, query);
+ mIsExecuting = true;
+ new RetrieveSuggestionsTask(query, SuggestionsAdapter.this, BrowserApp.get(mContext)).executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
}
int counter = 0;
synchronized (mBookmarks) {
mBookmarks.clear();
- synchronized (mLock) {
+ synchronized (SuggestionsAdapter.this) {
for (int n = 0; n < mAllBookmarks.size(); n++) {
if (counter >= 5) {
break;
@@ -244,13 +240,10 @@ protected FilterResults performFiltering(CharSequence constraint) {
mBookmarks.add(mAllBookmarks.get(n));
counter++;
}
-
}
}
}
- if (mDatabaseHandler == null || mDatabaseHandler.isClosed()) {
- mDatabaseHandler = HistoryDatabase.getInstance();
- }
+
List historyList = mDatabaseHandler.findItemsContaining(constraint.toString());
synchronized (mHistory) {
mHistory.clear();
@@ -261,7 +254,7 @@ protected FilterResults performFiltering(CharSequence constraint) {
}
@Override
- public CharSequence convertResultToString(Object resultValue) {
+ public CharSequence convertResultToString(@NonNull Object resultValue) {
return ((HistoryItem) resultValue).getUrl();
}
@@ -270,7 +263,7 @@ protected void publishResults(CharSequence constraint, FilterResults results) {
synchronized (mFilteredList) {
mFilteredList.clear();
List filtered = getFilteredList();
- Collections.sort(filtered, mComparator);
+ Collections.sort(filtered, sComparator);
mFilteredList.addAll(filtered);
}
notifyDataSetChanged();
@@ -278,142 +271,24 @@ protected void publishResults(CharSequence constraint, FilterResults results) {
}
- private static class SuggestionHolder {
- ImageView mImage;
- TextView mTitle;
- TextView mUrl;
- }
-
- private class RetrieveSearchSuggestions extends AsyncTask> {
-
- private XmlPullParserFactory mFactory;
- private XmlPullParser mXpp;
-
- @Override
- protected List doInBackground(String... arg0) {
- mIsExecuting = true;
-
- List filter = new ArrayList<>();
- String query = arg0[0];
- try {
- query = SPACE_PATTERN.matcher(query).replaceAll("+");
- URLEncoder.encode(query, ENCODING);
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- File cache = downloadSuggestionsForQuery(query);
- if (!cache.exists()) {
- return filter;
- }
- InputStream fileInput = null;
- try {
- fileInput = new BufferedInputStream(new FileInputStream(cache));
- if (mFactory == null) {
- mFactory = XmlPullParserFactory.newInstance();
- mFactory.setNamespaceAware(true);
- }
- if (mXpp == null) {
- mXpp = mFactory.newPullParser();
- }
- mXpp.setInput(fileInput, ENCODING);
- int eventType = mXpp.getEventType();
- int counter = 0;
- while (eventType != XmlPullParser.END_DOCUMENT) {
- if (eventType == XmlPullParser.START_TAG && "suggestion".equals(mXpp.getName())) {
- String suggestion = mXpp.getAttributeValue(null, "data");
- filter.add(new HistoryItem(mSearchSubtitle + " \"" + suggestion + '"',
- suggestion, R.drawable.ic_search));
- counter++;
- if (counter >= 5) {
- break;
- }
- }
- eventType = mXpp.next();
- }
- } catch (Exception e) {
- return filter;
- } finally {
- Utils.close(fileInput);
- }
- return filter;
- }
-
- @Override
- protected void onPostExecute(List result) {
- mIsExecuting = false;
- synchronized (mSuggestions) {
- mSuggestions.clear();
- mSuggestions.addAll(result);
- }
- synchronized (mFilteredList) {
- mFilteredList.clear();
- List