Skip to content

Commit faa2449

Browse files
Add podspecs
1 parent dedf40e commit faa2449

File tree

157 files changed

+539
-2927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+539
-2927
lines changed

ChatSecure.xcodeproj/project.pbxproj

Lines changed: 52 additions & 1307 deletions
Large diffs are not rendered by default.

ChatSecure/Classes/Categories/UITableView+ChatSecure.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import "UITableView+ChatSecure.h"
1010
#import "OTRXMPPBuddy.h"
11-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
11+
#import "ChatSecureCoreCompat-Swift.h"
1212
#import "OTRXMPPManager_Private.h"
1313
@import OTRAssets;
1414

ChatSecure/Classes/Controllers/OTRDatabaseManager.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#import "OTRConstants.h"
1616
#import "OTRXMPPAccount.h"
1717
#import "OTRXMPPTorAccount.h"
18-
#import "OTRGoogleOAuthXMPPAccount.h"
1918
#import "OTRAccount.h"
2019
#import "OTRIncomingMessage.h"
2120
#import "OTROutgoingMessage.h"
@@ -29,7 +28,7 @@
2928
#import "OTRSignalSession.h"
3029
#import "OTRSettingsManager.h"
3130
#import "OTRXMPPPresenceSubscriptionRequest.h"
32-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
31+
#import "ChatSecureCoreCompat-Swift.h"
3332

3433

3534
@interface OTRDatabaseManager ()

ChatSecure/Classes/Controllers/OTRDatabaseView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#import "OTRIncomingMessage.h"
1515
#import "OTRLog.h"
1616
#import "OTROutgoingMessage.h"
17-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
17+
#import "ChatSecureCoreCompat-Swift.h"
1818

1919
NSString *OTRArchiveFilteredConversationsName = @"OTRFilteredConversationsName";
2020
NSString *OTRBuddyFilteredConversationsName = @"OTRBuddyFilteredConversationsName";

ChatSecure/Classes/Controllers/OTREncryptionManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#import "OTRLog.h"
4242
#import "OTRXMPPManager.h"
4343
#import "OTRYapMessageSendAction.h"
44-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
44+
#import "ChatSecureCoreCompat-Swift.h"
4545

4646
@import AVFoundation;
4747
@import XMPPFramework;

ChatSecure/Classes/Controllers/OTROAuthRefresher.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

ChatSecure/Classes/Controllers/OTROAuthRefresher.m

Lines changed: 0 additions & 41 deletions
This file was deleted.

ChatSecure/Classes/Controllers/OTRProtocolManager.m

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#import "OTRIncomingMessage.h"
2727
#import "OTROutgoingMessage.h"
2828
#import "OTRConstants.h"
29-
#import "OTROAuthRefresher.h"
30-
#import "OTROAuthXMPPAccount.h"
3129
#import "OTRDatabaseManager.h"
3230
#import "OTRPushTLVHandler.h"
3331
#import <BBlock/NSObject+BBlock.h>
@@ -36,7 +34,7 @@
3634
@import KVOController;
3735
@import OTRAssets;
3836
#import "OTRLog.h"
39-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
37+
#import "ChatSecureCoreCompat-Swift.h"
4038
#import "OTRXMPPPresenceSubscriptionRequest.h"
4139

4240
@interface OTRProtocolManager ()
@@ -136,22 +134,7 @@ - (void)loginAccount:(OTRAccount *)account userInitiated:(BOOL)userInitiated
136134
if (!account) { return; }
137135
id <OTRProtocol> protocol = [self protocolForAccount:account];
138136

139-
if([account isKindOfClass:[OTROAuthXMPPAccount class]])
140-
{
141-
[OTROAuthRefresher refreshAccount:(OTROAuthXMPPAccount *)account completion:^(id token, NSError *error) {
142-
if (!error) {
143-
((OTROAuthXMPPAccount *)account).accountSpecificToken = token;
144-
[protocol connectUserInitiated:userInitiated];
145-
}
146-
else {
147-
DDLogError(@"Error Refreshing Token");
148-
}
149-
}];
150-
}
151-
else
152-
{
153-
[protocol connectUserInitiated:userInitiated];
154-
}
137+
[protocol connectUserInitiated:userInitiated];
155138
}
156139

157140
- (void)loginAccount:(OTRAccount *)account

ChatSecure/Classes/Controllers/OTRPurchaseController.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

ChatSecure/Classes/Controllers/OTRPurchaseController.m

Lines changed: 0 additions & 176 deletions
This file was deleted.

ChatSecure/Classes/Controllers/OTRSettingsManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#import "OTRIntSetting.h"
3737
#import "OTRCertificateSetting.h"
3838
#import "OTRUtilities.h"
39-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
39+
#import "ChatSecureCoreCompat-Swift.h"
4040

4141
#import "OTRUtilities.h"
4242

ChatSecure/Classes/Controllers/XMPP/OTRXMPPBuddyManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "OTRXMPPBuddyManager.h"
10-
#import <ChatSecureCore/ChatSecureCore-Swift.h>
10+
#import "ChatSecureCoreCompat-Swift.h"
1111
@import XMPPFramework;
1212
#import "OTRXMPPBuddy.h"
1313
@import YapDatabase;

0 commit comments

Comments
 (0)