Merge pull request #14 from DerGoogler/1.6.1

1.6.1

Author: DerGoogler

.gitignore

@@ -1,4 +1,11 @@
 package.json
 package-lock.json
 node_modules/
-__pycache__/
+__pycache__/
+
+# Ignore www bundles
+www/bundle/*
+www/files/*
+
+Browser/*
+!Browser/.gitkeep

Android/.gitignore

@@ -14,7 +14,7 @@ gen/
 *.cxx
 app/.cxx/*
 app/src/main/assets/www/*
-!app/src/main/assets/www/index.html
+!/app/src/main/assets/**/.gitkeep
 
 # Local configuration file (sdk path, etc)
 local.properties

Android/app/build.gradle

@@ -14,8 +14,17 @@ android {
         applicationId 'com.dergoogler.mmrl'
         minSdk 26
         targetSdk 33
-        versionName "1.6.0"
-        versionCode 160
+        versionName '1.6.1'
+        versionCode 161
+        externalNativeBuild {
+            cmake {
+                cppFlags "-llog"
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+        ndk {
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+        }
     }
     buildTypes {
         release {
@@ -34,11 +43,19 @@ android {
             buildConfigField "String", "BASE_URL", "\"leer\""
         }
     }
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+        }
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
+        jniLibs {
+            keepDebugSymbols += ['*/armeabi/*.so', '*/armeabi-v7a/*.so', '*/arm64-v8a/*.so', '*/mips/*.so', '*/mips64/*.so', '*/x86/*.so', '*/x86_64/*.so']
+        }
         resources {
             excludes += ['META-INF/DEPENDENCIES.txt', 'META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/MANIFEST.MF', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/ASL2.0']
         }

Android/app/proguard-rules.pro

@@ -18,4 +18,7 @@
 
 # These clases contain references to cordova webView
 -keep class org.apache.cordova.** {*; }
--keep class org.apache.cordova.*
+-keep class org.apache.cordova.*
+
+-keep class org.apache.cordova.** { *; }
+-keep public class * extends org.apache.cordova.CordovaPlugin

Android/app/src/main/AndroidManifest.xml

@@ -20,10 +20,11 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="33">
+        tools:targetApi="q">
         <activity
             android:name="com.dergoogler.mmrl.MainActivity"
             android:configChanges="orientation|screenSize"
@@ -32,21 +33,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="mmrl" />
-
-                <data
-                    android:host="repo.dergoogler.com"
-                    android:scheme="https" />
-                <data
-                    android:host="repo.dergoogler.com"
-                    android:scheme="http" />
-            </intent-filter>
         </activity>
     </application>
 </manifest>