From 7c658b2879c8dedf65a9b758ca96e2c5a4d21ae0 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Sun, 18 Jan 2015 10:28:11 +0100 Subject: [PATCH] Enhancements in build configuration. - Helps onboarding of new contributors because signup generates a fake push token to register devices. - Deleted Ad-Hoc configuration since no more HockeyApp distribution. TestFlight uses default `AppStore release` build configuration. --- Signal.xcodeproj/project.pbxproj | 175 ------------------ Signal/src/AppDelegate.m | 5 + .../Supporting Files/SignalTests-Info.plist | 2 +- 3 files changed, 6 insertions(+), 176 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index fd8c954d2..901d88340 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3575,178 +3575,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - B6B9EB4D196190F5009024F0 /* Ad-Hoc Distribution */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "compiler-default"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_RECEIVER_WEAK = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_TEST_COVERAGE_FILES = NO; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_POINTER_SIGNEDNESS = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = YES; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_VALUE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-fobjc-arc-exceptions"; - PROVISIONING_PROFILE = ""; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = "Ad-Hoc Distribution"; - }; - B6B9EB4E196190F5009024F0 /* Ad-Hoc Distribution */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9CC6C6BD3B51923FD6317C94 /* Pods.ad-hoc distribution.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - ); - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Signal/Signal-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - HAVE_CONFIG_H, - "ADHOC=1", - ); - GCC_STRICT_ALIASING = NO; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${SRCROOT}/RedPhone/lib/speex/include\"", - "\"${SRCROOT}/RedPhone/lib/ogg/include\"", - "\"${SRCROOT}/RedPhone/lib/debug/include\"", - "\"$(SRCROOT)/libtommath\"", - "\"$(SRCROOT)/libtomcrypt/headers\"", - "\"$(SRCROOT)/spandsp/spandsp/spandsp\"", - "\"$(SRCROOT)/MMDrawerController\"", - "\"$(SRCROOT)/Libraries\"/**", - ); - INFOPLIST_FILE = "$(SRCROOT)/Signal/Signal-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)", - ); - LLVM_LTO = NO; - OTHER_LDFLAGS = "$(inherited)"; - PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = ""; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = 1; - TEST_AFTER_BUILD = YES; - VALID_ARCHS = "arm64 armv7 armv7s i386"; - WRAPPER_EXTENSION = app; - }; - name = "Ad-Hoc Distribution"; - }; - B6B9EB4F196190F5009024F0 /* Ad-Hoc Distribution */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9CC6C6BD3B51923FD6317C94 /* Pods.ad-hoc distribution.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Signal.app/Signal"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SDKROOT)/Developer/Library/Frameworks\"", - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_GENERATE_TEST_COVERAGE_FILES = NO; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Signal/Signal-Prefix.pch"; - GCC_VERSION = ""; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - HEADER_SEARCH_PATHS = ( - "${PODS_HEADERS_SEARCH_PATHS}", - "$(inherited)", - "\"${SRCROOT}/Signal/lib/speex/include\"", - "\"${SRCROOT}/Signal/lib/ogg/include\"", - "\"${SRCROOT}/Signal/lib/debug/include\"", - "\"$(SRCROOT)/libtommath\"", - "\"$(SRCROOT)/libtomcrypt/headers\"", - "\"$(SRCROOT)/spandsp/spandsp/spandsp\"", - "\"$(SRCROOT)/Libraries\"/**", - ); - INFOPLIST_FILE = "Signal/test/Supporting Files/SignalTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)", - ); - OTHER_LDFLAGS = ( - "-ObjC", - "$(inherited)", - ); - PRODUCT_NAME = SignalTests; - PROVISIONING_PROFILE = ""; - TEST_HOST = "$(BUNDLE_LOADER)"; - VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; - }; - name = "Ad-Hoc Distribution"; - }; D221A0BA169C9E5F00537ABF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4093,7 +3921,6 @@ isa = XCConfigurationList; buildConfigurations = ( D221A0BA169C9E5F00537ABF /* Debug */, - B6B9EB4D196190F5009024F0 /* Ad-Hoc Distribution */, D221A0BB169C9E5F00537ABF /* App Store Release */, ); defaultConfigurationIsVisible = 0; @@ -4103,7 +3930,6 @@ isa = XCConfigurationList; buildConfigurations = ( D221A0BD169C9E5F00537ABF /* Debug */, - B6B9EB4E196190F5009024F0 /* Ad-Hoc Distribution */, D221A0BE169C9E5F00537ABF /* App Store Release */, ); defaultConfigurationIsVisible = 0; @@ -4113,7 +3939,6 @@ isa = XCConfigurationList; buildConfigurations = ( D221A0C0169C9E5F00537ABF /* Debug */, - B6B9EB4F196190F5009024F0 /* Ad-Hoc Distribution */, D221A0C1169C9E5F00537ABF /* App Store Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 2cbce64d8..d609bd4e9 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -147,7 +147,12 @@ } - (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error { +#ifdef DEBUG + DDLogWarn(@"We're in debug mode, and registered a fake push identifier"); + [PushManager.sharedManager.pushNotificationFutureSource trySetResult:[@"aFakePushIdentifier" dataUsingEncoding:NSUTF8StringEncoding]]; +#else [PushManager.sharedManager.pushNotificationFutureSource trySetFailure:error]; +#endif } - (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings{ diff --git a/Signal/test/Supporting Files/SignalTests-Info.plist b/Signal/test/Supporting Files/SignalTests-Info.plist index c7147f2a8..59b7babee 100644 --- a/Signal/test/Supporting Files/SignalTests-Info.plist +++ b/Signal/test/Supporting Files/SignalTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.twistedoakstudios.${PRODUCT_NAME:rfc1034identifier} + org.whispersystems.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType