From 80c35ac477abca4cea6f418357e11db88ba37cd1 Mon Sep 17 00:00:00 2001
From: Turtuvshin <toroo.byamba@gmail.com>
Date: Mon, 25 Mar 2024 13:10:59 +0800
Subject: [PATCH] fix bootsplash and geojson crash errors

---
 android/app/src/main/AndroidManifest.xml   | 2 +-
 android/app/src/main/res/values/styles.xml | 9 +++++----
 src/utils/Geo.js                           | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 176efcb..efb7834 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
 
   <application android:name=".MainApplication" android:label="@string/app_name"
     android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round"
-    android:theme="@style/BootTheme" android:networkSecurityConfig="@xml/network_security_config"
+    android:theme="@style/AppTheme" android:networkSecurityConfig="@xml/network_security_config"
     android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="true"
     tools:targetApi="s">
     <!-- Change the value to true to enable pop-up for in foreground on receiving remote
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ccd2264..f1fb2dc 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -8,9 +8,10 @@
     <color name="white">#FFFFFF</color>
 
     <!-- BootTheme should inherit from Theme.SplashScreen -->
-    <style name="BootTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
-        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
+
+    <style name="BootTheme" parent="Theme.BootSplash">
+        <item name="bootSplashBackground">@color/bootsplash_background</item>
+        <item name="bootSplashLogo">@mipmap/bootsplash_logo</item>
+        <item name="postBootSplashTheme">@style/AppTheme</item>
     </style>
 </resources>
diff --git a/src/utils/Geo.js b/src/utils/Geo.js
index 04a6825..18db384 100644
--- a/src/utils/Geo.js
+++ b/src/utils/Geo.js
@@ -118,7 +118,7 @@ export default class GeoUtil {
                                 resolve(position);
                             }
 
-                            googleAddress.setAttribute('position', position);
+                            googleAddress?.setAttribute('position', position);
 
                             // save last known location
                             set('location', googleAddress.all());