From 135cf2e5720d87e340cee51577610492e7da590c Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 30 Jan 2016 22:11:45 -0500 Subject: [PATCH] Lint fixes, change nullable annotation in preference manager --- .../java/acr/browser/lightning/activity/BrowserActivity.java | 3 +-- .../acr/browser/lightning/preference/PreferenceManager.java | 2 +- 2 files changed, 2 insertions(+), 3 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 f60637f..f3de84a 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -559,8 +559,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements colorMode &= !mDarkTheme; if (!isIncognito() && !colorMode && !mDarkTheme && mWebpageBitmap != null) { changeToolbarBackground(mWebpageBitmap, null); - } else if (!isIncognito() && currentView != null && !mDarkTheme - && currentView.getFavicon() != null) { + } else if (!isIncognito() && currentView != null && !mDarkTheme) { changeToolbarBackground(currentView.getFavicon(), null); } 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 6222af3..3ebafc3 100644 --- a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java +++ b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java @@ -391,7 +391,7 @@ public class PreferenceManager { putBoolean(Name.RESTORE_LOST_TABS, enable); } - public void setSavedUrl(@NonNull String url) { + public void setSavedUrl(@Nullable String url) { putString(Name.SAVE_URL, url); }