V2.6

Fix keep screen on Fix rare crash
woheller69 · Feb 11, 2024 · 8ac78c1 · 8ac78c1
1 parent e0d13fd
commit 8ac78c1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "org.woheller69.browser"
         minSdkVersion 29
         targetSdkVersion 33
-        versionCode 2500
-        versionName "2.5"
+        versionCode 2600
+        versionName "2.6"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.java b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.java
@@ -213,13 +213,15 @@ public void onPause(){
         for (int i=0; i<BrowserContainer.size();i++){
             String url = ((NinjaWebView) (BrowserContainer.get(i))).getUrl();
             String settings = ((NinjaWebView) (BrowserContainer.get(i))).getSettingsBackup();
-            if (!url.equals(URL_ABOUT_BLANK)) {  //do not save empty tabs (about:blank)
-                if (currentAlbumController == BrowserContainer.get(i)) {
-                    openTabs.add(0, url);
-                    openTabSettings.add(0, settings);
-                } else {
-                    openTabs.add(url);
-                    openTabSettings.add(settings);
+            if (url != null) {
+                if (!url.equals(URL_ABOUT_BLANK)) {  //do not save empty tabs (about:blank)
+                    if (currentAlbumController == BrowserContainer.get(i)) {
+                        openTabs.add(0, url);
+                        openTabSettings.add(0, settings);
+                    } else {
+                        openTabs.add(url);
+                        openTabSettings.add(settings);
+                    }
                 }
             }
         }
@@ -339,7 +341,7 @@ public void onResume() {
         super.onResume();
         HelperUnit.initTheme(this);
         initTabDialog();
-
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         ScriptUnit.initScripts(this);
 
         //disable Microphone, Camera, and Location if permissions have been withdrawn
@@ -1361,7 +1363,6 @@ public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callb
                         FrameLayout.LayoutParams.MATCH_PARENT
                 ));
 
-        customView.setKeepScreenOn(true);
         ((View) currentAlbumController).setVisibility(View.GONE);
         setCustomFullscreen(true);
 
@@ -1379,7 +1380,6 @@ public void onHideCustomView() {
         FrameLayout decorView = (FrameLayout) getWindow().getDecorView();
         decorView.removeView(fullscreenHolder);
 
-        customView.setKeepScreenOn(false);
         ((View) currentAlbumController).setVisibility(View.VISIBLE);
         setCustomFullscreen(false);
 

diff --git a/fastlane/metadata/android/en-US/changelogs/2600.txt b/fastlane/metadata/android/en-US/changelogs/2600.txt
@@ -0,0 +1,2 @@
+Translations
+Bugfixes