Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

.github/workflows/nightly-build.yml

@@ -172,28 +172,28 @@
           run: |
              node utils/storage_manager.mjs y
              npm run build paid dev apk
-             mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/app-debug-normal.apk
+             mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/acode-debug-normal-$UPDATED_VERSION.apk
              echo "VERSION: $UPDATED_VERSION" >> $GITHUB_STEP_SUMMARY
              
         - name: Upload APK Artifact
           uses: actions/upload-artifact@v7
           with:
             name: app-debug-${{ env.GIT_COMMIT }}
-            path: /tmp/app-debug-normal.apk
+            path: /tmp/acode-debug-normal-${{ env.UPDATED_VERSION }}.apk
 
         - name: Run npm build paid dev apk fdroid (for F-Droid)
           if: ${{ !inputs.is_PR }}
           run: |
             node utils/storage_manager.mjs y
             npm run build paid dev apk fdroid
-            mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/app-debug-fdroid.apk
+            mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/acode-debug-fdroid-$UPDATED_VERSION.apk
         
         - name: Upload APK Artifact
           uses: actions/upload-artifact@v7
           if: ${{ !inputs.is_PR }}
           with:
             name: app-debug-fdroid-${{ env.GIT_COMMIT }}
-            path: /tmp/app-debug-fdroid.apk
+            path: /tmp/acode-debug-fdroid-${{ env.UPDATED_VERSION }}.apk
 
         - name: remove keystore and build.json
           run: |
@@ -251,8 +251,8 @@
             name: ${{ env.UPDATED_VERSION }}
             tag_name: ${{ env.UPDATED_VERSION }} 
             files: |
-              /tmp/app-debug-normal.apk
-              /tmp/app-debug-fdroid.apk
+              /tmp/acode-debug-normal-$UPDATED_VERSION.apk
+              /tmp/acode-debug-fdroid-$UPDATED_VERSION.apk
             body: |
               Automated Nightly (pre-release) Releases for Today
               

config.xml

@@ -38,21 +38,31 @@
         <preference name="GradlePluginKotlinEnabled" value="true" />
         <preference name="android-targetSdkVersion" value="36" />
 
-
+        <!-- Cordova does not merge this unless both of these are present -->
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application 
+                android:usesCleartextTraffic="true"
                 android:networkSecurityConfig="@xml/network_security_config"
                 android:hardwareAccelerated="true"
                 android:largeHeap="true"
                 android:requestLegacyExternalStorage="true"
                 android:enableOnBackInvokedCallback="false" />
         </edit-config>
 
+        <!-- Cordova does not merge this unless both of these are present -->
+        <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
+            <application android:networkSecurityConfig="@xml/network_security_config" />
+            <application android:usesCleartextTraffic="true" />
+            <application android:hardwareAccelerated="true" />
+            <application android:largeHeap="true" />
+            <application android:requestLegacyExternalStorage="true"/>
+            <application android:enableOnBackInvokedCallback="false" />
+        </edit-config>
+
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
             <activity android:resizeableActivity="true" />
         </edit-config>
 
-
         <config-file parent="./application/activity" target="AndroidManifest.xml">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

res/android/xml/network_security_config.xml

@@ -5,11 +5,4 @@
       <certificates src="system" />
     </trust-anchors>
   </base-config>
-
-  <domain-config cleartextTrafficPermitted="true">
-    <domain includeSubdomains="true">*</domain>
-    <domain includeSubdomains="true">localhost</domain>
-  </domain-config>
-</network-security-config>
-
-<!-- This file is used to allow the app to load http://localhost in in-app browser, used to run project. DO NOT remove-->
+</network-security-config>