From c99252809d6241e7f587605e87653cb286928e73 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 18 Apr 2017 20:30:06 -0400 Subject: [PATCH] Disable ADHOC and tester functionality / bypasses. --- .../MasterPassword-iOS.xcodeproj/project.pbxproj | 2 -- .../MasterPassword-macOS.xcodeproj/project.pbxproj | 2 -- platform-darwin/Source/MPAppDelegate_InApp.m | 2 +- platform-darwin/Source/Mac/MPMacAppDelegate.m | 2 +- platform-darwin/Source/iOS/MPiOSAppDelegate.m | 14 +------------- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 125eaf82..6e9ad5c0 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -4005,7 +4005,6 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "ADHOC=1", "$(inherited)", "NDEBUG=1", "NS_BLOCK_ASSERTIONS=1", @@ -4273,7 +4272,6 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "ADHOC=1", "$(inherited)", "NDEBUG=1", "NS_BLOCK_ASSERTIONS=1", diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index d0ff410c..94514e20 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -2568,7 +2568,6 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "ADHOC=1", "$(inherited)", "NDEBUG=1", "NS_BLOCK_ASSERTIONS=1", @@ -2838,7 +2837,6 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "ADHOC=1", "$(inherited)", "NDEBUG=1", "NS_BLOCK_ASSERTIONS=1", diff --git a/platform-darwin/Source/MPAppDelegate_InApp.m b/platform-darwin/Source/MPAppDelegate_InApp.m index 47604162..41f78b8b 100644 --- a/platform-darwin/Source/MPAppDelegate_InApp.m +++ b/platform-darwin/Source/MPAppDelegate_InApp.m @@ -75,7 +75,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve // Consumable product. return NO; -#if ADHOC || DEBUG +#if DEBUG // All features are unlocked for beta / debug / mac versions. return YES; #else diff --git a/platform-darwin/Source/Mac/MPMacAppDelegate.m b/platform-darwin/Source/Mac/MPMacAppDelegate.m index 12c8961a..f6aaa934 100644 --- a/platform-darwin/Source/Mac/MPMacAppDelegate.m +++ b/platform-darwin/Source/Mac/MPMacAppDelegate.m @@ -72,7 +72,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven NSString *crashlyticsAPIKey = [self crashlyticsAPIKey]; if ([crashlyticsAPIKey length]) { inf(@"Initializing Crashlytics"); -#if defined (DEBUG) || defined (ADHOC) +#if DEBUG [Crashlytics sharedInstance].debugMode = YES; #endif [[Crashlytics sharedInstance] setUserIdentifier:[PearlKeyChain deviceIdentifier]]; diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index ffd80baa..55f856f9 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -52,7 +52,7 @@ NSString *crashlyticsAPIKey = [self crashlyticsAPIKey]; if ([crashlyticsAPIKey length]) { inf( @"Initializing Crashlytics" ); -#if defined (DEBUG) || defined (ADHOC) +#if DEBUG [Crashlytics sharedInstance].debugMode = YES; #endif [[Crashlytics sharedInstance] setUserIdentifier:[PearlKeyChain deviceIdentifier]]; @@ -88,18 +88,6 @@ PearlAddNotificationObserver( NSUserDefaultsDidChangeNotification, nil, nil, ^(id self, NSNotification *note) { [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil]; } ); - -#ifdef ADHOC - [PearlAlert showAlertWithTitle:@"Welcome, tester!" message: - @"Thank you for taking the time to test Master Password.\n\n" - @"Please provide any feedback, however minor it may seem, via the Feedback action item accessible from the top right.\n\n" - @"Contact me directly at:\n" - @"lhunath@lyndir.com\n" - @"Or report detailed issues at:\n" - @"https://youtrack.lyndir.com\n" - viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock:nil - cancelTitle:nil otherTitles:[PearlStrings get].commonButtonOkay, nil]; -#endif } @catch (id exception) { err( @"During Config Test: %@", exception );