Update SignalServiceKit pod.
* Fetch messages when app becomes active.
This commit is contained in:
parent
b89e1617a9
commit
2dac6c888a
2
Podfile
2
Podfile
|
@ -4,7 +4,7 @@ source 'https://github.com/CocoaPods/Specs.git'
|
|||
target 'Signal' do
|
||||
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
|
||||
pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
|
||||
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/censorship-circumvention'
|
||||
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'master'
|
||||
#pod 'SignalServiceKit', path: '../SignalServiceKit'
|
||||
pod 'OpenSSL'
|
||||
pod 'PastelogKit', '~> 1.3'
|
||||
|
|
12
Podfile.lock
12
Podfile.lock
|
@ -32,7 +32,7 @@ PODS:
|
|||
- JSQMessagesViewController (7.3.4):
|
||||
- JSQSystemSoundPlayer (~> 2.0.1)
|
||||
- JSQSystemSoundPlayer (2.0.1)
|
||||
- libPhoneNumber-iOS (0.9.1)
|
||||
- libPhoneNumber-iOS (0.9.2)
|
||||
- Mantle (2.1.0):
|
||||
- Mantle/extobjc (= 2.1.0)
|
||||
- Mantle/extobjc (2.1.0)
|
||||
|
@ -121,7 +121,7 @@ DEPENDENCIES:
|
|||
- OpenSSL
|
||||
- PastelogKit (~> 1.3)
|
||||
- SCWaveformView (~> 1.0)
|
||||
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/censorship-circumvention`)
|
||||
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `master`)
|
||||
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
|
||||
- ZXingObjC
|
||||
|
||||
|
@ -129,7 +129,7 @@ EXTERNAL SOURCES:
|
|||
AxolotlKit:
|
||||
:git: https://github.com/WhisperSystems/SignalProtocolKit.git
|
||||
SignalServiceKit:
|
||||
:branch: mkirk/censorship-circumvention
|
||||
:branch: master
|
||||
:git: https://github.com/WhisperSystems/SignalServiceKit.git
|
||||
SocketRocket:
|
||||
:git: https://github.com/facebook/SocketRocket.git
|
||||
|
@ -139,7 +139,7 @@ CHECKOUT OPTIONS:
|
|||
:commit: 714f5ebe199ecc999b33c6f97a4bb57e2db90e75
|
||||
:git: https://github.com/WhisperSystems/SignalProtocolKit.git
|
||||
SignalServiceKit:
|
||||
:commit: 78515377b14f1055c4a87548a7899650b753ce52
|
||||
:commit: a9340b06fd6549766ab537b2d7d603bf96f82504
|
||||
:git: https://github.com/WhisperSystems/SignalServiceKit.git
|
||||
SocketRocket:
|
||||
:commit: 41b57bb2fc292a814f758441a05243eb38457027
|
||||
|
@ -154,7 +154,7 @@ SPEC CHECKSUMS:
|
|||
HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
|
||||
JSQMessagesViewController: 39fed975e3c9f8eba7292071e29eeb541d105e66
|
||||
JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
|
||||
libPhoneNumber-iOS: 81ad1e6bfcf46e668636333269afbfe60399a55b
|
||||
libPhoneNumber-iOS: a8bffdec18c37728360f6771fe021302f1e0b497
|
||||
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
|
||||
OpenSSL: 246ffb948e9d56466727fd318134af35f5aa764e
|
||||
PastelogKit: 7b475be4cf577713506a943dd940bcc0499c8bca
|
||||
|
@ -170,6 +170,6 @@ SPEC CHECKSUMS:
|
|||
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
|
||||
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
|
||||
|
||||
PODFILE CHECKSUM: e09325f010ba0ef1fd0bfa07f665e7be73c43ee0
|
||||
PODFILE CHECKSUM: cb24c78080551874a45d1a20de4a1bef7427b41f
|
||||
|
||||
COCOAPODS: 1.0.1
|
||||
|
|
|
@ -239,7 +239,11 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
|
|||
[TSSocketManager becomeActiveFromForeground];
|
||||
[[Environment getCurrent].contactsManager verifyABPermission];
|
||||
}];
|
||||
|
||||
|
||||
if ([TSAccountManager isRegistered]) {
|
||||
[[PushManager sharedManager] applicationDidBecomeActive];
|
||||
}
|
||||
|
||||
[self removeScreenProtection];
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#import <JSQMessagesViewController/JSQMessagesBubblesSizeCalculator.h>
|
||||
|
||||
NS_SWIFT_NAME(MessagesBubblesSizeCalculator)
|
||||
|
||||
@interface OWSMessagesBubblesSizeCalculator : JSQMessagesBubblesSizeCalculator
|
||||
|
||||
- (CGSize)messageBubbleSizeForMessageData:(id<JSQMessageData>)messageData
|
||||
|
|
|
@ -85,6 +85,7 @@ typedef void (^pushTokensSuccessBlock)(NSString *pushToken, NSString *voipToken)
|
|||
forLocalNotification:(UILocalNotification *)notification
|
||||
withResponseInfo:(NSDictionary *)responseInfo
|
||||
completionHandler:(void (^)())completionHandler;
|
||||
- (void)applicationDidBecomeActive;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -162,6 +162,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (void)applicationDidBecomeActive {
|
||||
[self.messageFetcherJob runAsync];
|
||||
}
|
||||
|
||||
- (UILocalNotification *)closeVOIPBackgroundTask {
|
||||
[[UIApplication sharedApplication] endBackgroundTask:_callBackgroundTask];
|
||||
_callBackgroundTask = UIBackgroundTaskInvalid;
|
||||
|
|
Loading…
Reference in New Issue