From 5081ee2ea6f524d933763dc97f952ef33a212cb0 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Wed, 5 Aug 2015 22:10:51 -0400
Subject: [PATCH] Fix RuntimeException on Android M Preview

---
 .../acr/browser/lightning/activity/BrowserActivity.java     | 6 +++---
 .../acr/browser/lightning/database/BookmarkManager.java     | 2 +-
 .../lightning/fragment/BookmarkSettingsFragment.java        | 6 +++++-
 app/src/main/java/acr/browser/lightning/utils/WebUtils.java | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
index 922a591..4d69b5c 100644
--- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
@@ -1859,7 +1859,8 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
                 if (isSystemBrowserAvailable() && mPreferences.getSyncHistoryEnabled()) {
                     try {
                         Browser.updateVisitedHistory(getContentResolver(), url, true);
-                    } catch (NullPointerException ignored) {
+                    } catch (Exception ignored) {
+                        // ignored
                     }
                 }
                 try {
@@ -1890,10 +1891,9 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
         String[] columns = new String[]{"url", "title"};
         boolean browserFlag;
         try {
-
             Uri bookmarks = Browser.BOOKMARKS_URI;
             c = getContentResolver().query(bookmarks, columns, null, null, null);
-        } catch (SQLiteException | IllegalStateException | NullPointerException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
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 f0bc33f..47acdd1 100644
--- a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
+++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
@@ -399,7 +399,7 @@ public class BookmarkManager {
      * This method imports all bookmarks that are included in the device's
      * permanent bookmark storage
      */
-    public synchronized void importBookmarksFromBrowser(Activity activity) {
+    public synchronized void importBookmarksFromBrowser(Activity activity) throws Exception{
         if (PreferenceManager.getInstance().getSystemBrowserPresent()) {
 
             List<HistoryItem> bookmarkList = new ArrayList<>();
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 33c10aa..64de7a3 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
@@ -74,7 +74,11 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
                 createDialog();
                 return true;
             case SETTINGS_BROWSER_IMPORT:
-                mBookmarkManager.importBookmarksFromBrowser(getActivity());
+                try {
+                    mBookmarkManager.importBookmarksFromBrowser(getActivity());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 return true;
             default:
                 return false;
diff --git a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java
index dbda4af..022e330 100644
--- a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java
+++ b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java
@@ -44,7 +44,7 @@ public class WebUtils {
         if (systemBrowserPresent) {
             try {
                 Browser.clearHistory(context.getContentResolver());
-            } catch (NullPointerException ignored) {
+            } catch (Exception ignored) {
                 // ignored
             }
         }