mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 15:04:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Observers were not triggered

Browse source
This commit is contained in:
Marcos Rodriguez Velez 2024-05-19 19:35:12 -04:00
parent f9e7e454aa
commit 465d2505b3
No known key found for this signature in database
GPG key ID: 6030B2F48CCE86D7
1 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ios/BlueWallet/AppDelegate.mm
View file

@ -9,12 +9,11 @@
#import "EventEmitter.h" #import "EventEmitter.h"
#import <React/RCTRootView.h> #import <React/RCTRootView.h>
#import <Bugsnag/Bugsnag.h> #import <Bugsnag/Bugsnag.h>
#import "BlueWallet-Swift.h" #import "BlueWallet-Swift.h"
@interface AppDelegate() <UNUserNotificationCenterDelegate> @interface AppDelegate() <UNUserNotificationCenterDelegate>
@property (nonatomic, strong) UIView *launchScreenView; @property (nonatomic, strong) NSUserDefaults *userDefaultsGroup;
@end @end
@ -23,8 +22,9 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{ {
[self clearFilesIfNeeded]; [self clearFilesIfNeeded];
NSUserDefaults *group = [[NSUserDefaults alloc] initWithSuiteName:@"group.io.bluewallet.bluewallet"]; self.userDefaultsGroup = [[NSUserDefaults alloc] initWithSuiteName:@"group.io.bluewallet.bluewallet"];
NSString *isDoNotTrackEnabled = [group stringForKey:@"donottrack"];
NSString *isDoNotTrackEnabled = [self.userDefaultsGroup stringForKey:@"donottrack"];
if (![isDoNotTrackEnabled isEqualToString:@"1"]) { if (![isDoNotTrackEnabled isEqualToString:@"1"]) {
// Set the appType based on the current platform // Set the appType based on the current platform
#if TARGET_OS_MACCATALYST #if TARGET_OS_MACCATALYST
@ -67,14 +67,13 @@
#endif #endif
} }
- (void)observeValueForKeyPath:(NSString *) keyPath ofObject:(id) object change:(NSDictionary *) change context:(void *) context - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
{ {
if([keyPath isEqual:@"deviceUID"] || [keyPath isEqual:@"deviceUIDCopy"]) if ([keyPath isEqualToString:@"deviceUID"] || [keyPath isEqualToString:@"deviceUIDCopy"]) {
{ [self copyDeviceUID];
[self copyDeviceUID];
} }
NSArray *keys = @[ NSArray *keys = @[
@"WidgetCommunicationAllWalletsSatoshiBalance", @"WidgetCommunicationAllWalletsSatoshiBalance",
@"WidgetCommunicationAllWalletsLatestTransactionTime", @"WidgetCommunicationAllWalletsLatestTransactionTime",
@"WidgetCommunicationDisplayBalanceAllowed", @"WidgetCommunicationDisplayBalanceAllowed",
@ -92,43 +91,42 @@
} }
- (void)copyDeviceUID { - (void)copyDeviceUID {
[[NSUserDefaults standardUserDefaults] addObserver:self [NSUserDefaults.standardUserDefaults addObserver:self
forKeyPath:@"deviceUID" forKeyPath:@"deviceUID"
options:NSKeyValueObservingOptionNew options:NSKeyValueObservingOptionNew
context:NULL]; context:NULL];
[[NSUserDefaults standardUserDefaults] addObserver:self [NSUserDefaults.standardUserDefaults addObserver:self
forKeyPath:@"deviceUIDCopy" forKeyPath:@"deviceUIDCopy"
options:NSKeyValueObservingOptionNew options:NSKeyValueObservingOptionNew
context:NULL]; context:NULL];
NSString *deviceUID = [[NSUserDefaults standardUserDefaults] stringForKey:@"deviceUID"]; NSString *deviceUID = [NSUserDefaults.standardUserDefaults stringForKey:@"deviceUID"];
if (deviceUID && deviceUID.length > 0) { if (deviceUID && deviceUID.length > 0) {
[NSUserDefaults.standardUserDefaults setValue:deviceUID forKey:@"deviceUIDCopy"]; [NSUserDefaults.standardUserDefaults setValue:deviceUID forKey:@"deviceUIDCopy"];
} }
} }
- (void)setupUserDefaultsListener { - (void)setupUserDefaultsListener {
NSString *appGroup = @"group.io.bluewallet.bluewallet";
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:appGroup];
NSArray *keys = @[ NSArray *keys = @[
@"WidgetCommunicationAllWalletsSatoshiBalance", @"WidgetCommunicationAllWalletsSatoshiBalance",
@"WidgetCommunicationAllWalletsLatestTransactionTime", @"WidgetCommunicationAllWalletsLatestTransactionTime",
@"WidgetCommunicationDisplayBalanceAllowed", @"WidgetCommunicationDisplayBalanceAllowed",
@"WidgetCommunicationLatestTransactionIsUnconfirmed", @"WidgetCommunicationLatestTransactionIsUnconfirmed",
@"preferredCurrency", @"preferredCurrency",
@"preferredCurrencyLocale" @"preferredCurrencyLocale",
@"electrum_host",
@"electrum_tcp_port",
@"electrum_ssl_port"
]; ];
for (NSString *key in keys) { for (NSString *key in keys) {
[userDefaults addObserver:self forKeyPath:key options:NSKeyValueObservingOptionNew context:NULL]; [self.userDefaultsGroup addObserver:self forKeyPath:key options:NSKeyValueObservingOptionNew context:NULL];
} }
} }
- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity - (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity
restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler
{ {
NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:@"group.io.bluewallet.bluewallet"]; [self.userDefaultsGroup setValue:@{@"activityType": userActivity.activityType, @"userInfo": userActivity.userInfo} forKey:@"onUserActivityOpen"];
[defaults setValue:@{@"activityType": userActivity.activityType, @"userInfo": userActivity.userInfo} forKey:@"onUserActivityOpen"];
if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) { if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
return [RCTLinkingManager application:application return [RCTLinkingManager application:application
continueUserActivity:userActivity continueUserActivity:userActivity
@ -149,8 +147,7 @@
} }
- (void)applicationWillTerminate:(UIApplication *)application { - (void)applicationWillTerminate:(UIApplication *)application {
NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:@"group.io.bluewallet.bluewallet"]; [self.userDefaultsGroup removeObjectForKey:@"onUserActivityOpen"];
[defaults removeObjectForKey:@"onUserActivityOpen"];
} }
- (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded)) completionHandler { - (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded)) completionHandler {
@ -204,35 +201,29 @@
[builder insertSiblingMenu:settings afterMenuForIdentifier:UIMenuAbout]; [builder insertSiblingMenu:settings afterMenuForIdentifier:UIMenuAbout];
} }
- (void)openSettings:(UIKeyCommand *)keyCommand { - (void)openSettings:(UIKeyCommand *)keyCommand {
[EventEmitter.sharedInstance openSettings]; [EventEmitter.sharedInstance openSettings];
} }
- (void)addWalletAction:(UIKeyCommand *)keyCommand { - (void)addWalletAction:(UIKeyCommand *)keyCommand {
// Implement the functionality for adding a wallet // Implement the functionality for adding a wallet
[EventEmitter.sharedInstance addWalletMenuAction]; [EventEmitter.sharedInstance addWalletMenuAction];
NSLog(@"Add Wallet action performed"); NSLog(@"Add Wallet action performed");
} }
- (void)importWalletAction:(UIKeyCommand *)keyCommand { - (void)importWalletAction:(UIKeyCommand *)keyCommand {
// Implement the functionality for adding a wallet // Implement the functionality for adding a wallet
[EventEmitter.sharedInstance importWalletMenuAction]; [EventEmitter.sharedInstance importWalletMenuAction];
NSLog(@"Import Wallet action performed"); NSLog(@"Import Wallet action performed");
} }
- (void)reloadTransactionsAction:(UIKeyCommand *)keyCommand { - (void)reloadTransactionsAction:(UIKeyCommand *)keyCommand {
// Implement the functionality for adding a wallet // Implement the functionality for adding a wallet
[EventEmitter.sharedInstance reloadTransactionsMenuAction]; [EventEmitter.sharedInstance reloadTransactionsMenuAction];
NSLog(@"Reload Transactions action performed"); NSLog(@"Reload Transactions action performed");
} }
- (void)showHelp:(id)sender {
-(void)showHelp:(id)sender {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://bluewallet.io/docs"] options:@{} completionHandler:nil]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://bluewallet.io/docs"] options:@{} completionHandler:nil];
} }
@ -269,7 +260,6 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
} }
// Clear cache on app launch // Clear cache on app launch
- (void)clearFilesIfNeeded { - (void)clearFilesIfNeeded {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
BOOL shouldClearFiles = [defaults boolForKey:@"clearFilesOnLaunch"]; BOOL shouldClearFiles = [defaults boolForKey:@"clearFilesOnLaunch"];