From be0e5c70e177c6d92d767b8381ff2db3a510a5f4 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Tue, 8 Mar 2016 16:55:14 -0800 Subject: [PATCH] Update OTRKit and CPAProxy dependencies --- .gitmodules | 2 +- ChatSecure.xcodeproj/project.pbxproj | 84 ++++++++++++++---- .../xcschemes/ChatSecure.xcscheme | 13 +-- .../xcschemes/ChatSecureTests.xcscheme | 13 +-- .../xcshareddata/ChatSecure.xcscmblueprint | 65 ++++++++++++++ ChatSecure/ChatSecure.entitlements | 10 +++ .../OTRSettingsViewController.m | 2 +- .../Cells/OTRInLineTextEditTableViewCell.m | 2 +- ChatSecure/Info.plist | 6 +- .../AppIcon.appiconset/ChatSecure_Icon.png | Bin 0 -> 25214 bytes .../AppIcon.appiconset/Contents.json | 16 ++++ ChatSecureTests/Info.plist | 2 +- Podfile | 9 ++ Podfile.lock | 22 +++-- Submodules/CPAProxy | 2 +- Submodules/OTRKit | 2 +- 16 files changed, 208 insertions(+), 42 deletions(-) create mode 100644 ChatSecure.xcworkspace/xcshareddata/ChatSecure.xcscmblueprint create mode 100644 ChatSecure/ChatSecure.entitlements create mode 100644 ChatSecure/Resources/Images.xcassets/AppIcon.appiconset/ChatSecure_Icon.png 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 0000000000000000000000000000000000000000..80e133af954f917685070b1d1b6b161fef749469 GIT binary patch literal 25214 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 P00000NkvXXu0mjf4|zVU literal 0 HcmV?d00001 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