Merge branch 'master' into ios-contact-copy

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 35
-        versionName "1.0.2"
+        versionCode 39
+        versionName "1.0.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -64,6 +64,14 @@ android {
             }
         }
     }
+    packagingOptions {
+        jniLibs {
+            pickFirsts += ['**/lib/x86_64/libbarhopper_v3.so', '**/lib/x86_64/libimage_processing_util_jni.so', '**/lib/x86_64/libsqlcipher.so']
+        }
+    }
+
+    // Configure for 16 KB page size compatibility
+
 
     // Enable bundle builds (without which it doesn't work right for bundleDebug vs bundleRelease)
     bundle {

android/app/src/main/assets/capacitor.config.json

@@ -57,13 +57,14 @@
 		]
 	},
 	"android": {
-		"allowMixedContent": false,
+		"allowMixedContent": true,
 		"captureInput": true,
 		"webContentsDebuggingEnabled": false,
 		"allowNavigation": [
 			"*.timesafari.app",
 			"*.jsdelivr.net",
-			"api.endorser.ch"
+			"api.endorser.ch",
+			"10.0.2.2:3000"
 		]
 	},
 	"electron": {