From 1389ef1899a4cd186e9fa60698749dbe8a956672 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Tue, 1 Oct 2019 21:48:41 -0700 Subject: [PATCH 01/53] Xcode 11 updates --- .travis.yml | 2 +- ChatSecure.xcodeproj/project.pbxproj | 195 ++++-------------- ChatSecure/LaunchScreen.storyboard | 38 ++++ ChatSecure/Resources/LaunchScreen.xib | 48 ----- ...om.mono0926.LicensePlist.latest_result.txt | 26 +-- .../com.mono0926.LicensePlist.plist | 18 +- ChatSecureCore.podspec | 2 +- Gemfile.lock | 49 +++-- Podfile | 2 +- Podfile.lock | 48 ++--- 10 files changed, 161 insertions(+), 267 deletions(-) create mode 100644 ChatSecure/LaunchScreen.storyboard delete mode 100644 ChatSecure/Resources/LaunchScreen.xib diff --git a/.travis.yml b/.travis.yml index 7b373c4ff..9a1c9b108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10.2 +osx_image: xcode11 language: objective-c # Handle git submodules yourself diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj index 1cf3df5c4..be54b50f0 100644 --- a/ChatSecure.xcodeproj/project.pbxproj +++ b/ChatSecure.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -15,7 +15,6 @@ 6323C7041E396D3D00D0FB42 /* portrait.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6323C7011E396D3D00D0FB42 /* portrait.jpg */; }; 6323C7051E396D3D00D0FB42 /* small.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6323C7021E396D3D00D0FB42 /* small.jpg */; }; 632A2D341E2728B8000D3192 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 633104D61A169EC800C17BAE /* Localizable.strings */; }; - 633107201A16D1A300C17BAE /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 633106661A16D1A300C17BAE /* LaunchScreen.xib */; }; 6331072B1A16D1F200C17BAE /* DemoImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 633107291A16D1F200C17BAE /* DemoImages.xcassets */; }; 6331072C1A16D1F200C17BAE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6331072A1A16D1F200C17BAE /* Images.xcassets */; }; 635E51A91DA82A4E002B70AB /* OTROMEMOTestModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635E51A81DA82A4E002B70AB /* OTROMEMOTestModule.swift */; }; @@ -73,6 +72,7 @@ D9BC71DC1E53B31C007A3C4F /* SingleButtonTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D9BC71D91E53B2BF007A3C4F /* SingleButtonTableViewCell.xib */; }; D9BC71E11E53B4A3007A3C4F /* TwoButtonTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D9BC71DE1E53B465007A3C4F /* TwoButtonTableViewCell.xib */; }; D9DEC34A1FABC9F900BF1F7C /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D9DEC3491FABC9F900BF1F7C /* Settings.bundle */; }; + D9ECD08F2344626800ECE5F9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9ECD08E2344626800ECE5F9 /* LaunchScreen.storyboard */; }; DB6ED7303C69215971C9934B /* libPods-ChatSecureCorePods-ChatSecureTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 825F80066EC1363ED873BFC5 /* libPods-ChatSecureCorePods-ChatSecureTests.a */; }; /* End PBXBuildFile section */ @@ -330,7 +330,6 @@ 6331065F1A16D1A300C17BAE /* OTRSettingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRSettingTableViewCell.m; sourceTree = ""; }; 633106601A16D1A300C17BAE /* OTRStatusMessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRStatusMessageCell.h; sourceTree = ""; }; 633106611A16D1A300C17BAE /* OTRStatusMessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRStatusMessageCell.m; sourceTree = ""; }; - 633106661A16D1A300C17BAE /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LaunchScreen.xib; path = Resources/LaunchScreen.xib; sourceTree = ""; }; 633106671A16D1A300C17BAE /* OTRButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRButtonView.h; sourceTree = ""; }; 633106681A16D1A300C17BAE /* OTRButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRButtonView.m; sourceTree = ""; }; 633106691A16D1A300C17BAE /* OTRColorFadingDotView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRColorFadingDotView.h; sourceTree = ""; }; @@ -643,6 +642,7 @@ D9DB2D131F37AEBB005D64E4 /* OTRYapMessageSendAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTRYapMessageSendAction.swift; sourceTree = ""; }; D9DEC3491FABC9F900BF1F7C /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; D9E8277D1E2819F20071F40D /* strings.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = strings.json; path = OTRAssets/Strings/strings.json; sourceTree = SOURCE_ROOT; }; + D9ECD08E2344626800ECE5F9 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; D9EEEDD11D27388600B8BC54 /* OTRvCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTRvCard.h; path = "Yap Storage/OTRvCard.h"; sourceTree = ""; }; D9F3B1AE1FD48DDA00DFC5DA /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = ""; }; D9F5EC492016E94800010966 /* OTRProtocolManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTRProtocolManager.swift; sourceTree = ""; }; @@ -714,8 +714,8 @@ 633104D71A169EE600C17BAE /* Resources */ = { isa = PBXGroup; children = ( + D9ECD08E2344626800ECE5F9 /* LaunchScreen.storyboard */, D9DEC3491FABC9F900BF1F7C /* Settings.bundle */, - 633106661A16D1A300C17BAE /* LaunchScreen.xib */, D9227C231BA78E6B00B5E1D0 /* FontAwesome.ttf */, D95AD2281B684AE1007DEBC3 /* xmpp-server-list */, D973D7051A2D4094004D353E /* Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist */, @@ -1666,7 +1666,7 @@ }; }; buildConfigurationList = 6396AF951A169D54009F3E6C /* Build configuration list for PBXProject "ChatSecure" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 11.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -1732,11 +1732,11 @@ D93E50671FC3E9B400E0E624 /* OTRResources.bundle in Resources */, 635EF2021E276C410087BD72 /* Localizable.strings in Resources */, D9DEC34A1FABC9F900BF1F7C /* Settings.bundle in Resources */, + D9ECD08F2344626800ECE5F9 /* LaunchScreen.storyboard in Resources */, 6331072C1A16D1F200C17BAE /* Images.xcassets in Resources */, 6308D1451CA20762002F5F30 /* Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist in Resources */, D9365E7A1A1EB0050006434A /* torrc in Resources */, 6331072B1A16D1F200C17BAE /* DemoImages.xcassets in Resources */, - 633107201A16D1A300C17BAE /* LaunchScreen.xib in Resources */, D95AD2291B684AE1007DEBC3 /* xmpp-server-list in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1816,77 +1816,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecureTests/Pods-ChatSecureCorePods-ChatSecureTests-resources.sh", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@2x.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@2x~ipad.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@3x.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@3x~ipad.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity~ipad.png", - "${PODS_CONFIGURATION_BUILD_DIR}/Appirater/Appirater.bundle", - "${PODS_ROOT}/BButton/BButton/resources/FontAwesome.ttf", - "${PODS_CONFIGURATION_BUILD_DIR}/CPAProxy/CPAProxy.bundle", - "${PODS_ROOT}/FormatterKit/FormatterKit/FormatterKit.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK-Source/HockeySDKResources.bundle", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesLoadEarlierHeaderView.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesToolbarContentView.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesTypingIndicatorFooterView.xib", - "${PODS_ROOT}/../Submodules/LumberjackConsole/Source/LumberjackConsole.storyboard", - "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/TUSafariActivity/TUSafariActivity.bundle", - "${PODS_ROOT}/XLForm/XLForm/XLForm.bundle", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/Roster/CoreDataStorage/XMPPRoster.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld/XMPPRoom.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/HybridStorage/XMPPRoomHybrid.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/HybridStorage/XMPPRoomHybrid.xcdatamodeld/XMPPRoomHybrid.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0054/CoreDataStorage/XMPPvCard.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0054/CoreDataStorage/XMPPvCard.xcdatamodeld/XMPPvCard.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0115/CoreDataStorage/XMPPCapabilities.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving.xcdatamodeld/XMPPMessageArchiving.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XMPPMUCLight/CoreDataStorage/XMPPRoomLight.xcdatamodel", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecureTests/Pods-ChatSecureCorePods-ChatSecureTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@2x~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@3x~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Appirater.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CPAProxy.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FormatterKit.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesAssets.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesCollectionViewCellIncoming.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesCollectionViewCellOutgoing.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesLoadEarlierHeaderView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesToolbarContentView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesTypingIndicatorFooterView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LumberjackConsole.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TUSafariActivity.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XLForm.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoster.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoom.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoom.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomHybrid.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomHybrid.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPvCard.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPvCard.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPCapabilities.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPMessageArchiving.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPMessageArchiving.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomLight.mom", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecureTests/Pods-ChatSecureCorePods-ChatSecureTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1898,77 +1833,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure-resources.sh", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@2x.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@2x~ipad.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@3x.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity@3x~ipad.png", - "${PODS_ROOT}/ARChromeActivity/ARChromeActivity/ARChromeActivity~ipad.png", - "${PODS_CONFIGURATION_BUILD_DIR}/Appirater/Appirater.bundle", - "${PODS_ROOT}/BButton/BButton/resources/FontAwesome.ttf", - "${PODS_CONFIGURATION_BUILD_DIR}/CPAProxy/CPAProxy.bundle", - "${PODS_ROOT}/FormatterKit/FormatterKit/FormatterKit.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK-Source/HockeySDKResources.bundle", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesLoadEarlierHeaderView.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesToolbarContentView.xib", - "${PODS_ROOT}/../Submodules/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesTypingIndicatorFooterView.xib", - "${PODS_ROOT}/../Submodules/LumberjackConsole/Source/LumberjackConsole.storyboard", - "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/TUSafariActivity/TUSafariActivity.bundle", - "${PODS_ROOT}/XLForm/XLForm/XLForm.bundle", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/Roster/CoreDataStorage/XMPPRoster.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld/XMPPRoom.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/HybridStorage/XMPPRoomHybrid.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0045/HybridStorage/XMPPRoomHybrid.xcdatamodeld/XMPPRoomHybrid.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0054/CoreDataStorage/XMPPvCard.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0054/CoreDataStorage/XMPPvCard.xcdatamodeld/XMPPvCard.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0115/CoreDataStorage/XMPPCapabilities.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving.xcdatamodeld", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving.xcdatamodeld/XMPPMessageArchiving.xcdatamodel", - "${PODS_ROOT}/../Submodules/XMPPFramework/Extensions/XMPPMUCLight/CoreDataStorage/XMPPRoomLight.xcdatamodel", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@2x~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity@3x~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ARChromeActivity~ipad.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Appirater.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CPAProxy.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FormatterKit.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesAssets.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesCollectionViewCellIncoming.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesCollectionViewCellOutgoing.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesLoadEarlierHeaderView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesToolbarContentView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JSQMessagesTypingIndicatorFooterView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LumberjackConsole.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TUSafariActivity.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XLForm.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoster.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoom.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoom.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomHybrid.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomHybrid.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPvCard.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPvCard.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPCapabilities.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPMessageArchiving.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPMessageArchiving.mom", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/XMPPRoomLight.mom", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2140,7 +2010,11 @@ ); INFOPLIST_FILE = ChatSecureUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure.ChatSecureUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -2159,7 +2033,11 @@ DEVELOPMENT_TEAM = SF3NXKQQ64; INFOPLIST_FILE = ChatSecureUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure.ChatSecureUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_TARGET_NAME = ChatSecure; @@ -2274,7 +2152,8 @@ SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = debugging; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -2306,7 +2185,10 @@ ); INFOPLIST_FILE = ChatSecure/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -2340,7 +2222,10 @@ ); INFOPLIST_FILE = ChatSecure/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -2365,7 +2250,11 @@ "$(inherited)", ); INFOPLIST_FILE = ChatSecureTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -2385,7 +2274,11 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = ChatSecureTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.chrisballinger.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "ChatSecureTests/ChatSecureTests-Bridging-Header.h"; diff --git a/ChatSecure/LaunchScreen.storyboard b/ChatSecure/LaunchScreen.storyboard new file mode 100644 index 000000000..097a23dae --- /dev/null +++ b/ChatSecure/LaunchScreen.storyboard @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChatSecure/Resources/LaunchScreen.xib b/ChatSecure/Resources/LaunchScreen.xib deleted file mode 100644 index 7270625d4..000000000 --- a/ChatSecure/Resources/LaunchScreen.xib +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt index b559be73b..bc073ab40 100644 --- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt +++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt @@ -8,11 +8,11 @@ version: 3.2.1 name: Alamofire, nameSpecified: body: Copyright (c) 2014 A… -version: 4.8.2 +version: 4.9.0 name: Alamofire, nameSpecified: body: Copyright (c) 2014 A… -version: 4.8.2 +version: 4.9.0 name: Appirater, nameSpecified: body: Copyright 2017. Aras… @@ -74,11 +74,11 @@ version: 7.6.3 name: CocoaLumberjack, nameSpecified: body: BSD 3-Clause License… -version: 3.5.3 +version: 3.6.0 name: CocoaLumberjack, nameSpecified: body: BSD 3-Clause License… -version: 3.5.3 +version: 3.6.0 name: CPAProxy, nameSpecified: body: Copyright (c) 2013 C… @@ -90,11 +90,11 @@ version: 1.2.0 name: DTFoundation, nameSpecified: body: Copyright (c) 2011, … -version: 1.7.13 +version: 1.7.14 name: DTFoundation, nameSpecified: body: Copyright (c) 2011, … -version: 1.7.13 +version: 1.7.14 name: FormatterKit, nameSpecified: body: Copyright (c) 2011–2… @@ -106,11 +106,11 @@ version: 1.9.0 name: GCDWebServer, nameSpecified: body: Copyright (c) 2012-2… -version: 3.5.2 +version: 3.5.3 name: GCDWebServer, nameSpecified: body: Copyright (c) 2012-2… -version: 3.5.2 +version: 3.5.3 name: HockeySDK-Source, nameSpecified: body: ## Licenses @@ -212,13 +212,13 @@ name: LicensePlist, nameSpecified: body: MIT License Copyrig… -version: 2.5.0 +version: 2.7.1 name: LicensePlist, nameSpecified: body: MIT License Copyrig… -version: 2.5.0 +version: 2.7.1 name: LumberjackConsole, nameSpecified: body: Apache License @@ -298,11 +298,11 @@ version: 1.2.0 name: PureLayout, nameSpecified: body: This code is distrib… -version: 3.1.4 +version: 3.1.5 name: PureLayout, nameSpecified: body: This code is distrib… -version: 3.1.4 +version: 3.1.5 name: QRCodeReaderViewController, nameSpecified: body: The MIT License (MIT… @@ -424,4 +424,4 @@ body: This file contains t… add-version-numbers: true -LicensePlist Version: 1.8.3 \ No newline at end of file +LicensePlist Version: 2.7.1 \ No newline at end of file diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist index a387a480f..e8e82a4d7 100644 --- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist +++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist @@ -4,6 +4,12 @@ PreferenceSpecifiers + + Title + Licenses + Type + PSGroupSpecifier + File com.mono0926.LicensePlist/AFNetworking @@ -16,7 +22,7 @@ File com.mono0926.LicensePlist/Alamofire Title - Alamofire (4.8.2) + Alamofire (4.9.0) Type PSChildPaneSpecifier @@ -80,7 +86,7 @@ File com.mono0926.LicensePlist/CocoaLumberjack Title - CocoaLumberjack (3.5.3) + CocoaLumberjack (3.6.0) Type PSChildPaneSpecifier @@ -96,7 +102,7 @@ File com.mono0926.LicensePlist/DTFoundation Title - DTFoundation (1.7.13) + DTFoundation (1.7.14) Type PSChildPaneSpecifier @@ -112,7 +118,7 @@ File com.mono0926.LicensePlist/GCDWebServer Title - GCDWebServer (3.5.2) + GCDWebServer (3.5.3) Type PSChildPaneSpecifier @@ -240,7 +246,7 @@ File com.mono0926.LicensePlist/LicensePlist Title - LicensePlist (2.5.0) + LicensePlist (2.7.1) Type PSChildPaneSpecifier @@ -328,7 +334,7 @@ File com.mono0926.LicensePlist/PureLayout Title - PureLayout (3.1.4) + PureLayout (3.1.5) Type PSChildPaneSpecifier diff --git a/ChatSecureCore.podspec b/ChatSecureCore.podspec index 5ba98807e..dfe44949f 100644 --- a/ChatSecureCore.podspec +++ b/ChatSecureCore.podspec @@ -40,7 +40,7 @@ TODO: Add long description of the pod here. # Utility - s.dependency 'CocoaLumberjack/Swift', '~> 3.5.0' + s.dependency 'CocoaLumberjack/Swift', '~> 3.6.0' s.dependency 'MWFeedParser', '~> 1.0' s.dependency 'BBlock', '~> 1.2' s.dependency 'HockeySDK-Source' diff --git a/Gemfile.lock b/Gemfile.lock index db8eb74f1..a767f13c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,30 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - babosa (1.0.2) + babosa (1.0.3) claide (1.0.3) - cocoapods (1.7.5) + cocoapods (1.8.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.8.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -30,9 +33,11 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.1) activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -41,7 +46,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) @@ -58,7 +63,7 @@ GEM dotenv (2.7.5) emoji_regex (1.0.1) escape (0.0.4) - excon (0.66.0) + excon (0.67.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -66,8 +71,8 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.5) - fastlane (2.128.1) + fastimage (2.1.7) + fastlane (2.132.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -77,9 +82,9 @@ GEM dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) excon (>= 0.45.0, < 1.0.0) - faraday (~> 0.9) + faraday (< 0.16.0) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) + faraday_middleware (< 0.16.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.21.2, < 0.24.0) @@ -115,9 +120,9 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) - google-cloud-core (1.3.0) + google-cloud-core (1.3.1) google-cloud-env (~> 1.0) - google-cloud-env (1.2.0) + google-cloud-env (1.2.1) faraday (~> 0.11) google-cloud-storage (1.16.0) digest-crc (~> 0.4) @@ -140,11 +145,11 @@ GEM json (2.2.0) jwt (2.1.0) memoist (0.16.0) - mime-types (3.2.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2019.0904) mini_magick (4.9.5) - minitest (5.11.3) + minitest (5.12.2) molinillo (0.6.6) multi_json (1.13.1) multi_xml (0.6.0) @@ -163,14 +168,14 @@ GEM retriable (3.1.2) rouge (2.0.7) ruby-macho (1.4.0) - rubyzip (1.2.3) + rubyzip (1.3.0) security (0.1.3) signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.5) + simctl (1.6.6) CFPropertyList naturally slack-notifier (2.3.2) diff --git a/Podfile b/Podfile index 68887e10f..c6b98b9b6 100755 --- a/Podfile +++ b/Podfile @@ -41,7 +41,7 @@ abstract_target 'ChatSecureCorePods' do pod 'LumberjackConsole', :path => 'Submodules/LumberjackConsole/LumberjackConsole.podspec' # Utility - pod 'CocoaLumberjack/Swift', '~> 3.5.0' + pod 'CocoaLumberjack/Swift', '~> 3.6.0' pod 'MWFeedParser', '~> 1.0' pod 'BBlock', '~> 1.2' pod 'HockeySDK-Source' diff --git a/Podfile.lock b/Podfile.lock index 7a853776b..86c685ba6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: - AFNetworking/Serialization (3.2.1) - AFNetworking/UIKit (3.2.1): - AFNetworking/NSURLSession - - Alamofire (4.8.2) + - Alamofire (4.9.0) - Appirater (2.3.1) - ARChromeActivity (1.0.6) - BBlock (1.2.1): @@ -36,7 +36,7 @@ PODS: - BButton (~> 4.0) - ChatSecure-Push-iOS - CocoaAsyncSocket (~> 7.6.0) - - CocoaLumberjack/Swift (~> 3.5.0) + - CocoaLumberjack/Swift (~> 3.6.0) - CPAProxy - FormatterKit (~> 1.8) - GCDWebServer (~> 3.4) @@ -71,15 +71,15 @@ PODS: - YapTaskQueue/SQLCipher - ZXingObjC (~> 3.6) - CocoaAsyncSocket (7.6.3) - - CocoaLumberjack (3.5.3): - - CocoaLumberjack/Core (= 3.5.3) - - CocoaLumberjack/Core (3.5.3) - - CocoaLumberjack/Swift (3.5.3): + - CocoaLumberjack (3.6.0): + - CocoaLumberjack/Core (= 3.6.0) + - CocoaLumberjack/Core (3.6.0) + - CocoaLumberjack/Swift (3.6.0): - CocoaLumberjack/Core - CPAProxy (1.2.0): - CocoaAsyncSocket - - DTFoundation/Core (1.7.13) - - DTFoundation/DTASN1 (1.7.13): + - DTFoundation/Core (1.7.14) + - DTFoundation/DTASN1 (1.7.14): - DTFoundation/Core - FormatterKit (1.9.0): - FormatterKit/AddressFormatter (= 1.9.0) @@ -111,9 +111,9 @@ PODS: - FormatterKit/Resources - FormatterKit/URLRequestFormatter (1.9.0): - FormatterKit/Resources - - GCDWebServer (3.5.2): - - GCDWebServer/Core (= 3.5.2) - - GCDWebServer/Core (3.5.2) + - GCDWebServer (3.5.3): + - GCDWebServer/Core (= 3.5.3) + - GCDWebServer/Core (3.5.3) - HockeySDK-Source (5.1.4) - HTMLReader (2.1.4) - IOCipher/common (0.1.0): @@ -136,7 +136,7 @@ PODS: - libsqlfs/SQLCipher (1.3.2): - libsqlfs/common - SQLCipher (>= 3.4.0) - - LicensePlist (2.5.0) + - LicensePlist (2.7.1) - LumberjackConsole (3.3.1): - CocoaLumberjack (>= 3.x) - NBUCore (>= 2.1.0) @@ -163,7 +163,7 @@ PODS: - ProxyKit/common (1.2.0): - CocoaAsyncSocket (~> 7.6) - CocoaLumberjack - - PureLayout (3.1.4) + - PureLayout (3.1.5) - QRCodeReaderViewController (4.0.2) - SAMKeychain (1.5.3) - SignalProtocolC (2.3.2) @@ -262,7 +262,7 @@ DEPENDENCIES: - ChatSecure-Push-iOS (from `Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec`) - ChatSecureCore (from `ChatSecureCore.podspec`) - CocoaAsyncSocket (~> 7.6.0) - - CocoaLumberjack/Swift (~> 3.5.0) + - CocoaLumberjack/Swift (~> 3.6.0) - CPAProxy (from `Submodules/CPAProxy/CPAProxy.podspec`) - GCDWebServer (~> 3.4) - HockeySDK-Source @@ -289,7 +289,7 @@ DEPENDENCIES: - YapTaskQueue/SQLCipher (from `Submodules/YapTaskQueue/YapTaskQueue.podspec`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - AFNetworking - Alamofire - Appirater @@ -367,19 +367,19 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 - Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 + Alamofire: afc3e7c6db61476cb45cdd23fed06bad03bbc321 Appirater: 44a4651f7912a17dc906b655f0c215d5bb768b84 ARChromeActivity: 5dcf9b9f09323761f992aff3525cdd777f83609d BBlock: c56d7f72597ffe1634fcdc73836c5c0fed3271be BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27 ChatSecure-Push-iOS: ed51f98bc019be9e2d859604677a21a4ee68422e - ChatSecureCore: ae0bc3f0fa3d811121d7ec103e1b827aeb344d96 + ChatSecureCore: 64f537219cbe9da8b0dd459132780b1b37b91a73 CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 - CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 + CocoaLumberjack: 78b0c238666f4f58db069738ec176f4519557516 CPAProxy: 863aae0e93ca45401e9148db05abab5b940e7284 - DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df + DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41 - GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990 + GCDWebServer: c0ab22c73e1b84f358d1e2f74bf6afd1c60829f2 HockeySDK-Source: ebf3378833f457fa08aa452352b105dc21bfebcb HTMLReader: 2fc5ccf6a041b7070d9b43b101034cba63d2ae2a IOCipher: 89435857693a11d24024cbc3da541549eb36fb0e @@ -390,7 +390,7 @@ SPEC CHECKSUMS: KVOController: d72ace34afea42468329623b3379ab3cd1d286b6 libidn: e4576a956b797c584c77aaedfc6e3dd639b61bdc libsqlfs: b3c1be163c2fba6b041379cfa5861033783ddae9 - LicensePlist: e5f8f2e3465620e53ec4c669955a5a7d0692b9cb + LicensePlist: 88cf08b3ce6d4e9c72d78e1bd0121adb3c98dcb1 LumberjackConsole: 218fed8e807ba6ce0bedbba06b7b295dc0efaf0c Mantle: bdb09649c721dcefc53132f3767f6e40d4d47740 MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 @@ -401,7 +401,7 @@ SPEC CHECKSUMS: OTRKit: 559ddb8defb126bdbf6a9f43ee3649b219f42320 ParkedTextField: 865c835f54b39c611b580e0fe60199538cbc2f67 ProxyKit: ae9ed36909d0e68b27087eb3ed5aa35c86f8bff0 - PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e + PureLayout: 9b4ad47b2f0388c84ff534af23d96e720c1b875a QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SignalProtocolC: 051512e9f3abfeb4120c5e9673af9ae0ee370070 @@ -415,6 +415,6 @@ SPEC CHECKSUMS: YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: b141f51290d05663f08b633a34ffb15eee02707b +PODFILE CHECKSUM: 4b32ae7a45c8e239736f7a1079af0d86970ad610 -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.1 From 4d7c0ae354db1481ffb16be5644132e071535e08 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Tue, 1 Oct 2019 22:24:40 -0700 Subject: [PATCH 02/53] Fix dark mode issues on donation screen --- ChatSecure.xcodeproj/project.pbxproj | 6 +- .../View Controllers/Purchase.storyboard | 51 ++++--- .../PurchaseViewController.swift | 24 ++-- ChatSecure/Info.plist | 4 +- .../LaunchImage.launchimage/Contents.json | 124 ------------------ .../iPadLaunchLandscape.png | Bin 6333 -> 0 bytes .../iPadLaunchLandscape@2x.png | Bin 15450 -> 0 bytes .../iPadLaunchPortrait.png | Bin 5767 -> 0 bytes .../iPadLaunchPortrait@2x.png | Bin 16290 -> 0 bytes .../iPhoneLaunch480h@2x.png | Bin 4924 -> 0 bytes .../iPhoneLaunch568h@2x.png | Bin 5623 -> 0 bytes 11 files changed, 44 insertions(+), 165 deletions(-) delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPadLaunchLandscape.png delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPadLaunchLandscape@2x.png delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPadLaunchPortrait.png delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPadLaunchPortrait@2x.png delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPhoneLaunch480h@2x.png delete mode 100644 ChatSecure/Resources/Images.xcassets/LaunchImage.launchimage/iPhoneLaunch568h@2x.png diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj index be54b50f0..5da6cf9da 100644 --- a/ChatSecure.xcodeproj/project.pbxproj +++ b/ChatSecure.xcodeproj/project.pbxproj @@ -2165,7 +2165,6 @@ baseConfigurationReference = DE32B878BAC9A236855EAF6E /* Pods-ChatSecureCorePods-ChatSecure.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_DISPLAY_NAME_SUFFIX = ""; BUNDLE_ID_SUFFIX = ""; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; @@ -2175,6 +2174,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 144; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2189,6 +2189,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 4.3.10; PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -2202,7 +2203,6 @@ baseConfigurationReference = 7A62FCE8FEC1E7C9644F8C38 /* Pods-ChatSecureCorePods-ChatSecure.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_DISPLAY_NAME_SUFFIX = ""; BUNDLE_ID_SUFFIX = ""; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; @@ -2212,6 +2212,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 144; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2226,6 +2227,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 4.3.10; PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/ChatSecure/Classes/View Controllers/Purchase.storyboard b/ChatSecure/Classes/View Controllers/Purchase.storyboard index 545bbdf00..ee232726c 100644 --- a/ChatSecure/Classes/View Controllers/Purchase.storyboard +++ b/ChatSecure/Classes/View Controllers/Purchase.storyboard @@ -1,12 +1,9 @@ - - - - + + - - + @@ -23,7 +20,7 @@ - + - - + + - - + + - + - +