diff --git a/Classes/BITHockeyManager.m b/Classes/BITHockeyManager.m index a811c567f3..edeb584094 100644 --- a/Classes/BITHockeyManager.m +++ b/Classes/BITHockeyManager.m @@ -49,6 +49,26 @@ @synthesize appStoreEnvironment = _appStoreEnvironment; +#pragma mark - Private Class Methods + +- (BOOL)checkValidityOfAppIdentifier:(NSString *)identifier { + BOOL result = NO; + + if (identifier) { + NSCharacterSet *hexSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789abcdef"]; + NSCharacterSet *inStringSet = [NSCharacterSet characterSetWithCharactersInString:identifier]; + result = ([_appIdentifier length] == 32) && ([hexSet isSupersetOfSet:inStringSet]); + } + + return result; +} + +- (void)logInvalidIdentifier:(NSString *)environment { + if (!_appStoreEnvironment) { + NSLog(@"[HockeySDK] ERROR: The %@ is invalid! Please use the HockeyApp app identifier you find on the apps website on HockeyApp! The SDK is disabled!", environment); + } +} + #pragma mark - Public Class Methods @@ -117,6 +137,11 @@ _delegate = delegate; [_appIdentifier release]; + // check the live identifier now, because otherwise invalid identifier would only be logged when the app is already in the store + if (![self checkValidityOfAppIdentifier:liveIdentifier]) { + [self logInvalidIdentifier:@"liveIdentifier"]; + } + if ([self shouldUseLiveIdentifier]) { _appIdentifier = [liveIdentifier copy]; } @@ -196,10 +221,8 @@ } - (void)initializeModules { - NSCharacterSet *hexSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789abcdef"]; - NSCharacterSet *inStringSet = [NSCharacterSet characterSetWithCharactersInString:_appIdentifier]; - _validAppIdentifier = ([_appIdentifier length] == 32) && ([hexSet isSupersetOfSet:inStringSet]); - + _validAppIdentifier = [self checkValidityOfAppIdentifier:_appIdentifier]; + _startManagerIsInvoked = NO; if (_validAppIdentifier) { @@ -221,7 +244,7 @@ } } else { - NSLog(@"[HockeySDK] ERROR: The app identifier is invalid! Please use the HockeyApp app identifier you find on the apps website on HockeyApp! The SDK is disabled!"); + [self logInvalidIdentifier:@"app identifier"]; } } diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index f0ec1f5a97..66bbada4dc 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -879,7 +879,6 @@ 1E59547A15B6C41300A03429 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -894,7 +893,6 @@ 1E59547B15B6C41300A03429 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -909,7 +907,6 @@ 1E5954F015B6F24A00A03429 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -924,7 +921,6 @@ 1E5954F115B6F24A00A03429 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -980,10 +976,7 @@ baseConfigurationReference = 1E66CA9115D4100500F35BED /* buildnumber.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv7, - armv6, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1015,10 +1008,7 @@ baseConfigurationReference = 1E66CA9115D4100500F35BED /* buildnumber.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv7, - armv6, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1045,7 +1035,6 @@ E400563F148D79B500EB22B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1061,7 +1050,6 @@ E4005640148D79B500EB22B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/HockeySDK.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)",