From 4ab7edf90b517c97258f8cbefd5f19abb3d53f42 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 1 Mar 2023 07:01:17 +0200
Subject: [PATCH] Separate test build apk from overriding the original app

---
 .github/workflows/pr_test_build.yml |  6 +++++-
 scripts/android/app_env.sh          | 14 ++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index 759aa218d..bd158a84d 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -35,7 +35,11 @@ jobs:
           git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
           cd cake_wallet/scripts/android/
           ./install_ndk.sh
-          source ./app_env.sh cakewallet.test
+          source ./app_env.sh cakewallet
+          APP_ANDROID_PACKAGE="com.cakewallet.test"
+          export APP_ANDROID_PACKAGE="com.cakewallet.test"
+          set APP_ANDROID_PACKAGE="com.cakewallet.test"
+          env APP_ANDROID_PACKAGE="com.cakewallet.test"
           ./app_config.sh
 
       - name: Cache Externals
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index c456f8466..d2bee1773 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -9,9 +9,8 @@ APP_ANDROID_PACKAGE=""
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
 HAVEN="haven"
-CAKEWALLET_TEST="cakewallet.test"
 
-TYPES=($MONERO_COM $CAKEWALLET $HAVEN $CAKEWALLET_TEST)
+TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
@@ -32,8 +31,6 @@ HAVEN_BUILD_NUMBER=1
 HAVEN_BUNDLE_ID="com.cakewallet.haven"
 HAVEN_PACKAGE="com.cakewallet.haven"
 
-CAKEWALLET_TEST_PACKAGE="com.cakewallet.test"
-
 if ! [[ " ${TYPES[*]} " =~ " ${APP_ANDROID_TYPE} " ]]; then
     echo "Wrong app type."
     return 1 2>/dev/null
@@ -62,13 +59,6 @@ case $APP_ANDROID_TYPE in
 		APP_ANDROID_BUNDLE_ID=$HAVEN_BUNDLE_ID
 		APP_ANDROID_PACKAGE=$HAVEN_PACKAGE
 		;;
-	$CAKEWALLET_TEST)
-		APP_ANDROID_NAME=$CAKEWALLET_NAME
-		APP_ANDROID_VERSION=$CAKEWALLET_VERSION
-		APP_ANDROID_BUILD_NUMBER=$CAKEWALLET_BUILD_NUMBER
-		APP_ANDROID_BUNDLE_ID=$CAKEWALLET_BUNDLE_ID
-		APP_ANDROID_PACKAGE=CAKEWALLET_TEST_PACKAGE
-		;;
 esac
 
 export APP_ANDROID_TYPE
@@ -76,4 +66,4 @@ export APP_ANDROID_NAME
 export APP_ANDROID_VERSION
 export APP_ANDROID_BUILD_NUMBER
 export APP_ANDROID_BUNDLE_ID
-export APP_ANDROID_PACKAGE
+export APP_ANDROID_PACKAGE
\ No newline at end of file