From 4649d4b0b45c2338c523a32826a987e58f6aa93f Mon Sep 17 00:00:00 2001 From: anthony restaino Date: Sat, 29 Apr 2017 17:19:55 -0400 Subject: [PATCH] Inferring nullity --- .../acr/browser/lightning/activity/IncognitoActivity.java | 3 ++- .../java/acr/browser/lightning/activity/MainActivity.java | 1 + .../main/java/acr/browser/lightning/activity/TabsManager.java | 1 + app/src/main/java/acr/browser/lightning/app/BrowserApp.java | 2 +- .../java/acr/browser/lightning/constant/BookmarkPage.java | 2 +- .../acr/browser/lightning/database/BookmarkLocalSync.java | 1 + .../acr/browser/lightning/dialog/LightningDialogBuilder.java | 4 ++-- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java b/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java index a6ab3a8..9f085b5 100644 --- a/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java @@ -17,6 +17,7 @@ import acr.browser.lightning.R; @SuppressWarnings("deprecation") public class IncognitoActivity extends BrowserActivity { + @NonNull @Override public Completable updateCookiePreference() { return Completable.create(new CompletableAction() { @@ -33,7 +34,7 @@ public class IncognitoActivity extends BrowserActivity { } @Override - public boolean onCreateOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(@NonNull Menu menu) { getMenuInflater().inflate(R.menu.incognito, menu); return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/acr/browser/lightning/activity/MainActivity.java b/app/src/main/java/acr/browser/lightning/activity/MainActivity.java index a4f6c35..3220d65 100644 --- a/app/src/main/java/acr/browser/lightning/activity/MainActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/MainActivity.java @@ -17,6 +17,7 @@ import acr.browser.lightning.R; @SuppressWarnings("deprecation") public class MainActivity extends BrowserActivity { + @NonNull @Override public Completable updateCookiePreference() { return Completable.create(new CompletableAction() { diff --git a/app/src/main/java/acr/browser/lightning/activity/TabsManager.java b/app/src/main/java/acr/browser/lightning/activity/TabsManager.java index f72462a..1cc5623 100644 --- a/app/src/main/java/acr/browser/lightning/activity/TabsManager.java +++ b/app/src/main/java/acr/browser/lightning/activity/TabsManager.java @@ -111,6 +111,7 @@ public class TabsManager { * @param intent the intent that started the browser activity. * @param incognito whether or not we are in incognito mode. */ + @NonNull public synchronized Completable initializeTabs(@NonNull final Activity activity, @Nullable final Intent intent, final boolean incognito) { diff --git a/app/src/main/java/acr/browser/lightning/app/BrowserApp.java b/app/src/main/java/acr/browser/lightning/app/BrowserApp.java index 8b66e75..28f4350 100644 --- a/app/src/main/java/acr/browser/lightning/app/BrowserApp.java +++ b/app/src/main/java/acr/browser/lightning/app/BrowserApp.java @@ -60,7 +60,7 @@ public class BrowserApp extends Application { Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { @Override - public void uncaughtException(Thread thread, Throwable ex) { + public void uncaughtException(Thread thread, @NonNull Throwable ex) { if (BuildConfig.DEBUG) { FileUtils.writeCrashToStorage(ex); 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 b44d561..bdf878d 100644 --- a/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java +++ b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java @@ -73,7 +73,7 @@ public final class BookmarkPage { @Inject Application mApp; @Inject BookmarkManager mManager; - private final Bitmap mFolderIcon; + @NonNull private final Bitmap mFolderIcon; @NonNull private final String mTitle; public BookmarkPage(@NonNull Activity activity) { 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 f2be170..7511b61 100644 --- a/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java +++ b/app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java @@ -43,6 +43,7 @@ public class BookmarkLocalSync { mContext = context; } + @NonNull private List getBookmarksFromContentUri(String contentUri) { List list = new ArrayList<>(); Cursor cursor = getBrowserCursor(contentUri); diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java index bbad8e9..6d4edce 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java @@ -181,7 +181,7 @@ public class LightningDialogBuilder { R.string.hint_title, item.getTitle(), R.string.action_ok, new BrowserDialog.EditorListener() { @Override - public void onClick(String text) { + public void onClick(@NonNull String text) { if (!TextUtils.isEmpty(text)) { final String oldTitle = item.getTitle(); final HistoryItem editedItem = new HistoryItem(); @@ -274,7 +274,7 @@ public class LightningDialogBuilder { }); } - public void showLongPressLinkDialog(@NonNull final Activity activity, final String url) { + public void showLongPressLinkDialog(@NonNull final Activity activity, @NonNull final String url) { BrowserDialog.show(activity, url, new BrowserDialog.Item(R.string.dialog_open_new_tab) { @Override