Skip to content

Commit 682e865

Browse files
chrisballingerchrisballinger
committed
Crash fixing
1 parent bb937cc commit 682e865

File tree

9 files changed

+83
-219
lines changed

9 files changed

+83
-219
lines changed

‎ChatSecure.xcodeproj/project.pbxproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
634905B01BD05E3900347FE2 /* OTRYapViewHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 634905AF1BD05E3900347FE2 /* OTRYapViewHandler.swift */; };
4444
634E68BD1BAB887200DC6B25 /* PushController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637645C81B98F9BF00B3402F /* PushController.swift */; };
4545
634E68BE1BAB891C00DC6B25 /* PushContainers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633821C81BA8D48D0019C906 /* PushContainers.swift */; };
46-
63564E0D1BBB114B00EB4CA6 /* PushOTRListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63564E0C1BBB114B00EB4CA6 /* PushOTRListener.swift */; };
4746
63564E101BBB1C5200EB4CA6 /* PushStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63564E0F1BBB1C5200EB4CA6 /* PushStorage.swift */; };
4847
6358FDE01CDC097A00C9D3B6 /* OTRXMPPMessageStatusModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6358FDDF1CDC097A00C9D3B6 /* OTRXMPPMessageStatusModule.swift */; };
4948
635E51A91DA82A4E002B70AB /* OTROMEMOTestModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635E51A81DA82A4E002B70AB /* OTROMEMOTestModule.swift */; };
@@ -885,7 +884,6 @@
885884
6353AC2C1AD5E32000753B83 /* OTRAudioTrashView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioTrashView.m; sourceTree = "<group>"; };
886885
6354BBE21A96C67400E8EBAC /* OTRMediaFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMediaFileManager.h; sourceTree = "<group>"; };
887886
6354BBE31A96C67400E8EBAC /* OTRMediaFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaFileManager.m; sourceTree = "<group>"; };
888-
63564E0C1BBB114B00EB4CA6 /* PushOTRListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushOTRListener.swift; sourceTree = "<group>"; };
889887
63564E0F1BBB1C5200EB4CA6 /* PushStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushStorage.swift; sourceTree = "<group>"; };
890888
6358FDDF1CDC097A00C9D3B6 /* OTRXMPPMessageStatusModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTRXMPPMessageStatusModule.swift; sourceTree = "<group>"; };
891889
635E51A81DA82A4E002B70AB /* OTROMEMOTestModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTROMEMOTestModule.swift; sourceTree = "<group>"; };
@@ -1399,7 +1397,6 @@
13991397
63DDD8AF1A9D3C0400C0A918 /* OTRMediaServer.m */,
14001398
637645C81B98F9BF00B3402F /* PushController.swift */,
14011399
63564E0F1BBB1C5200EB4CA6 /* PushStorage.swift */,
1402-
63564E0C1BBB114B00EB4CA6 /* PushOTRListener.swift */,
14031400
638045671BB4BDEC002D8BAE /* PushSerializer.swift */,
14041401
638045691BB4C832002D8BAE /* PushDeserializer.swift */,
14051402
63DC417A1BB3767000D42857 /* Errors.swift */,
@@ -2683,10 +2680,10 @@
26832680
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
26842681
"${BUILT_PRODUCTS_DIR}/DTFoundation/DTFoundation.framework",
26852682
"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework",
2683+
"${BUILT_PRODUCTS_DIR}/HockeySDK-Source/HockeySDK_Source.framework",
26862684
"${BUILT_PRODUCTS_DIR}/IOCipher/IOCipher.framework",
26872685
"${BUILT_PRODUCTS_DIR}/JSQMessagesViewController/JSQMessagesViewController.framework",
26882686
"${BUILT_PRODUCTS_DIR}/JTSImageViewController/JTSImageViewController.framework",
2689-
"${BUILT_PRODUCTS_DIR}/KSCrash/KSCrash.framework",
26902687
"${BUILT_PRODUCTS_DIR}/KissXML/KissXML.framework",
26912688
"${BUILT_PRODUCTS_DIR}/Kvitto/Kvitto.framework",
26922689
"${BUILT_PRODUCTS_DIR}/LumberjackConsole/LumberjackConsole.framework",
@@ -2723,10 +2720,10 @@
27232720
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
27242721
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DTFoundation.framework",
27252722
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework",
2723+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK_Source.framework",
27262724
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IOCipher.framework",
27272725
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQMessagesViewController.framework",
27282726
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JTSImageViewController.framework",
2729-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KSCrash.framework",
27302727
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KissXML.framework",
27312728
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kvitto.framework",
27322729
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LumberjackConsole.framework",
@@ -2791,10 +2788,10 @@
27912788
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
27922789
"${BUILT_PRODUCTS_DIR}/DTFoundation/DTFoundation.framework",
27932790
"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework",
2791+
"${BUILT_PRODUCTS_DIR}/HockeySDK-Source/HockeySDK_Source.framework",
27942792
"${BUILT_PRODUCTS_DIR}/IOCipher/IOCipher.framework",
27952793
"${BUILT_PRODUCTS_DIR}/JSQMessagesViewController/JSQMessagesViewController.framework",
27962794
"${BUILT_PRODUCTS_DIR}/JTSImageViewController/JTSImageViewController.framework",
2797-
"${BUILT_PRODUCTS_DIR}/KSCrash/KSCrash.framework",
27982795
"${BUILT_PRODUCTS_DIR}/KissXML/KissXML.framework",
27992796
"${BUILT_PRODUCTS_DIR}/Kvitto/Kvitto.framework",
28002797
"${BUILT_PRODUCTS_DIR}/LumberjackConsole/LumberjackConsole.framework",
@@ -2831,10 +2828,10 @@
28312828
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
28322829
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DTFoundation.framework",
28332830
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework",
2831+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK_Source.framework",
28342832
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IOCipher.framework",
28352833
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQMessagesViewController.framework",
28362834
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JTSImageViewController.framework",
2837-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KSCrash.framework",
28382835
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KissXML.framework",
28392836
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kvitto.framework",
28402837
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LumberjackConsole.framework",
@@ -3191,7 +3188,6 @@
31913188
D93DDAFF1BA79A2900CD8331 /* OTRChooseAccountViewController.m in Sources */,
31923189
D91C86681E4E6DEE008BD763 /* ServerCapabilityInfo.swift in Sources */,
31933190
D93DDB001BA79A2900CD8331 /* OTRComposeViewController.m in Sources */,
3194-
63564E0D1BBB114B00EB4CA6 /* PushOTRListener.swift in Sources */,
31953191
D9B79B961ECF951F00883963 /* OTRFileItem.m in Sources */,
31963192
D93DDB011BA79A2900CD8331 /* OTRConversationViewController.m in Sources */,
31973193
D93DDB021BA79A2900CD8331 /* OTRDatabaseUnlockViewController.m in Sources */,

‎ChatSecure/Classes/Controllers/OTREncryptionManager.h

-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
@import Foundation;
2424
@import OTRKit;
2525

26-
@class OTRPushTLVHandler;
27-
2826
extern NSString * _Nonnull const OTRMessageStateDidChangeNotification;
2927
extern NSString * _Nonnull const OTRWillStartGeneratingPrivateKeyNotification;
3028
extern NSString * _Nonnull const OTRDidFinishGeneratingPrivateKeyNotification;
@@ -43,7 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
4341

4442
@property (nonatomic, strong, readonly) OTRKit *otrKit;
4543
@property (nonatomic, strong, readonly) OTRDataHandler *dataHandler;
46-
@property (nonatomic, strong, readonly) OTRPushTLVHandler *pushTLVHandler;
4744

4845
/**
4946
* This method takes a buddy key and collection. If it finds an object in the database and `hasGoneEncryptedBefore` is true

‎ChatSecure/Classes/Controllers/OTREncryptionManager.m

-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#import "OTRMediaServer.h"
4040
#import "OTRDatabaseManager.h"
4141
#import "OTRLog.h"
42-
#import "OTRPushTLVHandler.h"
4342
#import "OTRXMPPManager.h"
4443
#import "OTRYapMessageSendAction.h"
4544
#import <ChatSecureCore/ChatSecureCore-Swift.h>
@@ -67,7 +66,6 @@ - (id) init {
6766
_otrFingerprintCache = [[NSCache alloc] init];
6867
_otrKit = [[OTRKit alloc] initWithDelegate:self dataPath:nil];
6968
_dataHandler = [[OTRDataHandler alloc] initWithOTRKit:self.otrKit delegate:self];
70-
_pushTLVHandler = [[OTRPushTLVHandler alloc] initWithOTRKit:self.otrKit delegate:nil];
7169
_readConnection = OTRDatabaseManager.shared.readConnection;
7270
NSArray *protectPaths = @[self.otrKit.privateKeyPath, self.otrKit.fingerprintsPath, self.otrKit.instanceTagsPath];
7371
for (NSString *path in protectPaths) {

‎ChatSecure/Classes/Controllers/OTRProtocol.h

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// along with ChatSecure. If not, see <http://www.gnu.org/licenses/>.
2222

2323
@class OTROutgoingMessage, OTRBuddy, OTRAccount;
24-
@protocol PushControllerProtocol;
2524

2625
typedef NS_ENUM(int, OTRProtocolType) {
2726
OTRProtocolTypeNone = 0,

0 commit comments

Comments
 (0)