Merge pull request #79 from e-picsa/fix/http-req-caching

Fix/http req caching
e-picsa · Oct 22, 2022 · 00568e1 · 00568e1
2 parents 41f47a1 + 842854c
commit 00568e1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3012004
-        versionName "3.12.4"
+        versionCode 3012005
+        versionName "3.12.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json b/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json
@@ -21,5 +21,8 @@
 		"@capacitor-community/firebase-analytics",
 		"@capacitor-community/firebase-crashlytics",
 		"@capacitor-firebase/performance"
-	]
+	],
+	"server": {
+		"cleartext": true
+	}
 }
diff --git a/apps/picsa-apps/extension-app-native/capacitor.config.ts b/apps/picsa-apps/extension-app-native/capacitor.config.ts
@@ -29,14 +29,17 @@ const config: CapacitorConfig = {
     '@capacitor-community/firebase-crashlytics',
     '@capacitor-firebase/performance',
   ],
-  /**
-   * uncomment and replace with local ip to serve live-reload
-   * TODO - could create script to automatially toggle when serving native
-   **/
-  // server: {
-  //   url: 'http://192.168.50.67:4200',
-  //   cleartext: true,
-  // },
+  server: {
+    /** Uncomment and replace with local ip to serve live-reload */
+
+    // url: 'http://192.168.50.67:4200',
+
+    /**
+     * NOTE - cleartext still required for caching fetch requests even when not serving locally
+     * https://stackoverflow.com/questions/60906953/ionic-5-capacitor-err-cleartext-not-permitted-in-android
+     */
+    cleartext: true,
+  },
 };
 
 export default config;
diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts
@@ -4,5 +4,5 @@ import packageJson from '../../../package.json';
 
 export const APP_VERSION = {
   number: packageJson.version,
-  date: '2022-10-21',
+  date: '2022-10-22',
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "picsa-apps",
-  "version": "3.12.4",
+  "version": "3.12.5",
   "license": "See LICENSE",
   "scripts": {
     "ng": "nx",