diff --git a/.gitmodules b/.gitmodules index 10fa504f8..410f80c45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = git@github.com:chrisballinger/ProxyKit.git [submodule "Submodules/CPAProxy"] path = Submodules/CPAProxy - url = git@github.com:ursachec/CPAProxy.git + url = git@github.com:ChatSecure/CPAProxy.git [submodule "Submodules/YapDatabase"] path = Submodules/YapDatabase url = git@github.com:chrisballinger/YapDatabase.git diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj index 368315b48..2c8b4e8d3 100644 --- a/ChatSecure.xcodeproj/project.pbxproj +++ b/ChatSecure.xcodeproj/project.pbxproj @@ -135,7 +135,6 @@ 6396AFBA1A169D54009F3E6C /* ChatSecureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6396AFB91A169D54009F3E6C /* ChatSecureTests.m */; }; 639CDD8E1AD71BC4009BAABC /* OTRCircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 639CDD8D1AD71BC4009BAABC /* OTRCircleView.m */; }; 639CDD911AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 639CDD901AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m */; }; - 63C4BCCC1A1E9B9F001696CD /* ChatSecure.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCC81A1E9B9F001696CD /* ChatSecure.xcdatamodeld */; }; 63C4BD0F1A1E9BE1001696CD /* OTRManagedAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCCF1A1E9BE1001696CD /* OTRManagedAccount.m */; }; 63C4BD101A1E9BE1001696CD /* OTRManagedBuddy.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCD11A1E9BE1001696CD /* OTRManagedBuddy.m */; }; 63C4BD111A1E9BE1001696CD /* OTRManagedEncryptionStatusMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCD31A1E9BE1001696CD /* OTRManagedEncryptionStatusMessage.m */; }; @@ -200,7 +199,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 154CBBDFA16BDE9C28017B1F /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; + 10EF91240EAB8D86A66C3A2D /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; 25A3853627C1F67D3A296AB4 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 632461571A1AE553000EF33B /* OTRCoreDataMigrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRCoreDataMigrationTests.m; sourceTree = ""; }; 633104D51A169EC800C17BAE /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; @@ -585,10 +584,11 @@ 63FABC8D1A410EBF009BF681 /* JSQMessagesCollectionViewCell+ChatSecure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSQMessagesCollectionViewCell+ChatSecure.m"; sourceTree = ""; }; 63FABC8F1A41218E009BF681 /* NSString+ChatSecure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+ChatSecure.h"; sourceTree = ""; }; 63FABC901A41218E009BF681 /* NSString+ChatSecure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+ChatSecure.m"; sourceTree = ""; }; - 954B60A022C05FDE4DCFEF6E /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; - B977533C20F88A4A840303F9 /* Pods.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.beta.xcconfig; path = "Pods/Target Support Files/Pods/Pods.beta.xcconfig"; sourceTree = ""; }; + D2AE76ACF06BF15EEB781E7A /* Pods.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.beta.xcconfig; path = "Pods/Target Support Files/Pods/Pods.beta.xcconfig"; sourceTree = ""; }; D9365E791A1EB0050006434A /* torrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = torrc; path = Resources/torrc; sourceTree = ""; }; + D94563EF1C8FA0AF00DA6162 /* ChatSecure.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = ChatSecure.entitlements; sourceTree = ""; }; D973D7051A2D4094004D353E /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-acknowledgements.plist"; path = "Pods/Target Support Files/Pods/Pods-acknowledgements.plist"; sourceTree = SOURCE_ROOT; }; + E0859D2C5569FDC03E70A70F /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1038,6 +1038,7 @@ 6396AF9C1A169D54009F3E6C /* ChatSecure */ = { isa = PBXGroup; children = ( + D94563EF1C8FA0AF00DA6162 /* ChatSecure.entitlements */, 633105001A16D1A300C17BAE /* Classes */, 633104D71A169EE600C17BAE /* Resources */, 6396AF9D1A169D54009F3E6C /* Supporting Files */, @@ -1200,9 +1201,9 @@ C1E90FC219EFFEE2E8C7EECF /* Pods */ = { isa = PBXGroup; children = ( - 954B60A022C05FDE4DCFEF6E /* Pods.debug.xcconfig */, - 154CBBDFA16BDE9C28017B1F /* Pods.release.xcconfig */, - B977533C20F88A4A840303F9 /* Pods.beta.xcconfig */, + 10EF91240EAB8D86A66C3A2D /* Pods.debug.xcconfig */, + E0859D2C5569FDC03E70A70F /* Pods.release.xcconfig */, + D2AE76ACF06BF15EEB781E7A /* Pods.beta.xcconfig */, ); name = Pods; sourceTree = ""; @@ -1228,6 +1229,7 @@ 6396AF981A169D54009F3E6C /* Resources */, 8A2E66B35EF52AF3A8D65276 /* Copy Pods Resources */, 6386E24E1A16DBAD003465DC /* ShellScript */, + C3E481117D68ECC599D55685 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -1247,6 +1249,7 @@ 6396AFB01A169D54009F3E6C /* Frameworks */, 6396AFB11A169D54009F3E6C /* Resources */, F92CD31427EF6855AC77AF5E /* Copy Pods Resources */, + 7A8856547F985CE27B66DBDE /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -1265,7 +1268,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = OTR; - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = "Chris Ballinger"; TargetAttributes = { 6396AF991A169D54009F3E6C = { @@ -1275,6 +1278,9 @@ com.apple.DataProtection = { enabled = 1; }; + com.apple.SafariKeychain = { + enabled = 1; + }; }; }; 6396AFB21A169D54009F3E6C = { @@ -1372,6 +1378,21 @@ shellPath = /bin/sh; shellScript = "python \"${SRCROOT}/ChatSecure/Strings/StringsConverter.py\""; }; + 7A8856547F985CE27B66DBDE /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 8A2E66B35EF52AF3A8D65276 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1387,6 +1408,21 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; showEnvVarsInLog = 0; }; + C3E481117D68ECC599D55685 /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; C6209FD4E67B0AE13FA1CE51 /* Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1495,7 +1531,6 @@ 633106E61A16D1A300C17BAE /* OTRImages.m in Sources */, 633106C11A16D1A300C17BAE /* OTRFingerprintSetting.m in Sources */, 633106F41A16D1A300C17BAE /* OTRXMPPLoginViewController.m in Sources */, - 63C4BCCC1A1E9B9F001696CD /* ChatSecure.xcdatamodeld in Sources */, 63D184861A2D3F2400334CD8 /* OTRNotificationController.m in Sources */, 639CDD8E1AD71BC4009BAABC /* OTRCircleView.m in Sources */, 63FA54911A7B2C2E00F2AEBB /* OTRPauseView.m in Sources */, @@ -1708,23 +1743,28 @@ }; 632461551A1AE1C1000EF33B /* Beta */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 63DC0EB61A1ABC86002C9598 /* OTR_Release.xcconfig */; + baseConfigurationReference = D2AE76ACF06BF15EEB781E7A /* Pods.beta.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_DISPLAY_NAME_SUFFIX = " β"; BUNDLE_ID_SUFFIX = .beta; + CODE_SIGN_ENTITLEMENTS = ChatSecure/ChatSecure.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ENABLE_BITCODE = NO; INFOPLIST_FILE = ChatSecure/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; }; name = Beta; }; 632461561A1AE1C1000EF33B /* Beta */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B977533C20F88A4A840303F9 /* Pods.beta.xcconfig */; + baseConfigurationReference = D2AE76ACF06BF15EEB781E7A /* Pods.beta.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1733,6 +1773,7 @@ ); INFOPLIST_FILE = ChatSecureTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ChatSecure.app/ChatSecure"; }; @@ -1758,6 +1799,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1818,39 +1860,49 @@ }; 6396AFBE1A169D54009F3E6C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 63DC0EB41A1ABC86002C9598 /* OTR_Debug.xcconfig */; + baseConfigurationReference = 10EF91240EAB8D86A66C3A2D /* Pods.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_DISPLAY_NAME_SUFFIX = " α"; BUNDLE_ID_SUFFIX = .debug; + CODE_SIGN_ENTITLEMENTS = ChatSecure/ChatSecure.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ENABLE_BITCODE = NO; INFOPLIST_FILE = ChatSecure/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; }; name = Debug; }; 6396AFBF1A169D54009F3E6C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 63DC0EB61A1ABC86002C9598 /* OTR_Release.xcconfig */; + baseConfigurationReference = E0859D2C5569FDC03E70A70F /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_DISPLAY_NAME_SUFFIX = ""; BUNDLE_ID_SUFFIX = ""; + CODE_SIGN_ENTITLEMENTS = ChatSecure/ChatSecure.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ENABLE_BITCODE = NO; INFOPLIST_FILE = ChatSecure/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)$(BUNDLE_ID_SUFFIX)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; }; name = Release; }; 6396AFC11A169D54009F3E6C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 954B60A022C05FDE4DCFEF6E /* Pods.debug.xcconfig */; + baseConfigurationReference = 10EF91240EAB8D86A66C3A2D /* Pods.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1863,6 +1915,7 @@ ); INFOPLIST_FILE = ChatSecureTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ChatSecure.app/ChatSecure"; }; @@ -1870,7 +1923,7 @@ }; 6396AFC21A169D54009F3E6C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 154CBBDFA16BDE9C28017B1F /* Pods.release.xcconfig */; + baseConfigurationReference = E0859D2C5569FDC03E70A70F /* Pods.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1879,6 +1932,7 @@ ); INFOPLIST_FILE = ChatSecureTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ChatSecure.app/ChatSecure"; }; diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme index c68243c85..259c6d4a7 100644 --- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme +++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:ChatSecure.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme index a9f31e9df..de1cbd387 100644 --- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme +++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,15 +48,18 @@ ReferencedContainer = "container:ChatSecure.xcodeproj"> + + + + + + com.apple.developer.associated-domains + + applinks:chatsecure.org + + + diff --git a/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m b/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m index 4ddda6745..f1919a136 100644 --- a/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m +++ b/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m @@ -469,7 +469,7 @@ - (void) donateSettingPressed:(OTRDonateSetting *)setting { - (void)didSelectShareSetting:(OTRShareSetting *)shareSetting { - OTRActivityItemProvider * itemProvider = [[OTRActivityItemProvider alloc] init]; + OTRActivityItemProvider * itemProvider = [[OTRActivityItemProvider alloc] initWithPlaceholderItem:@""]; OTRQRCodeActivity * qrCodeActivity = [[OTRQRCodeActivity alloc] init]; UIActivityViewController * activityViewController = [[UIActivityViewController alloc] initWithActivityItems:@[itemProvider] applicationActivities:@[qrCodeActivity]]; diff --git a/ChatSecure/Classes/Views/Cells/OTRInLineTextEditTableViewCell.m b/ChatSecure/Classes/Views/Cells/OTRInLineTextEditTableViewCell.m index 41581d83a..45ed83575 100644 --- a/ChatSecure/Classes/Views/Cells/OTRInLineTextEditTableViewCell.m +++ b/ChatSecure/Classes/Views/Cells/OTRInLineTextEditTableViewCell.m @@ -54,7 +54,7 @@ -(void)updateConstraints{ if (!self.addedConstraints && self.textField) { NSLayoutConstraint *leadingEdgeConstraint = [self.textField autoPinEdge:ALEdgeLeading - toEdge:ALEdgeRight + toEdge:ALEdgeTrailing ofView:self.textLabel withOffset:6]; diff --git a/ChatSecure/Info.plist b/ChatSecure/Info.plist index 2675f7f0d..ecdc16b53 100644 --- a/ChatSecure/Info.plist +++ b/ChatSecure/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)$(BUNDLE_ID_SUFFIX) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.1.2 + 3.1.3 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 21 + 24 FacebookAppID 447241325394334 FacebookDisplayName diff --git a/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/ChatSecure_Icon.png b/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/ChatSecure_Icon.png new file mode 100644 index 000000000..80e133af9 Binary files /dev/null and b/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/ChatSecure_Icon.png differ diff --git a/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/Contents.json index 12094995c..5ed9b2b38 100644 --- a/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/Contents.json @@ -10,11 +10,21 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "57x57", @@ -88,6 +98,12 @@ "idiom" : "ipad", "filename" : "iPadIcon@2x.png", "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "ChatSecure_Icon.png", + "scale" : "2x" } ], "info" : { diff --git a/ChatSecureTests/Info.plist b/ChatSecureTests/Info.plist index e0e04b8e2..ba72822e8 100644 --- a/ChatSecureTests/Info.plist +++ b/ChatSecureTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Podfile b/Podfile index 5ebe12644..37aecc1a2 100755 --- a/Podfile +++ b/Podfile @@ -2,6 +2,15 @@ platform :ios, "7.0" inhibit_all_warnings! +# Disable Bitcode for all targets http://stackoverflow.com/a/32685434/805882 +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end + source 'https://github.com/CocoaPods/Specs.git' link_with 'ChatSecure', 'ChatSecureTests' diff --git a/Podfile.lock b/Podfile.lock index 21a36025e..faa6b4763 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -31,7 +31,13 @@ PODS: - BBlock/StoreKit (1.2.0) - BBlock/UIKit (1.2.0) - BButton (4.0.2) - - CocoaAsyncSocket (7.4.1) + - CocoaAsyncSocket (7.4.3): + - CocoaAsyncSocket/All (= 7.4.3) + - CocoaAsyncSocket/All (7.4.3): + - CocoaAsyncSocket/GCD + - CocoaAsyncSocket/RunLoop + - CocoaAsyncSocket/GCD (7.4.3) + - CocoaAsyncSocket/RunLoop (7.4.3) - CocoaLumberjack (1.9.2): - CocoaLumberjack/Extensions (= 1.9.2) - CocoaLumberjack/Core (1.9.2) @@ -40,9 +46,9 @@ PODS: - CPAProxy (1.0.0): - CocoaAsyncSocket - CRToast (0.0.7) - - GCDWebServer (3.2.5): - - GCDWebServer/Core (= 3.2.5) - - GCDWebServer/Core (3.2.5) + - GCDWebServer (3.3.2): + - GCDWebServer/Core (= 3.3.2) + - GCDWebServer/Core (3.3.2) - gtm-http-fetcher (1.0.142) - gtm-oauth2 (1.0.129): - gtm-http-fetcher @@ -326,11 +332,11 @@ SPEC CHECKSUMS: ARChromeActivity: 9064d94803338d3377f3e1013a8e8f4821d7daf1 BBlock: 11c666b6898c074eceb40fa56a901b96415ebf68 BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27 - CocoaAsyncSocket: 7cbf214b27f8e7f7574db6a3fd96352ffaed433d + CocoaAsyncSocket: a18c75dca4b08723628a0bacca6e94803d90be91 CocoaLumberjack: 628fca2e88ef06f7cf6817309aa405f325d9a6fa CPAProxy: 9ca6809d0ee47d90ee149da033a53b911d15ab82 CRToast: 99a28f4387def43b439ad88f957ce31357ff7373 - GCDWebServer: d0e1b23785e3dfd6c87601323d0f7cae059aab18 + GCDWebServer: 2a375ec42839a41d7187d04e5b688d32fa5c4cd5 gtm-http-fetcher: 52f5c6444c2c883380de3b902e14fdab4b1d3e7d gtm-oauth2: 3a9a46400b8d7ee916807550e0902c4a4db11167 HockeySDK-Source: d620f330b23691017c141de6e25e5cdc8c67848c @@ -347,7 +353,7 @@ SPEC CHECKSUMS: MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247 Navajo: 5fb68239b4e3af4610f31925bae1ca8e6bab8eaa OpenInChrome: f1f3f9dec682216fe78a0d7fe0b5b263d6312c32 - OTRKit: 084a83936ac19e2dbd08096cd94263a979dc4502 + OTRKit: 9595962f20825a4baeeab225ecce2c7579e29f64 ProxyKit: f7be31d07ed93444c433956d18e842ea9c709224 PureLayout: f25f0bb904d5ccfe6e31da3cb869185259f02e0d SIAlertView: 20c794b55eaf44d888773ea51647cf8907723919 @@ -361,4 +367,4 @@ SPEC CHECKSUMS: XMPPFramework: 239fe709baff208fff5970708469b939387105ee YapDatabase: 814f9ff862a95c1e581d93335a4020482b69155b -COCOAPODS: 0.38.2 +COCOAPODS: 0.39.0 diff --git a/Submodules/CPAProxy b/Submodules/CPAProxy index 9b4654c51..66e117696 160000 --- a/Submodules/CPAProxy +++ b/Submodules/CPAProxy @@ -1 +1 @@ -Subproject commit 9b4654c513de2f8ed653c37c1cdf6dc65d8b6576 +Subproject commit 66e1176967d19403ec31733d9440e226c97fc140 diff --git a/Submodules/OTRKit b/Submodules/OTRKit index 81aa71091..86c4591c1 160000 --- a/Submodules/OTRKit +++ b/Submodules/OTRKit @@ -1 +1 @@ -Subproject commit 81aa71091f33f30c15a525074826dcbe19c53e30 +Subproject commit 86c4591c116607740c98e5af5f0762ea8e8f88cb