Bump to 1311

cylonid · Nov 23, 2022 · cb2cec7 · cb2cec7
1 parent 4fd5893
commit cb2cec7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,7 +47,7 @@ android {
         applicationId "com.cylonid.nativealpha"
         minSdkVersion 26
         targetSdkVersion 32
-        versionCode 1310
+        versionCode 1311
         versionName "1.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/assets/news/latestUpdate_de.html b/app/src/main/assets/news/latestUpdate_de.html
@@ -22,7 +22,7 @@
     <main>
       <article id="update">
         <h1>Aktuelle Neuerungen</h1>
-        <h3>Version: v1.3.0</h3>
+        <h3>Version: v1.3.1</h3>
         <ul>
           <li>Zurück-Verhalten auf div. Webseiten verbessert</li>
           <li>Unterstützung für Webseiten mit Google OAuth</li>

diff --git a/app/src/main/assets/news/latestUpdate_en.html b/app/src/main/assets/news/latestUpdate_en.html
@@ -22,7 +22,7 @@
     <main>
       <article id="update">
         <h1>News</h1>
-        <h3>Version: v1.3.0</h3>
+        <h3>Version: v1.3.1</h3>
         <ul>
           <li>Resolved unusual going back behaviour on certain websites</li>
           <li>Added support for Google OAuth-enabled sites</li>

diff --git a/app/src/main/java/com/cylonid/nativealpha/model/DataManager.java b/app/src/main/java/com/cylonid/nativealpha/model/DataManager.java
@@ -10,6 +10,7 @@
 
 import com.cylonid.nativealpha.R;
 import com.cylonid.nativealpha.util.App;
+import com.cylonid.nativealpha.util.Const;
 import com.cylonid.nativealpha.util.InvalidChecksumException;
 import com.cylonid.nativealpha.util.Utility;
 import com.google.gson.Gson;
@@ -101,14 +102,6 @@ public void saveWebAppData() {
         editor.apply();
     }
 
-    public void setDataFormat(int dataFormat) {
-        getGeneralInfo().edit().putInt(DATA_FORMAT, dataFormat).apply();
-    }
-
-    public int getDataFormat() {
-        return getGeneralInfo().getInt(DATA_FORMAT, LEGACY_DATA_FORMAT);
-    }
-
     public boolean getEulaData() {
         return getGeneralInfo().getBoolean(EULA_ACCEPTED, false);
     }
@@ -181,6 +174,7 @@ public void loadAppData() {
                 int oldDataFormat = DataVersionConverter.getDataFormat(json);
                 String currentDataFormattedJson = this.checkDataFormat(oldDataFormat, json);
                 settings = gson.fromJson(currentDataFormattedJson, new TypeToken<GlobalSettings>() {}.getType());
+                assertGlobalWebappData();
                 if(oldDataFormat != DataVersionConverter.getDataFormat(currentDataFormattedJson)) this.saveGlobalSettings();
             }
         }
@@ -336,7 +330,6 @@ private String checkDataFormat(int dataFormat, String jsonInput) {
         switch(dataFormat) {
             case LEGACY_DATA_FORMAT:
                 String convertedInput = DataVersionConverter.convertToDataFormat(jsonInput, DataVersionConverter.getLegacyTo1300Map());
-                this.setDataFormat(1300);
                 return convertedInput;
             default:
             case 1300: // Current data format => corresponding to app release version
@@ -366,19 +359,16 @@ public WebApp getPredecessor(int i) {
         }
         while (!websites.get(neighbor).isActiveEntry());
         return websites.get(neighbor);
+    }
 
-//        if (i != (websites.size() - 1)) {
-//            return websites.get(i + 1);
-//        }
-//        else
-//            return websites.get(0);
-
-//
-//        if (i != 0) {
-//            return websites.get(i - 1);
-//        }
-//        else
-//            return websites.get(websites.size() - 1);
+    private void assertGlobalWebappData() {
+        boolean override = settings.getGlobalWebApp().isOverrideGlobalSettings();
+        int container = settings.getGlobalWebApp().getContainerId();
+        if(!override || container != Const.NO_CONTAINER) {
+            settings.getGlobalWebApp().setOverrideGlobalSettings(true);
+            settings.getGlobalWebApp().setContainerId(Const.NO_CONTAINER);
+            this.saveGlobalSettings();
+        }
     }
 
 

diff --git a/app/src/main/java/com/cylonid/nativealpha/model/DataVersionConverter.java b/app/src/main/java/com/cylonid/nativealpha/model/DataVersionConverter.java
@@ -15,8 +15,8 @@ public static String convertToDataFormat(String input, Map<String, String> map)
     }
 
     public static int getDataFormat(String input) {
-        if(input.contains(DataVersionConverter.formatAsJsonKey("base_url"))) return 1000;
-        if(input.contains(DataVersionConverter.formatAsJsonKey("baseUrl"))) return 1300;
+        if(input.contains(DataVersionConverter.formatAsJsonKey("allow_js"))) return 1000;
+        if(input.contains(DataVersionConverter.formatAsJsonKey("isAllowJs"))) return 1300;
 
         return 0;
     }