From 1eed3ca9484117c73169011d211127202e6734b3 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 28 Jan 2015 21:17:44 -0500 Subject: [PATCH] Fixed potential NullPointerExeptions --- src/acr/browser/lightning/AdBlock.java | 2 +- src/acr/browser/lightning/BookmarkManager.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/acr/browser/lightning/AdBlock.java b/src/acr/browser/lightning/AdBlock.java index f348913..079e90d 100644 --- a/src/acr/browser/lightning/AdBlock.java +++ b/src/acr/browser/lightning/AdBlock.java @@ -63,7 +63,7 @@ public class AdBlock { } public boolean isAd(String url) { - if (!mBlockAds) { + if (!mBlockAds || url == null) { return false; } diff --git a/src/acr/browser/lightning/BookmarkManager.java b/src/acr/browser/lightning/BookmarkManager.java index 536ee64..d6de8f5 100644 --- a/src/acr/browser/lightning/BookmarkManager.java +++ b/src/acr/browser/lightning/BookmarkManager.java @@ -47,8 +47,7 @@ public class BookmarkManager { */ public synchronized boolean addBookmark(HistoryItem item) { File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); - - if (mBookmarkMap.containsKey(item.getUrl())) { + if (item.getUrl() == null || mBookmarkMap.containsKey(item.getUrl())) { return false; } try { @@ -80,7 +79,7 @@ public class BookmarkManager { try { BufferedWriter bookmarkWriter = new BufferedWriter(new FileWriter(bookmarksFile, true)); for (HistoryItem item : list) { - if (!mBookmarkMap.containsKey(item.getUrl())) { + if (item.getUrl() != null && !mBookmarkMap.containsKey(item.getUrl())) { JSONObject object = new JSONObject(); object.put(TITLE, item.getTitle()); object.put(URL, item.getUrl()); @@ -106,6 +105,9 @@ public class BookmarkManager { */ public synchronized boolean deleteBookmark(String url) { List list = new ArrayList(); + if (url == null) { + return false; + } mBookmarkMap.remove(url); list = getBookmarks(false); File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); @@ -427,6 +429,11 @@ public class BookmarkManager { private class SortIgnoreCase implements Comparator { public int compare(HistoryItem o1, HistoryItem o2) { + if (o1 == null || o2 == null) { + return 0; + } else if (o1.getTitle() == null || o2.getTitle() == null) { + return o1.getTitle().compareTo(o2.getTitle()); + } return o1.getTitle().toLowerCase(Locale.getDefault()) .compareTo(o2.getTitle().toLowerCase(Locale.getDefault())); }