From e4ba4f950ef16e647d0f973740fce4ea067fb894 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Fri, 8 Jul 2016 17:40:51 -0700 Subject: [PATCH] 3.2.3 (36) --- ChatSecure.xcodeproj/project.pbxproj | 2 +- .../Accounts/OTRGoogleOAuthXMPPAccount.m | 3 +- ChatSecure/Info.plist | 2 +- Podfile | 5 +- Podfile.lock | 136 +++++++++--------- Submodules/XMPPFramework | 2 +- 6 files changed, 79 insertions(+), 71 deletions(-) diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj index b7fa25645..d4ca1850f 100644 --- a/ChatSecure.xcodeproj/project.pbxproj +++ b/ChatSecure.xcodeproj/project.pbxproj @@ -2630,7 +2630,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "9988a231-5968-492c-b874-2e5e534a8710"; + PROVISIONING_PROFILE = "e7440889-8fd6-4e4e-b3ae-5d0cc8a727f8"; }; name = Release; }; diff --git a/ChatSecure/Classes/Model/Yap Storage/Accounts/OTRGoogleOAuthXMPPAccount.m b/ChatSecure/Classes/Model/Yap Storage/Accounts/OTRGoogleOAuthXMPPAccount.m index aeaf7c280..9c05e6459 100644 --- a/ChatSecure/Classes/Model/Yap Storage/Accounts/OTRGoogleOAuthXMPPAccount.m +++ b/ChatSecure/Classes/Model/Yap Storage/Accounts/OTRGoogleOAuthXMPPAccount.m @@ -71,8 +71,9 @@ -(GTMOAuth2Authentication *)authToken if ([tokenDictionary count]) { auth = [[GTMOAuth2Authentication alloc] init]; [auth setParameters:[tokenDictionary mutableCopy]]; + } else { + return nil; } - NSParameterAssert(auth != nil); auth.clientID = [OTRBranding googleAppId]; auth.clientSecret = [OTRSecrets googleAppSecret]; auth.scope = [OTRBranding googleAppScope]; diff --git a/ChatSecure/Info.plist b/ChatSecure/Info.plist index 002eaf56b..071146325 100644 --- a/ChatSecure/Info.plist +++ b/ChatSecure/Info.plist @@ -35,7 +35,7 @@ CFBundleVersion - 34 + 36 FacebookAppID 447241325394334 FacebookDisplayName diff --git a/Podfile b/Podfile index e5303f7ba..54340b745 100755 --- a/Podfile +++ b/Podfile @@ -42,7 +42,10 @@ target 'ChatSecureCore' do pod 'uservoice-iphone-sdk', '~> 3.2' pod 'TUSafariActivity', '~> 1.0' pod 'ARChromeActivity', '~> 1.0' - pod 'CocoaAsyncSocket', '~> 7.4' + # We need a commit from next release + #pod 'CocoaAsyncSocket', '~> 7.4' + pod 'CocoaAsyncSocket', :git => 'https://github.com/robbiehanson/CocoaAsyncSocket.git', :commit => '071109901100334ad54ae704b4c644b6bb89ad21' + pod 'JTSImageViewController', '~> 1.4' pod 'KVOController', '~> 1.0' #Reachability only needed for YapActionItems diff --git a/Podfile.lock b/Podfile.lock index edbe18267..720aca3af 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,13 +26,9 @@ PODS: - BBlock/UIKit (1.2.1) - BButton (4.0.2) - ChatSecure-Push-iOS (0.2) - - 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) + - CocoaAsyncSocket (7.5.1): + - CocoaAsyncSocket/GCD (= 7.5.1) + - CocoaAsyncSocket/GCD (7.5.1) - CocoaLumberjack (2.2.0): - CocoaLumberjack/Default (= 2.2.0) - CocoaLumberjack/Extensions (= 2.2.0) @@ -61,9 +57,9 @@ PODS: - JSQSystemSoundPlayer (2.0.1) - JTSImageViewController (1.5.1) - JVFloatLabeledTextField (1.1.0) - - KissXML/Core (5.0.3) - - KissXML/libxml_module (5.0.3): - - KissXML/Core + - KissXML (5.1.2): + - KissXML/Core (= 5.1.2) + - KissXML/Core (5.1.2) - KVOController (1.1.0) - libsqlfs/common (1.3) - libsqlfs/SQLCipher (1.3): @@ -103,9 +99,9 @@ PODS: - uservoice-iphone-sdk (3.2.7) - VTAcknowledgementsViewController (0.17) - XLForm (3.1.1) - - XMPPFramework (3.6.7): - - XMPPFramework/All (= 3.6.7) - - XMPPFramework/All (3.6.7): + - XMPPFramework (3.7.0): + - XMPPFramework/All (= 3.7.0) + - XMPPFramework/All (3.7.0): - XMPPFramework/BandwidthMonitor - XMPPFramework/Core - XMPPFramework/CoreDataStorage @@ -114,6 +110,7 @@ PODS: - XMPPFramework/ProcessOne - XMPPFramework/Reconnect - XMPPFramework/Roster + - XMPPFramework/SystemInputActivityMonitor - XMPPFramework/XEP-0009 - XMPPFramework/XEP-0012 - XMPPFramework/XEP-0016 @@ -153,114 +150,114 @@ PODS: - XMPPFramework/XEP-0357 - XMPPFramework/XEP-0363 - XMPPFramework/XMPPMUCLight - - XMPPFramework/BandwidthMonitor (3.6.7): + - XMPPFramework/BandwidthMonitor (3.7.0): - XMPPFramework/Core - - XMPPFramework/Core (3.6.7): - - CocoaAsyncSocket (~> 7.4.1) + - XMPPFramework/Core (3.7.0): + - CocoaAsyncSocket (~> 7.5.0) - CocoaLumberjack (~> 2.0) - - KissXML/libxml_module (~> 5.0.3) + - KissXML (~> 5.1.2) - ProxyKit/Client (~> 1.0) - - XMPPFramework/CoreDataStorage (3.6.7): + - XMPPFramework/CoreDataStorage (3.7.0): - XMPPFramework/Core - - XMPPFramework/FileTransfer (3.6.7): + - XMPPFramework/FileTransfer (3.7.0): - XMPPFramework/Core - - XMPPFramework/GoogleSharedStatus (3.6.7): + - XMPPFramework/GoogleSharedStatus (3.7.0): - XMPPFramework/Core - - XMPPFramework/ProcessOne (3.6.7): + - XMPPFramework/ProcessOne (3.7.0): - XMPPFramework/Core - - XMPPFramework/Reconnect (3.6.7): + - XMPPFramework/Reconnect (3.7.0): - XMPPFramework/Core - - XMPPFramework/Roster (3.6.7): + - XMPPFramework/Roster (3.7.0): - XMPPFramework/Core - XMPPFramework/CoreDataStorage - - XMPPFramework/XEP-0009 (3.6.7): + - XMPPFramework/XEP-0009 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0012 (3.6.7): + - XMPPFramework/XEP-0012 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0016 (3.6.7): + - XMPPFramework/XEP-0016 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0045 (3.6.7): + - XMPPFramework/XEP-0045 (3.7.0): - XMPPFramework/Core - XMPPFramework/CoreDataStorage - XMPPFramework/XEP-0203 - - XMPPFramework/XEP-0054 (3.6.7): + - XMPPFramework/XEP-0054 (3.7.0): - XMPPFramework/Core - XMPPFramework/Roster - - XMPPFramework/XEP-0059 (3.6.7): + - XMPPFramework/XEP-0059 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0060 (3.6.7): + - XMPPFramework/XEP-0060 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0065 (3.6.7): + - XMPPFramework/XEP-0065 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0066 (3.6.7): + - XMPPFramework/XEP-0066 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0077 (3.6.7): + - XMPPFramework/XEP-0077 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0082 (3.6.7): + - XMPPFramework/XEP-0082 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0085 (3.6.7): + - XMPPFramework/XEP-0085 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0092 (3.6.7): + - XMPPFramework/XEP-0092 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0100 (3.6.7): + - XMPPFramework/XEP-0100 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0106 (3.6.7): + - XMPPFramework/XEP-0106 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0115 (3.6.7): + - XMPPFramework/XEP-0115 (3.7.0): - XMPPFramework/Core - XMPPFramework/CoreDataStorage - - XMPPFramework/XEP-0136 (3.6.7): + - XMPPFramework/XEP-0136 (3.7.0): - XMPPFramework/CoreDataStorage - XMPPFramework/XEP-0085 - XMPPFramework/XEP-0203 - - XMPPFramework/XEP-0147 (3.6.7): + - XMPPFramework/XEP-0147 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0153 (3.6.7): + - XMPPFramework/XEP-0153 (3.7.0): - XMPPFramework/Core - XMPPFramework/XEP-0054 - - XMPPFramework/XEP-0172 (3.6.7): + - XMPPFramework/XEP-0172 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0184 (3.6.7): + - XMPPFramework/XEP-0184 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0191 (3.6.7): + - XMPPFramework/XEP-0191 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0198 (3.6.7): + - XMPPFramework/XEP-0198 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0199 (3.6.7): + - XMPPFramework/XEP-0199 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0202 (3.6.7): + - XMPPFramework/XEP-0202 (3.7.0): - XMPPFramework/Core - XMPPFramework/XEP-0082 - - XMPPFramework/XEP-0203 (3.6.7): + - XMPPFramework/XEP-0203 (3.7.0): - XMPPFramework/Core - XMPPFramework/XEP-0082 - - XMPPFramework/XEP-0223 (3.6.7): + - XMPPFramework/XEP-0223 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0224 (3.6.7): + - XMPPFramework/XEP-0224 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0280 (3.6.7): + - XMPPFramework/XEP-0280 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0297 (3.6.7): + - XMPPFramework/XEP-0297 (3.7.0): - XMPPFramework/Core - XMPPFramework/XEP-0203 - - XMPPFramework/XEP-0308 (3.6.7): + - XMPPFramework/XEP-0308 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0313 (3.6.7): + - XMPPFramework/XEP-0313 (3.7.0): - XMPPFramework/Core - XMPPFramework/XEP-0059 - - XMPPFramework/XEP-0333 (3.6.7): + - XMPPFramework/XEP-0333 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0334 (3.6.7): + - XMPPFramework/XEP-0334 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0335 (3.6.7): + - XMPPFramework/XEP-0335 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0352 (3.6.7): + - XMPPFramework/XEP-0352 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0357 (3.6.7): + - XMPPFramework/XEP-0357 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XEP-0363 (3.6.7): + - XMPPFramework/XEP-0363 (3.7.0): - XMPPFramework/Core - - XMPPFramework/XMPPMUCLight (3.6.7): + - XMPPFramework/XMPPMUCLight (3.7.0): - XMPPFramework/Core - XMPPFramework/CoreDataStorage - XMPPFramework/XEP-0203 @@ -324,7 +321,8 @@ DEPENDENCIES: - BBlock (~> 1.2) - BButton (~> 4.0) - ChatSecure-Push-iOS (from `Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec`) - - CocoaAsyncSocket (~> 7.4) + - CocoaAsyncSocket (from `https://github.com/robbiehanson/CocoaAsyncSocket.git`, + commit `071109901100334ad54ae704b4c644b6bb89ad21`) - CocoaLumberjack (~> 2.0) - CPAProxy (from `Submodules/CPAProxy/CPAProxy.podspec`) - gtm-http-fetcher (from `Podspecs/gtm-http-fetcher.podspec`) @@ -360,6 +358,9 @@ DEPENDENCIES: EXTERNAL SOURCES: ChatSecure-Push-iOS: :path: Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec + CocoaAsyncSocket: + :commit: 071109901100334ad54ae704b4c644b6bb89ad21 + :git: https://github.com/robbiehanson/CocoaAsyncSocket.git CPAProxy: :path: Submodules/CPAProxy/CPAProxy.podspec gtm-http-fetcher: @@ -379,6 +380,9 @@ EXTERNAL SOURCES: :path: Submodules/XMPPFramework/XMPPFramework.podspec CHECKOUT OPTIONS: + CocoaAsyncSocket: + :commit: 071109901100334ad54ae704b4c644b6bb89ad21 + :git: https://github.com/robbiehanson/CocoaAsyncSocket.git JSQMessagesViewController: :commit: 4bae8b303c4f7e3c34571a4c898bd1f11ecc65a5 :git: https://github.com/ChatSecure/JSQMessagesViewController @@ -390,7 +394,7 @@ SPEC CHECKSUMS: BBlock: c56d7f72597ffe1634fcdc73836c5c0fed3271be BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27 ChatSecure-Push-iOS: fe8577fd81ff76b1f303dcd51a350fb0c964a6d0 - CocoaAsyncSocket: a18c75dca4b08723628a0bacca6e94803d90be91 + CocoaAsyncSocket: e0a7e93b2ffa411592ff87e58524fbbc9b95b4fa CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0 CPAProxy: cfd27b25328d6517b1f8570c4f0045838353e888 GCDWebServer: 2a375ec42839a41d7187d04e5b688d32fa5c4cd5 @@ -402,7 +406,7 @@ SPEC CHECKSUMS: JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9 JVFloatLabeledTextField: ea4a3d8387ddd43724c472bb2b8ab39b79af05d4 - KissXML: d19dd6dc65e0dc721ba92b3077b8ebdd240f1c1e + KissXML: 246c842586bb77110e04fb88e19376d96245c856 KVOController: 321b5fc59300fcaabd42c0f679baa7a27efbb2fd libsqlfs: 179e4fb40b8c07fd0ee7933ec4c0b9f4815cbd0e Mantle: bc40bb061d8c2c6fb48d5083e04d928c3b7f73d9 @@ -423,7 +427,7 @@ SPEC CHECKSUMS: uservoice-iphone-sdk: 9abf27254c8488d7b72d70fb9b621132d6beebd4 VTAcknowledgementsViewController: 6056f5f5e5ed995bbf0581bed6ddd29355ca9a80 XLForm: c9ee7e0f859341279bfd894f9589a9d25c23e4df - XMPPFramework: 49d1d67148c734cd0afe0af0aa1724d5ace7f909 + XMPPFramework: 229663616e75c526bf4e9ba892897827e3722aab YapDatabase: c00f4197bba2fea17bdbd82c8e8e3f7104b6fa67 ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a diff --git a/Submodules/XMPPFramework b/Submodules/XMPPFramework index d3f6d7602..9b4fef914 160000 --- a/Submodules/XMPPFramework +++ b/Submodules/XMPPFramework @@ -1 +1 @@ -Subproject commit d3f6d76021579204f5bf48e150de85adca4a156a +Subproject commit 9b4fef914e64e4871f9497f4d4ee33416beac283