From de70e871a278b5b1373438b5ff23d6481366fa87 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Thu, 14 Jan 2016 11:22:15 -0500
Subject: [PATCH] Fixes to TouchID in-app checks.

---
 MasterPassword/ObjC/MPEntities.m                     |  2 +-
 .../ObjC/iOS/MPPreferencesViewController.m           |  2 +-
 MasterPassword/ObjC/iOS/MPStoreViewController.m      | 12 ------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/MasterPassword/ObjC/MPEntities.m b/MasterPassword/ObjC/MPEntities.m
index fe4e2d22..f2b57da2 100644
--- a/MasterPassword/ObjC/MPEntities.m
+++ b/MasterPassword/ObjC/MPEntities.m
@@ -288,7 +288,7 @@
 
 - (BOOL)touchID {
 
-    return [self.touchID_ boolValue] && ![[MPAppDelegate_Shared get] isFeatureUnlocked:MPProductTouchID];
+    return [self.touchID_ boolValue] && [[MPAppDelegate_Shared get] isFeatureUnlocked:MPProductTouchID];
 }
 
 - (void)setTouchID:(BOOL)aTouchID {
diff --git a/MasterPassword/ObjC/iOS/MPPreferencesViewController.m b/MasterPassword/ObjC/iOS/MPPreferencesViewController.m
index 337d2da3..53428289 100644
--- a/MasterPassword/ObjC/iOS/MPPreferencesViewController.m
+++ b/MasterPassword/ObjC/iOS/MPPreferencesViewController.m
@@ -50,7 +50,7 @@
     self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)activeUser.avatar )];
     self.savePasswordSwitch.on = activeUser.saveKey;
     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
diff --git a/MasterPassword/ObjC/iOS/MPStoreViewController.m b/MasterPassword/ObjC/iOS/MPStoreViewController.m
index 972c0d7b..bc7c645b 100644
--- a/MasterPassword/ObjC/iOS/MPStoreViewController.m
+++ b/MasterPassword/ObjC/iOS/MPStoreViewController.m
@@ -91,18 +91,6 @@ PearlEnum( MPDevelopmentFuelConsumption,
 - (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)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)
         cell.selectionStyle = [[MPiOSAppDelegate get] isFeatureUnlocked:[self productForCell:cell].productIdentifier]?
                               UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault;