oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash after deleting message (#1219) 

* update to JSQMessageViewController fixes #1218
* no need for SVC to retain membership of MVC

// FREEBIE
This commit is contained in:
Michael Kirk 2016-06-15 12:46:29 -07:00 committed by GitHub
parent 965261f465
commit 7fef6aeab2
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Podfile
View File

@ -9,8 +9,7 @@ target 'Signal' do
pod 'FFCircularProgressView', '~> 0.5'
pod 'SCWaveformView', '~> 1.0'
pod 'DJWActionSheet'
pod 'JSQMessagesViewController', :git => 'https://github.com/WhisperSystems/JSQMessagesViewController', :commit => 'e5582fef8a6b3e35f8070361ef37237222da712b'
pod 'JSQMessagesViewController', :git => 'https://github.com/WhisperSystems/JSQMessagesViewController', :branch => 'JSignalQ'
target 'SignalTests' do
inherit! :search_paths
end

8
Podfile.lock
View File

@ -115,7 +115,7 @@ PODS:
DEPENDENCIES:
- DJWActionSheet
- FFCircularProgressView (~> 0.5)
- JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`, commit `e5582fef8a6b3e35f8070361ef37237222da712b`)
- JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`, branch `JSignalQ`)
- OpenSSL (~> 1.0.208)
- PastelogKit (~> 1.3)
- SCWaveformView (~> 1.0)
@ -124,7 +124,7 @@ DEPENDENCIES:
EXTERNAL SOURCES:
JSQMessagesViewController:
:commit: e5582fef8a6b3e35f8070361ef37237222da712b
:branch: JSignalQ
:git: https://github.com/WhisperSystems/JSQMessagesViewController
SignalServiceKit:
:git: https://github.com/WhisperSystems/SignalServiceKit.git
@ -134,7 +134,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
JSQMessagesViewController:
:commit: e5582fef8a6b3e35f8070361ef37237222da712b
:commit: 225b1baa11125ea84d4b960d700834b5b0a40ee1
:git: https://github.com/WhisperSystems/JSQMessagesViewController
SignalServiceKit:
:commit: 8058951b08a9fb0c610c56bdb50c403132da2089
@ -168,6 +168,6 @@ SPEC CHECKSUMS:
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
YapDatabase: 713d4018cfacbd6e77dd430710ca84730e450980
PODFILE CHECKSUM: a9818778687fb3b24c8db9e4fe1e7344dcf7643b
PODFILE CHECKSUM: ab4ae2b002e53f49ff0b90778217bcc43fd30773
COCOAPODS: 1.0.1

7
Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
View File

@ -7,6 +7,7 @@
"ABB939127996C66F7E852A780552ADEEF03C6B13" : 0,
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
"5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
"90530B99EB0008E7A50951FDFBE02169118FA649" : 0,
"D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
@ -14,6 +15,7 @@
"ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/",
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/",
"5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
"90530B99EB0008E7A50951FDFBE02169118FA649" : "JSQMessagesViewController\/",
"D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Signal",
@ -30,6 +32,11 @@
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/JSQMessagesViewController.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "90530B99EB0008E7A50951FDFBE02169118FA649"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/SocketRocket.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

2
Signal/Signal-Info.plist
View File

@ -38,7 +38,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.3.2.0 </string>
<string>2.3.2.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LOGS_EMAIL</key>

7
Signal/src/view controllers/UITests/SignalsViewController.m
View File

@ -31,7 +31,6 @@ static NSString *const kShowSignupFlowSegue = @"showSignupFlow";
@interface SignalsViewController ()
@property (nonatomic, strong) MessagesViewController *mvc;
@property (nonatomic, strong) YapDatabaseConnection *editingDbConnection;
@property (nonatomic, strong) YapDatabaseConnection *uiDatabaseConnection;
@property (nonatomic, strong) YapDatabaseViewMappings *threadMappings;
@ -324,7 +323,7 @@ static NSString *const kShowSignupFlowSegue = @"showSignupFlow";
- (void)presentThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing {
dispatch_async(dispatch_get_main_queue(), ^{
_mvc = [[UIStoryboard storyboardWithName:@"Storyboard" bundle:NULL]
MessagesViewController *mvc = [[UIStoryboard storyboardWithName:@"Storyboard" bundle:NULL]
instantiateViewControllerWithIdentifier:@"MessagesViewController"];
if (self.presentedViewController) {
@ -332,8 +331,8 @@ static NSString *const kShowSignupFlowSegue = @"showSignupFlow";
}
[self.navigationController popToRootViewControllerAnimated:YES];
[_mvc configureForThread:thread keyboardOnViewAppearing:keyboardOnViewAppearing];
[self.navigationController pushViewController:_mvc animated:YES];
[mvc configureForThread:thread keyboardOnViewAppearing:keyboardOnViewAppearing];
[self.navigationController pushViewController:mvc animated:YES];
});
}