Fix nullptr in standard release

Author: cylonid

README.md

@@ -9,66 +9,66 @@
 
 
 ## Features
-  * Shows any website in a borderless full-screen window using Android System WebView.
-  * Create home screen shortcuts and retrieves icons in suitable resolution.
-  * Various settings (JavaScript, Cookies, adblocking, location access) can be set for every web app individually
-  * Navigation with multi-touch gestures while browsing.
-  * Opt-in adblock using an AdBlock Plus custom webview.
-  * Less memory footprint and no privacy-invading app permissions in comparison to native apps
-  * Dark mode for Android 10+
+  • Shows any website in a borderless full-screen window using Android System WebView.
+  • Create home screen shortcuts and retrieves icons in suitable resolution.
+  • Various settings (JavaScript, Cookies, adblocking, location access) can be set for every web app individually
+  • Navigation with multi-touch gestures while browsing.
+  • Opt-in adblock using an AdBlock Plus custom webview.
+  • Less memory footprint and no privacy-invading app permissions in comparison to native apps
+  • Dark mode for Android 10+
 
 ## Pro Features
-  * Sandbox containers: Web Apps are loaded in fully separated sandboxes, cookies or other data are not shared with other Web Apps
-  * Experimental dark mode also available for websites (configurable)
-  * True fullscreen mode ("immersive") without any menu bars
+  • Sandbox containers: Web Apps are loaded in fully separated sandboxes, cookies or other data are not shared with other Web Apps
+  • Experimental dark mode also available for websites (configurable)
+  • True fullscreen mode ("immersive") without any menu bars
 
 ## Download Options
 [![IzzyOnDroid Download Badge](graphics/IzzyOnDroid.png)](https://apt.izzysoft.de/fdroid/index/apk/com.cylonid.nativealpha)
-[![APK Download Badge](graphics/apk_badge.png)](https://github.com/cylonid/NativeAlphaForAndroid/releases/download/v1.01/NativeAlpha-standard-universal-release-v1.1.apk)
+[![APK Download Badge](graphics/apk_badge.png)](https://github.com/cylonid/NativeAlphaForAndroid/releases/download/v1.1/NativeAlpha-standard-universal-release-v1.1.apk)
 
 ## Latest Changes (v1.1)
-* Support for mailto and tel hyperlinks
-* Support for file picker dialogs
-* Support for DRM-protected content
-* Enhanced support for video playback
-* Enabled for usage with non-internet addresses
-* Color theme will from now on always follow system settings
+• Support for mailto and tel hyperlinks
+• Support for file picker dialogs
+• Support for DRM-protected content
+• Enhanced support for video playback
+• Enabled for usage with non-internet addresses
+• Color theme will from now on always follow system settings
 
 ## FAQ
-*Q: Why would I need this app if any mobile browser can do the same?*
+•Q: Why would I need this app if any mobile browser can do the same?•
 
 A: Mobile browsers usually only are able to create shortcuts which give a native, borderless fullscreen experience if the website has a Progressive Web App (PWA) manifest. Unfortunately, most websites do not offer this feature yet. Additionally, you cannot set different settings for different websites with an usual browser.
 
-*Q: Is this a web browser?*
+•Q: Is this a web browser?•
 
 A: No. As stated, this app relies on the system built-in Android WebView in order to display the website. For privacy reasons, you can opt to use alternative webviews such as [Bromite](https://www.bromite.org/system_web_view) on rooted phones. Always make sure to use to most recent version of any WebView implementation you use!
 
-*Q: Why isn't the sandbox feature enabled by default?*
+•Q: Why isn't the sandbox feature enabled by default?•
 
 A: The sandboxing approach is recommended for specific usage rather than general usage because it can limit the performance of the application and increase the disk usage. Therefore, use it for privacy-invasive websites or websites where you want to be logged in twice, but not for any website just because you can.
 
-*Q: Why is it not possible to find an icon for a certain website?*
+•Q: Why is it not possible to find an icon for a certain website?•
 
 A: This problem can occur due to multiple reasons. In most cases, the website does not offer a high-resolution icon. If you are a website maintainer and your website icon cannot be found, look at [RealFaviconGenerator](https://realfavicongenerator.net) for further information. If you think it should work, feel free to post the URL and I will look into it.
 
 
-*Q: In constrast to your promise, this app has a large memory footprint!*
+•Q: In constrast to your promise, this app has a large memory footprint!•
 
 A: This is because Native Alpha makes use of caching in the same way your browser app does, i.e., it saves web content locally on your device. Then it can be loaded faster if you visit the same page again. You can either delete cache regularly yourself or set the "Clear cache after usage" setting in the global settings if memory footprint is a concern for you. However, then websites will take a longer time to load because everything has to be loaded from net.
 
 ## Used libraries/resources
-* [CircularProgressBar](https://github.com/lopspower/CircularProgressBar)
-* [JSoup](https://jsoup.org/)
-* [AboutPage](https://github.com/medyo/android-about-page)
-* [AdBlock+WebView](https://github.com/adblockplus/libadblockplus-android)
-* [MovableFloatingActionButton](https://stackoverflow.com/questions/46370836/android-movable-draggable-floating-action-button-fab)
-* [Android About Page](https://github.com/medyo/android-about-page)
-* [Android Databinding](https://developer.android.com/topic/libraries/data-binding)
-* [AboutLibraries](https://github.com/mikepenz/AboutLibraries)
+• [CircularProgressBar](https://github.com/lopspower/CircularProgressBar)
+• [JSoup](https://jsoup.org/)
+• [AboutPage](https://github.com/medyo/android-about-page)
+• [AdBlock+WebView](https://github.com/adblockplus/libadblockplus-android)
+• [MovableFloatingActionButton](https://stackoverflow.com/questions/46370836/android-movable-draggable-floating-action-button-fab)
+• [Android About Page](https://github.com/medyo/android-about-page)
+• [Android Databinding](https://developer.android.com/topic/libraries/data-binding)
+• [AboutLibraries](https://github.com/mikepenz/AboutLibraries)
 
 For testing purposes:
-* [Robolectric](https://github.com/robolectric/robolectric)
-* [Espresso](https://developer.android.com/training/testing/espresso/)
+• [Robolectric](https://github.com/robolectric/robolectric)
+• [Espresso](https://developer.android.com/training/testing/espresso/)
 
 A list of used open-source libraries can also be found inside the app ("About" section).
 

app/build.gradle

@@ -47,7 +47,7 @@ android {
         applicationId "com.cylonid.nativealpha"
         minSdkVersion 26
         targetSdkVersion 31
-        versionCode 1100
+        versionCode 1101
         versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/cylonid/nativealpha/WebViewActivity.java

@@ -108,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     ProcessPhoenix.triggerRebirth(this, Utility.createWebViewIntent(webapp, this));
                 }
 
-                if (!packageName.equals(processName)) {
+                if (!packageName.equals(processName)  & SandboxManager.getInstance() != null) {
                     if (SandboxManager.getInstance().isSandboxUsedByAnotherApp(webapp)) {
                         SandboxManager.getInstance().unregisterWebAppFromSandbox(webapp.getContainerId());
                         ProcessPhoenix.triggerRebirth(this, Utility.createWebViewIntent(webapp, this));

app/src/main/java/com/cylonid/nativealpha/model/DataManager.java

@@ -95,7 +95,7 @@ public void saveWebAppData() {
         String json = gson.toJson(websites);
         editor.putString(shared_pref_webappdata, json);
         editor.putInt(shared_pref_max_id, max_assigned_ID);
-        editor.putInt(shared_pref_next_container, SandboxManager.getInstance().getNextContainer());
+        if (SandboxManager.getInstance() != null) editor.putInt(shared_pref_next_container, SandboxManager.getInstance().getNextContainer());
         editor.apply();
     }
 
@@ -134,7 +134,7 @@ public void loadAppData() {
         }
 
         max_assigned_ID = appdata.getInt(shared_pref_max_id, max_assigned_ID);
-        SandboxManager.getInstance().setNextContainer(appdata.getInt(shared_pref_next_container, 0));
+        if (SandboxManager.getInstance() != null) SandboxManager.getInstance().setNextContainer(appdata.getInt(shared_pref_next_container, 0));
 
         //Check legacy global settings
         if (appdata.getBoolean(shared_pref_global_settings_json, false)) {