From 07d389633388873191b0cdc0c3ec13f11a6db2f3 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 21 Oct 2022 17:19:41 -0700 Subject: [PATCH 1/2] fix: http request cache bug --- .../android/app/build.gradle | 4 ++-- .../app/src/main/assets/capacitor.config.json | 5 ++++- .../extension-app-native/capacitor.config.ts | 19 +++++++++++-------- libs/environments/src/version.ts | 2 +- 4 files changed, 18 insertions(+), 12 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 index 23cb338e9..36d38fcd7 100644 --- 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 index a422e4167..47f57da62 100644 --- 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 index cca67b01d..896dbdc8b 100644 --- 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 index afa42c197..9a20dee12 100644 --- 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', }; From 842854cc6f5dd1d5d40a7a8259e057027fc1fdbf Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 21 Oct 2022 17:19:48 -0700 Subject: [PATCH 2/2] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fcf37d026..3706dabf6 100644 --- 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",