From 1afd00fa3ec9c3e009c03706bb1fb9e712dc8fb3 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Wed, 5 Jan 2022 17:51:26 +0200
Subject: [PATCH] Fixes for package name for android app

---
 android/app/build.gradle                 | 3 +--
 android/app/src/main/AndroidManifest.xml | 2 +-
 scripts/android/app_config.sh            | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e4524109d..4a2948cb4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -44,8 +44,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        manifestPlaceholders = [APP_NAME: System.getenv('APP_ANDROID_NAME'),
-                                APP_PACKAGE: System.getenv('APP_ANDROID_PACKAGE')]
+        manifestPlaceholders = [APP_NAME: System.getenv('APP_ANDROID_NAME')]
 
         externalNativeBuild {
             cmake {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 81418644b..18a2c2318 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${APP_PACKAGE}">
+    package="__APP_PACKAGE__">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
diff --git a/scripts/android/app_config.sh b/scripts/android/app_config.sh
index a87883e3b..9b01e3a29 100755
--- a/scripts/android/app_config.sh
+++ b/scripts/android/app_config.sh
@@ -6,3 +6,4 @@ if [ -z "$APP_ANDROID_TYPE" ]; then
 fi
 
 sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./../../pubspec.yaml 
+sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./../../android/app/src/main/AndroidManifest.xml
\ No newline at end of file