From feea0c137d92270f39ae312a51575fd97d258439 Mon Sep 17 00:00:00 2001 From: Bryce McMath <32586431+bryce-mcmath@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:36:26 -0800 Subject: [PATCH 1/2] fix: prevent react-native-screens from causing crashes on android (#2268) Signed-off-by: Bryce McMath --- .../src/main/java/ca/bc/gov/BCWallet/MainActivity.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java b/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java index 2ced4ce82..1c5b0ff5b 100644 --- a/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java +++ b/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java @@ -7,9 +7,17 @@ import androidx.core.app.NotificationManagerCompat; import android.content.Intent; import android.content.res.Configuration; +import android.os.Bundle; public class MainActivity extends ReactActivity { + // react-native-screens override + // https://github.com/software-mansion/react-native-screens#android + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(null); + } + /** * Detects changes in device orientation and sends them to JavaScript by broadcasting an event. * This is used to support the camera on different tablet orientations. From c4298f7f0908e1d441d3cccab694d13fcfea7055 Mon Sep 17 00:00:00 2001 From: "Jason C. Leach" Date: Thu, 14 Nov 2024 15:57:03 -0800 Subject: [PATCH 2/2] fix: try change for icon (#2272) Signed-off-by: Jason C. Leach --- app/ios/AriesBifold.xcodeproj/project.pbxproj | 4 ++-- app/ios/AriesBifold/AppDelegate.m | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/ios/AriesBifold.xcodeproj/project.pbxproj b/app/ios/AriesBifold.xcodeproj/project.pbxproj index ee5fd0617..368e81276 100644 --- a/app/ios/AriesBifold.xcodeproj/project.pbxproj +++ b/app/ios/AriesBifold.xcodeproj/project.pbxproj @@ -534,7 +534,7 @@ baseConfigurationReference = 6228B39BEBDEB177D0C79D99 /* Pods-AriesBifold.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements; CURRENT_PROJECT_VERSION = 444; @@ -573,7 +573,7 @@ baseConfigurationReference = CD48035C19AD8C07DE719567 /* Pods-AriesBifold.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements; CURRENT_PROJECT_VERSION = 1; diff --git a/app/ios/AriesBifold/AppDelegate.m b/app/ios/AriesBifold/AppDelegate.m index 437479977..4000604f0 100644 --- a/app/ios/AriesBifold/AppDelegate.m +++ b/app/ios/AriesBifold/AppDelegate.m @@ -17,6 +17,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // They will be passed down to the ViewController used by React Native. self.initialProps = @{}; + // Because certain file operations can reset resource values, we + // excluded file’s resource values each time the application starts. [self excludeDotAFJFolderFromBackup]; return [super application:application didFinishLaunchingWithOptions:launchOptions]; @@ -68,8 +70,10 @@ - (void)excludeDotAFJFolderFromBackup { forKey:NSURLIsExcludedFromBackupKey error:&error]; - if (!success) { - NSLog(@"Error excluding folder %@ from backup: %@", folderName, error); + if (success) { + NSLog(@"Excluded folder %@ from backup.", folderName); + } else { + NSLog(@"Error excluding folder %@ from backup: %@", folderName, error); } }