From d110fd18c152f6551a4cd168b7c64df67a373d85 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 7 May 2013 11:22:01 -0400 Subject: [PATCH] Started checkpoint and executable name revert. [ADDED] "Started" checkpoint that logs some platform environment properties. [REVERTED] Executable/app name back to just MasterPassword. --- External/Pearl | 2 +- MasterPassword/ObjC/MPTypes.h | 1 + .../ObjC/Mac/MasterPassword-Info.plist | 2 +- .../project.pbxproj | 18 +++++++++--------- .../MasterPassword Mac (App Store).xcscheme | 12 ++++++------ .../MasterPassword Mac (Development).xcscheme | 12 ++++++------ MasterPassword/ObjC/iOS/MPiOSAppDelegate.m | 12 ++++++++++++ .../ObjC/iOS/MasterPassword-Info.plist | 2 +- .../project.pbxproj | 18 +++++++++--------- .../MasterPassword iOS (App Store).xcscheme | 12 ++++++------ .../MasterPassword iOS (Development).xcscheme | 16 ++++++++-------- 11 files changed, 60 insertions(+), 47 deletions(-) diff --git a/External/Pearl b/External/Pearl index 720acb2e..d6fb1961 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 720acb2e6583a2ed9efbbe28ab53681a19070a42 +Subproject commit d6fb1961ac6e218caca34187d0a7066e51983ab0 diff --git a/MasterPassword/ObjC/MPTypes.h b/MasterPassword/ObjC/MPTypes.h index ff9b19a7..b38700d1 100644 --- a/MasterPassword/ObjC/MPTypes.h +++ b/MasterPassword/ObjC/MPTypes.h @@ -69,6 +69,7 @@ typedef enum { #define MPCheckpointApp @"MPCheckpointApp" #define MPCheckpointEmergencyGenerator @"MPCheckpointEmergencyGenerator" #define MPCheckpointLogs @"MPCheckpointLogs" +#define MPCheckpointStarted @"MPCheckpointStarted" #define MPSignedInNotification @"MPSignedInNotification" #define MPSignedOutNotification @"MPSignedOutNotification" diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist index 203b0e96..02a9d3af 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - MasterPassword + ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index 002596a2..39598e60 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ DA3EF17915A47744003ABF4E /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; DA3EF17A15A47744003ABF4E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUbiquityStoreManager.a; sourceTree = BUILT_PRODUCTS_DIR; }; - DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MasterPassword-Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DA5BFA4E147E415C00F98B1E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -440,7 +440,7 @@ DA5BFA45147E415C00F98B1E /* Products */ = { isa = PBXGroup; children = ( - DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */, + DA5BFA44147E415C00F98B1E /* MasterPassword.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, DAC6326C148680650075AEA5 /* libjrswizzle.a */, DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */, @@ -893,9 +893,9 @@ productReference = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; productType = "com.apple.product-type.library.static"; }; - DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */ = { + DA5BFA43147E415C00F98B1E /* MasterPassword */ = { isa = PBXNativeTarget; - buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-Mac" */; + buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */; buildPhases = ( DA5BFA40147E415C00F98B1E /* Sources */, DA5BFA41147E415C00F98B1E /* Frameworks */, @@ -907,9 +907,9 @@ ); dependencies = ( ); - name = "MasterPassword-Mac"; + name = MasterPassword; productName = MasterPassword; - productReference = DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */; + productReference = DA5BFA44147E415C00F98B1E /* MasterPassword.app */; productType = "com.apple.product-type.application"; }; DAC6326B148680650075AEA5 /* jrswizzle */ = { @@ -971,7 +971,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */, + DA5BFA43147E415C00F98B1E /* MasterPassword */, DAC77CAC148291A600BCF976 /* Pearl */, DAC6326B148680650075AEA5 /* jrswizzle */, DA4425CA1557BED40052177D /* UbiquityStoreManager */, @@ -1190,7 +1190,7 @@ /* Begin PBXTargetDependency section */ DA3EF19E15A47AEB003ABF4E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */; + target = DA5BFA43147E415C00F98B1E /* MasterPassword */; targetProxy = DA3EF19D15A47AEB003ABF4E /* PBXContainerItemProxy */; }; DAC63286148681200075AEA5 /* PBXTargetDependency */ = { @@ -1717,7 +1717,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-Mac"; }; - DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-Mac" */ = { + DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { isa = XCConfigurationList; buildConfigurations = ( DA5BFA6E147E415C00F98B1E /* Debug-Mac */, diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme index ca91485e..be135976 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ @@ -61,8 +61,8 @@ diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme index 7769485c..caa0b995 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ @@ -61,8 +61,8 @@ diff --git a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m index 81c9f5f9..85dcc7bb 100644 --- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m +++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m @@ -266,6 +266,18 @@ [[MPiOSAppDelegate get] showSetup]; } ); + MPCheckpoint(MPCheckpointStarted, @{ + @"simulator" : PearlStringB([PearlDeviceUtils isSimulator]), + @"encrypted" : PearlStringB([PearlDeviceUtils isAppEncrypted]), + @"jailbroken" : PearlStringB([PearlDeviceUtils isJailbroken]), + @"platform" : [PearlDeviceUtils platform], +#ifdef APPSTORE + @"legal" : PearlStringB([PearlDeviceUtils isAppEncrypted]), +#else + @"legal" : @"YES", +#endif + }); + return YES; } diff --git a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist index 1a7b4ba3..2d50ca59 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist @@ -51,7 +51,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - MasterPassword + ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index 3088613b..a5ff78c6 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -1001,7 +1001,7 @@ DA5A09DE171A70E4005284AB /* play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@2x.png"; sourceTree = ""; }; DA5A09E8171BB0F7005284AB /* unlocked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unlocked.png; sourceTree = ""; }; DA5A09E9171BB0F7005284AB /* unlocked@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unlocked@2x.png"; sourceTree = ""; }; - DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MasterPassword-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA48147E415C00F98B1E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -2135,7 +2135,7 @@ DA5BFA45147E415C00F98B1E /* Products */ = { isa = PBXGroup; children = ( - DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */, + DA5BFA44147E415C00F98B1E /* MasterPassword.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */, DAC6326C148680650075AEA5 /* libjrswizzle.a */, @@ -3692,9 +3692,9 @@ productReference = DA497B9715E8C90E00B52167 /* libGoogle+.a */; productType = "com.apple.product-type.library.static"; }; - DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */ = { + DA5BFA43147E415C00F98B1E /* MasterPassword */ = { isa = PBXNativeTarget; - buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */; + buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */; buildPhases = ( DA5BFA40147E415C00F98B1E /* Sources */, DA5BFA41147E415C00F98B1E /* Frameworks */, @@ -3706,9 +3706,9 @@ ); dependencies = ( ); - name = "MasterPassword-iOS"; + name = MasterPassword; productName = MasterPassword; - productReference = DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */; + productReference = DA5BFA44147E415C00F98B1E /* MasterPassword.app */; productType = "com.apple.product-type.application"; }; DA829E50159847E0002417D3 /* FontReplacer */ = { @@ -3919,7 +3919,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */, + DA5BFA43147E415C00F98B1E /* MasterPassword */, DAC77CAC148291A600BCF976 /* Pearl */, DAC6325C1486805C0075AEA5 /* uicolor-utilities */, DAC6326B148680650075AEA5 /* jrswizzle */, @@ -4898,7 +4898,7 @@ /* Begin PBXTargetDependency section */ DA3EF19E15A47AEB003ABF4E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */; + target = DA5BFA43147E415C00F98B1E /* MasterPassword */; targetProxy = DA3EF19D15A47AEB003ABF4E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -5571,7 +5571,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-iOS"; }; - DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */ = { + DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { isa = XCConfigurationList; buildConfigurations = ( DA5BFA6E147E415C00F98B1E /* Debug-iOS */, diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme index b25e81f4..279e10f6 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ @@ -61,8 +61,8 @@ diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme index 94ba7efa..97e84d9d 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme @@ -15,8 +15,8 @@ @@ -33,8 +33,8 @@ @@ -52,8 +52,8 @@ @@ -70,8 +70,8 @@