skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fixes to TouchID in-app checks.

Browse Source
This commit is contained in:
Maarten Billemont 2016-01-14 11:22:15 -05:00
parent 225e932fe7
commit de70e871a2
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MasterPassword/ObjC/MPEntities.m
View File

@ -288,7 +288,7 @@
- (BOOL)touchID { - (BOOL)touchID {
return [self.touchID_ boolValue] && ![[MPAppDelegate_Shared get] isFeatureUnlocked:MPProductTouchID]; return [self.touchID_ boolValue] && [[MPAppDelegate_Shared get] isFeatureUnlocked:MPProductTouchID];
} }
- (void)setTouchID:(BOOL)aTouchID { - (void)setTouchID:(BOOL)aTouchID {

2
MasterPassword/ObjC/iOS/MPPreferencesViewController.m
View File

@ -50,7 +50,7 @@
self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)activeUser.avatar )]; self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)activeUser.avatar )];
self.savePasswordSwitch.on = activeUser.saveKey; self.savePasswordSwitch.on = activeUser.saveKey;
self.touchIDSwitch.on = activeUser.touchID; self.touchIDSwitch.on = activeUser.touchID;
self.touchIDSwitch.enabled = self.savePasswordSwitch.on && ![[MPiOSAppDelegate get] isFeatureUnlocked:MPProductTouchID]; self.touchIDSwitch.enabled = self.savePasswordSwitch.on && [[MPiOSAppDelegate get] isFeatureUnlocked:MPProductTouchID];
} }
#pragma mark - UITableViewDelegate #pragma mark - UITableViewDelegate

12
MasterPassword/ObjC/iOS/MPStoreViewController.m
View File

@ -91,18 +91,6 @@ PearlEnum( MPDevelopmentFuelConsumption,
- (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
MPStoreProductCell *cell = (MPStoreProductCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath]; MPStoreProductCell *cell = (MPStoreProductCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath];
// if (cell.contentView.translatesAutoresizingMaskIntoConstraints) {
// cell.contentView.translatesAutoresizingMaskIntoConstraints = NO;
// [cell addConstraints:@[
// [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual
// toItem:cell.contentView attribute:NSLayoutAttributeTop multiplier:1 constant:0],
// [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual
// toItem:cell.contentView attribute:NSLayoutAttributeRight multiplier:1 constant:0],
// [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual
// toItem:cell.contentView attribute:NSLayoutAttributeLeft multiplier:1 constant:0],
// ]];
// }
if (indexPath.section == 0) if (indexPath.section == 0)
cell.selectionStyle = [[MPiOSAppDelegate get] isFeatureUnlocked:[self productForCell:cell].productIdentifier]? cell.selectionStyle = [[MPiOSAppDelegate get] isFeatureUnlocked:[self productForCell:cell].productIdentifier]?
UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault; UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault;