From 923e71d51f6b2f1824fcccdb4c0a1edceb486eaf Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Sat, 29 Apr 2017 17:22:49 -0400
Subject: [PATCH] Ensure that published items aren't null

---
 .../java/acr/browser/lightning/search/SuggestionsAdapter.java | 2 ++
 .../main/java/acr/browser/lightning/utils/DrawableUtils.java  | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
index cebd9fe..a29f83e 100644
--- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
+++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
@@ -42,6 +42,7 @@ import acr.browser.lightning.database.BookmarkManager;
 import acr.browser.lightning.database.HistoryItem;
 import acr.browser.lightning.database.HistoryModel;
 import acr.browser.lightning.preference.PreferenceManager;
+import acr.browser.lightning.utils.Preconditions;
 import acr.browser.lightning.utils.ThemeUtils;
 
 public class SuggestionsAdapter extends BaseAdapter implements Filterable {
@@ -264,6 +265,7 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable {
             .subscribe(new SingleOnSubscribe<List<HistoryItem>>() {
                 @Override
                 public void onItem(@Nullable List<HistoryItem> item) {
+                    Preconditions.checkNonNull(item);
                     publishResults(item);
                 }
             });
diff --git a/app/src/main/java/acr/browser/lightning/utils/DrawableUtils.java b/app/src/main/java/acr/browser/lightning/utils/DrawableUtils.java
index 3bc3c12..19e426c 100644
--- a/app/src/main/java/acr/browser/lightning/utils/DrawableUtils.java
+++ b/app/src/main/java/acr/browser/lightning/utils/DrawableUtils.java
@@ -1,7 +1,5 @@
 package acr.browser.lightning.utils;
 
-import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -11,10 +9,8 @@ import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.AttrRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.TypedValue;
 import android.view.View;
 
 public class DrawableUtils {