skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Build fixes.

Browse Source
This commit is contained in:
Maarten Billemont 2014-09-27 12:52:17 -04:00
parent 5db083bf7c
commit 064122f36d
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
External/Pearl vendored

@ -1 +1 @@
Subproject commit c4620deda26475ae4320d9af5b2df4ff96c9093e Subproject commit 16ec9a246b7a3b89b77b71aaa276a4bf73811119

2
MasterPassword/ObjC/MPAppDelegate_InApp.m
View File

@ -124,7 +124,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
- (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions {
for (SKPaymentTransaction *transaction in 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) { switch (transaction.transactionState) {
case SKPaymentTransactionStatePurchased: { case SKPaymentTransactionStatePurchased: {
inf( @"purchased: %@", transaction.payment.productIdentifier ); inf( @"purchased: %@", transaction.payment.productIdentifier );

13
MasterPassword/ObjC/iOS/MPAnswersViewController.m
View File

@ -40,12 +40,13 @@
[super viewWillAppear:animated]; [super viewWillAppear:animated];
PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue],
if (![note.userInfo[@"animated"] boolValue]) ^(MPAnswersViewController *self, NSNotification *note) {
[UIView setAnimationsEnabled:NO]; if (![note.userInfo[@"animated"] boolValue])
[[MPOverlaySegue dismissViewController:self] perform]; [UIView setAnimationsEnabled:NO];
[UIView setAnimationsEnabled:YES]; [[MPOverlaySegue dismissViewController:self] perform];
} ); [UIView setAnimationsEnabled:YES];
} );
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {

17
MasterPassword/ObjC/iOS/MPCombinedViewController.m
View File

@ -45,15 +45,14 @@
[super viewDidAppear:animated]; [super viewDidAppear:animated];
Weakify( self ); PearlAddNotificationObserver( MPSignedInNotification, nil, [NSOperationQueue mainQueue],
PearlAddNotificationObserver( MPSignedInNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { ^(MPCombinedViewController *self, NSNotification *note) {
Strongify( self ); [self setMode:MPCombinedModePasswordSelection];
[self setMode:MPCombinedModePasswordSelection]; } );
} ); PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue],
PearlAddNotificationObserver( MPSignedOutNotification, nil, [NSOperationQueue mainQueue], ^(NSNotification *note) { ^(MPCombinedViewController *self, NSNotification *note) {
Strongify( self ); [self setMode:MPCombinedModeUserSelection animated:[note.userInfo[@"animated"] boolValue]];
[self setMode:MPCombinedModeUserSelection animated:[note.userInfo[@"animated"] boolValue]]; } );
} );
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {