diff --git a/External/Pearl b/External/Pearl index c4620ded..16ec9a24 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit c4620deda26475ae4320d9af5b2df4ff96c9093e +Subproject commit 16ec9a246b7a3b89b77b71aaa276a4bf73811119 diff --git a/MasterPassword/ObjC/MPAppDelegate_InApp.m b/MasterPassword/ObjC/MPAppDelegate_InApp.m index 2f1067fd..8aa4f54c 100644 --- a/MasterPassword/ObjC/MPAppDelegate_InApp.m +++ b/MasterPassword/ObjC/MPAppDelegate_InApp.m @@ -124,7 +124,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { for (SKPaymentTransaction *transaction in transactions) { - dbg( @"transaction updated: %@ -> %d", transaction.payment.productIdentifier, transaction.transactionState ); + dbg( @"transaction updated: %@ -> %d", transaction.payment.productIdentifier, (int)(transaction.transactionState) ); switch (transaction.transactionState) { case SKPaymentTransactionStatePurchased: { inf( @"purchased: %@", transaction.payment.productIdentifier ); diff --git a/MasterPassword/ObjC/iOS/MPAnswersViewController.m b/MasterPassword/ObjC/iOS/MPAnswersViewController.m index c09265c1..feb4efed 100644 --- a/MasterPassword/ObjC/iOS/MPAnswersViewController.m +++ b/MasterPassword/ObjC/iOS/MPAnswersViewController.m @@ -40,12 +40,13 @@ [super viewWillAppear:animated]; - PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { - if (![note.userInfo[@"animated"] boolValue]) - [UIView setAnimationsEnabled:NO]; - [[MPOverlaySegue dismissViewController:self] perform]; - [UIView setAnimationsEnabled:YES]; - } ); + PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], + ^(MPAnswersViewController *self, NSNotification *note) { + if (![note.userInfo[@"animated"] boolValue]) + [UIView setAnimationsEnabled:NO]; + [[MPOverlaySegue dismissViewController:self] perform]; + [UIView setAnimationsEnabled:YES]; + } ); } - (void)viewWillDisappear:(BOOL)animated { diff --git a/MasterPassword/ObjC/iOS/MPCombinedViewController.m b/MasterPassword/ObjC/iOS/MPCombinedViewController.m index 9fe6685f..353c039d 100644 --- a/MasterPassword/ObjC/iOS/MPCombinedViewController.m +++ b/MasterPassword/ObjC/iOS/MPCombinedViewController.m @@ -45,15 +45,14 @@ [super viewDidAppear:animated]; - Weakify( self ); - PearlAddNotificationObserver( MPSignedInNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { - Strongify( self ); - [self setMode:MPCombinedModePasswordSelection]; - } ); - PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { - Strongify( self ); - [self setMode:MPCombinedModeUserSelection animated:[note.userInfo[@"animated"] boolValue]]; - } ); + PearlAddNotificationObserver( MPSignedInNotification, nil, [NSOperationQueue mainQueue], + ^(MPCombinedViewController *self, NSNotification *note) { + [self setMode:MPCombinedModePasswordSelection]; + } ); + PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], + ^(MPCombinedViewController *self, NSNotification *note) { + [self setMode:MPCombinedModeUserSelection animated:[note.userInfo[@"animated"] boolValue]]; + } ); } - (void)viewWillDisappear:(BOOL)animated {