From b3ce52c79d9a01bf157eee0ccfa2830ec4ab34b3 Mon Sep 17 00:00:00 2001
From: Razvan Stoenescu <razvan.stoenescu@gmail.com>
Date: Thu, 19 Sep 2024 16:11:44 +0300
Subject: [PATCH] chore(app-vite/app-webpack): simplify cleartext call for
 Cordova

---
 app-vite/lib/modes/cordova/android-cleartext.js    | 8 +++-----
 app-vite/lib/modes/cordova/cordova-builder.js      | 2 +-
 app-vite/lib/modes/cordova/cordova-devserver.js    | 2 +-
 app-webpack/lib/modes/cordova/android-cleartext.js | 8 +++-----
 app-webpack/lib/modes/cordova/cordova-builder.js   | 2 +-
 app-webpack/lib/modes/cordova/cordova-devserver.js | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app-vite/lib/modes/cordova/android-cleartext.js b/app-vite/lib/modes/cordova/android-cleartext.js
index 88d9d51ad17..3a7859ac033 100644
--- a/app-vite/lib/modes/cordova/android-cleartext.js
+++ b/app-vite/lib/modes/cordova/android-cleartext.js
@@ -4,11 +4,9 @@ import fs from 'node:fs'
  * To be used for Capacitor v1 & v2 only
  */
 
-export function fixAndroidCleartext (appPaths, mode, action) {
-  const androidManifestPath = appPaths.resolve[ mode ](
-    mode === 'cordova'
-      ? 'platforms/android/app/src/main/AndroidManifest.xml'
-      : 'android/app/src/main/AndroidManifest.xml'
+export function fixAndroidCleartext (appPaths, action) {
+  const androidManifestPath = appPaths.resolve.cordova(
+    'platforms/android/app/src/main/AndroidManifest.xml'
   )
 
   if (fs.existsSync(androidManifestPath) === false) return
diff --git a/app-vite/lib/modes/cordova/cordova-builder.js b/app-vite/lib/modes/cordova/cordova-builder.js
index d5bcffa7d0b..add62057518 100644
--- a/app-vite/lib/modes/cordova/cordova-builder.js
+++ b/app-vite/lib/modes/cordova/cordova-builder.js
@@ -69,7 +69,7 @@ export class QuasarModeBuilder extends AppBuilder {
     const { appPaths } = this.ctx
 
     if (target === 'android') {
-      fixAndroidCleartext(appPaths, 'cordova', 'remove')
+      fixAndroidCleartext(appPaths, 'remove')
     }
 
     const cordovaContext = {
diff --git a/app-vite/lib/modes/cordova/cordova-devserver.js b/app-vite/lib/modes/cordova/cordova-devserver.js
index 07687af1682..ee8e726b852 100644
--- a/app-vite/lib/modes/cordova/cordova-devserver.js
+++ b/app-vite/lib/modes/cordova/cordova-devserver.js
@@ -26,7 +26,7 @@ export class QuasarModeDevserver extends AppDevserver {
     this.#target = this.ctx.targetName
 
     if (this.#target === 'android') {
-      fixAndroidCleartext(this.ctx.appPaths, 'cordova', 'add')
+      fixAndroidCleartext(this.ctx.appPaths, 'add')
     }
 
     onShutdown(() => {
diff --git a/app-webpack/lib/modes/cordova/android-cleartext.js b/app-webpack/lib/modes/cordova/android-cleartext.js
index e199b4ac13d..2714f2b2bc4 100644
--- a/app-webpack/lib/modes/cordova/android-cleartext.js
+++ b/app-webpack/lib/modes/cordova/android-cleartext.js
@@ -1,10 +1,8 @@
 const fs = require('node:fs')
 
-module.exports.fixAndroidCleartext = function fixAndroidCleartext (appPaths, mode, action) {
-  const androidManifestPath = appPaths.resolve[ mode ](
-    mode === 'cordova'
-      ? 'platforms/android/app/src/main/AndroidManifest.xml'
-      : 'android/app/src/main/AndroidManifest.xml'
+module.exports.fixAndroidCleartext = function fixAndroidCleartext (appPaths, action) {
+  const androidManifestPath = appPaths.resolve.cordova(
+    'platforms/android/app/src/main/AndroidManifest.xml'
   )
 
   if (fs.existsSync(androidManifestPath) === false) return
diff --git a/app-webpack/lib/modes/cordova/cordova-builder.js b/app-webpack/lib/modes/cordova/cordova-builder.js
index 50cf7f79a48..92a98acf63c 100644
--- a/app-webpack/lib/modes/cordova/cordova-builder.js
+++ b/app-webpack/lib/modes/cordova/cordova-builder.js
@@ -50,7 +50,7 @@ module.exports.QuasarModeBuilder = class QuasarModeBuilder extends AppBuilder {
     const { appPaths } = this.ctx
 
     if (target === 'android') {
-      fixAndroidCleartext(appPaths, 'cordova', 'remove')
+      fixAndroidCleartext(appPaths, 'remove')
     }
 
     const cordovaContext = {
diff --git a/app-webpack/lib/modes/cordova/cordova-devserver.js b/app-webpack/lib/modes/cordova/cordova-devserver.js
index b46db65af5c..6a7e0a8a4d4 100644
--- a/app-webpack/lib/modes/cordova/cordova-devserver.js
+++ b/app-webpack/lib/modes/cordova/cordova-devserver.js
@@ -27,7 +27,7 @@ module.exports.QuasarModeDevserver = class QuasarModeDevserver extends AppDevser
     this.#target = this.ctx.targetName
 
     if (this.#target === 'android') {
-      fixAndroidCleartext(this.ctx.appPaths, 'cordova', 'add')
+      fixAndroidCleartext(this.ctx.appPaths, 'add')
     }
 
     onShutdown(() => {