Workaround scrolling bug in WebView >= 99.0.4844.48. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / activities / BookmarksActivity.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
index 20dd59652b47652000f33e71349b57da30627827..cea440a4239b0eb78f9bbf60c2ea856240e49a5c 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
@@ -1,20 +1,20 @@
 /*
- * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.activities;
@@ -24,7 +24,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -1107,45 +1106,34 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
         // bookmarksListView is 0 indexed.
         int lastBookmarkDatabaseId = (int) bookmarksListView.getItemIdAtPosition(bookmarksListView.getCount() - 1);
 
-        // Get the current theme status.
-        int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
-        // Update the move bookmark up `MenuItem`.
+        // Update the move bookmark up menu item.
         if (selectedBookmarkDatabaseId == firstBookmarkDatabaseId) {  // The selected bookmark is in the first position.
-            // Disable the move bookmark up `MenuItem`.
+            // Disable the move bookmark up menu item.
             moveBookmarkUpMenuItem.setEnabled(false);
 
-            //  Set the move bookmark up icon to be ghosted.
+            //  Set the icon.
             moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_disabled);
         } else {  // The selected bookmark is not in the first position.
             // Enable the move bookmark up menu item.
             moveBookmarkUpMenuItem.setEnabled(true);
 
             // Set the icon according to the theme.
-            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_enabled_night);
-            } else {
-                moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_enabled_day);
-            }
+            moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_enabled);
         }
 
-        // Update the move bookmark down `MenuItem`.
+        // Update the move bookmark down menu item.
         if (selectedBookmarkDatabaseId == lastBookmarkDatabaseId) {  // The selected bookmark is in the last position.
-            // Disable the move bookmark down `MenuItem`.
+            // Disable the move bookmark down menu item.
             moveBookmarkDownMenuItem.setEnabled(false);
 
-            // Set the move bookmark down icon to be ghosted.
+            // Set the icon.
             moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_disabled);
         } else {  // The selected bookmark is not in the last position.
-            // Enable the move bookmark down `MenuItem`.
+            // Enable the move bookmark down menu item.
             moveBookmarkDownMenuItem.setEnabled(true);
 
-            // Set the icon according to the theme.
-            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_enabled_night);
-            } else {
-                moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_enabled_day);
-            }
+            // Set the icon.
+            moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_enabled);
         }
     }