From d5102b5e54db559fc97479e5d4bf51ac46ce0fbe Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 8 Sep 2015 21:10:34 -0400 Subject: [PATCH] Fixed a number of lint warnings --- .../browser/lightning/dialog/BookmarksDialogBuilder.java | 3 +-- .../lightning/fragment/BookmarkSettingsFragment.java | 5 ++--- .../acr/browser/lightning/fragment/BookmarksFragment.java | 3 +-- .../browser/lightning/fragment/GeneralSettingsFragment.java | 1 - .../java/acr/browser/lightning/object/SearchAdapter.java | 2 +- .../acr/browser/lightning/reading/ArticleTextExtractor.java | 3 +-- .../acr/browser/lightning/utils/PermissionsManager.java | 2 +- .../main/java/acr/browser/lightning/view/LightningView.java | 6 +++--- 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java index 770843e..79235cc 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java +++ b/app/src/main/java/acr/browser/lightning/dialog/BookmarksDialogBuilder.java @@ -49,7 +49,7 @@ public class BookmarksDialogBuilder { public void showLongPressedDialogForUrl(final Context context, final String url) { final HistoryItem item; if (url.startsWith(Constants.FILE) && url.endsWith(Constants.BOOKMARKS_FILENAME)) { - // TODO this in so many ways is wrong, probably we need to redesign the folder mechanism + // TODO hacky, make a better bookmark mechanism in the future final Uri uri = Uri.parse(url); final String filename = uri.getLastPathSegment(); final String folderTitle = filename.substring(0, filename.length() - Constants.BOOKMARKS_FILENAME.length() - 1); @@ -125,7 +125,6 @@ public class BookmarksDialogBuilder { @Override public void onClick(DialogInterface dialog, int which) { HistoryItem editedItem = new HistoryItem(); - String currentFolder = item.getFolder(); editedItem.setTitle(getTitle.getText().toString()); editedItem.setUrl(getUrl.getText().toString()); editedItem.setUrl(getUrl.getText().toString()); 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 d6a3ff7..d3b7e65 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java @@ -33,7 +33,6 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref @Inject BookmarkManager mBookmarkManager; private File[] mFileList; private String[] mFileNameList; - private PermissionsManager mPermissionsManager; private static final String[] REQUIRED_PERMISSIONS = new String[]{ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE @@ -51,9 +50,9 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref initPrefs(); - mPermissionsManager = PermissionsManager.getInstance(); + PermissionsManager permissionsManager = PermissionsManager.getInstance(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - mPermissionsManager.requestPermissionsIfNecessary(getActivity(), REQUIRED_PERMISSIONS); + permissionsManager.requestPermissionsIfNecessary(getActivity(), REQUIRED_PERMISSIONS); } } diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java index d05e91a..6ddc65c 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java @@ -70,7 +70,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener, private Bitmap mWebpageBitmap, mFolderBitmap; // Bookmarks - private List mBookmarks = new ArrayList<>(); + private final List mBookmarks = new ArrayList<>(); // Views private ListView mBookmarksListView; @@ -222,7 +222,6 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener, @Subscribe public void bookmarkDeleted(final BookmarkEvents.Deleted event) { - final HistoryItem item = event.item; // final int size = mBookmarks.size(); mBookmarks.remove(event.item); // assert mBookmarks.size() < size; diff --git a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java index e9ffda4..c4f93d5 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java @@ -228,7 +228,6 @@ public class GeneralSettingsFragment extends PreferenceFragment implements Prefe } private void setProxyChoice(int choice) { - ProxyUtils utils = ProxyUtils.getInstance(mActivity); switch (choice) { case Constants.PROXY_ORBOT: choice = ProxyUtils.setProxyChoice(choice, mActivity); diff --git a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java index 7430f41..3438445 100644 --- a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java +++ b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java @@ -402,7 +402,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { return connectivity.getActiveNetworkInfo(); } - //TODO Write simpler algorithm +// The old suggestions algorithm, leaving here just for reference // private List getSuggestions() { // List filteredList = new ArrayList<>(); // diff --git a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java index 1255a4f..6ce4321 100644 --- a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java +++ b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java @@ -736,8 +736,7 @@ public class ArticleTextExtractor { } private static String extractType(Document doc) { - String type = SHelper.innerTrim(doc.select("head meta[property=og:type]").attr("content")); - return type; + return SHelper.innerTrim(doc.select("head meta[property=og:type]").attr("content")); } private static String extractSitename(Document doc) { diff --git a/app/src/main/java/acr/browser/lightning/utils/PermissionsManager.java b/app/src/main/java/acr/browser/lightning/utils/PermissionsManager.java index fdebd53..c0cc104 100644 --- a/app/src/main/java/acr/browser/lightning/utils/PermissionsManager.java +++ b/app/src/main/java/acr/browser/lightning/utils/PermissionsManager.java @@ -16,7 +16,7 @@ import java.util.Set; public class PermissionsManager { private static PermissionsManager mInstance; - private Set mPendingRequests = new HashSet<>(); + private final Set mPendingRequests = new HashSet<>(); public static PermissionsManager getInstance() { if (mInstance == null) { diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java index 85907a1..84e7b74 100644 --- a/app/src/main/java/acr/browser/lightning/view/LightningView.java +++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java @@ -72,8 +72,8 @@ public class LightningView { private final Title mTitle; private WebView mWebView; private final boolean mIsIncognitoTab; - private BrowserController mBrowserController; - private GestureDetector mGestureDetector; + private final BrowserController mBrowserController; + private final GestureDetector mGestureDetector; private final Activity mActivity; private static String mHomepage; private static String mDefaultUserAgent; @@ -81,7 +81,7 @@ public class LightningView { private final Bitmap mWebpageBitmap; private static PreferenceManager mPreferences; private final AdBlock mAdBlock; - private IntentUtils mIntentUtils; + private final IntentUtils mIntentUtils; private final Paint mPaint = new Paint(); private boolean isForegroundTab; private boolean mTextReflow = false;