Merge pull request #1120 from ChatSecure/chatsecurecore-podspec

ChatSecureCore Podspec

Author: chrisballinger

Cartfile

@@ -8,7 +8,7 @@
 
 #import "UITableView+ChatSecure.h"
 #import "OTRXMPPBuddy.h"
-#import <ChatSecureCore/ChatSecureCore-Swift.h>
+#import "ChatSecureCoreCompat-Swift.h"
 #import "OTRXMPPManager_Private.h"
 @import OTRAssets;
 

Cartfile.resolved

@@ -15,7 +15,6 @@
 #import "OTRConstants.h"
 #import "OTRXMPPAccount.h"
 #import "OTRXMPPTorAccount.h"
-#import "OTRGoogleOAuthXMPPAccount.h"
 #import "OTRAccount.h"
 #import "OTRIncomingMessage.h"
 #import "OTROutgoingMessage.h"
@@ -29,7 +28,7 @@
 #import "OTRSignalSession.h"
 #import "OTRSettingsManager.h"
 #import "OTRXMPPPresenceSubscriptionRequest.h"
-#import <ChatSecureCore/ChatSecureCore-Swift.h>
+#import "ChatSecureCoreCompat-Swift.h"
 
 
 @interface OTRDatabaseManager ()

ChatSecure.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 #import "OTRIncomingMessage.h"
 #import "OTRLog.h"
 #import "OTROutgoingMessage.h"
-#import <ChatSecureCore/ChatSecureCore-Swift.h>
+#import "ChatSecureCoreCompat-Swift.h"
 
 NSString *OTRArchiveFilteredConversationsName = @"OTRFilteredConversationsName";
 NSString *OTRBuddyFilteredConversationsName = @"OTRBuddyFilteredConversationsName";

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme

@@ -41,7 +41,7 @@
 #import "OTRLog.h"
 #import "OTRXMPPManager.h"
 #import "OTRYapMessageSendAction.h"
-#import <ChatSecureCore/ChatSecureCore-Swift.h>
+#import "ChatSecureCoreCompat-Swift.h"
 
 @import AVFoundation;
 @import XMPPFramework;

ChatSecure/Classes/Categories/UITableView+ChatSecure.m

@@ -26,8 +26,6 @@
 #import "OTRIncomingMessage.h"
 #import "OTROutgoingMessage.h"
 #import "OTRConstants.h"
-#import "OTROAuthRefresher.h"
-#import "OTROAuthXMPPAccount.h"
 #import "OTRDatabaseManager.h"
 #import "OTRPushTLVHandler.h"
 #import <BBlock/NSObject+BBlock.h>
@@ -36,7 +34,7 @@
 @import KVOController;
 @import OTRAssets;
 #import "OTRLog.h"
-#import <ChatSecureCore/ChatSecureCore-Swift.h>
+#import "ChatSecureCoreCompat-Swift.h"
 #import "OTRXMPPPresenceSubscriptionRequest.h"
 
 @interface OTRProtocolManager ()
@@ -136,22 +134,7 @@ - (void)loginAccount:(OTRAccount *)account userInitiated:(BOOL)userInitiated
     if (!account) { return; }
     id <OTRProtocol> protocol = [self protocolForAccount:account];
 
-    if([account isKindOfClass:[OTROAuthXMPPAccount class]])
-    {
-        [OTROAuthRefresher refreshAccount:(OTROAuthXMPPAccount *)account completion:^(id token, NSError *error) {
-            if (!error) {
-                ((OTROAuthXMPPAccount *)account).accountSpecificToken = token;
-                [protocol connectUserInitiated:userInitiated];
-            }
-            else {
-                DDLogError(@"Error Refreshing Token");
-            }
-        }];
-    }
-    else
-    {
-        [protocol connectUserInitiated:userInitiated];
-    }
+    [protocol connectUserInitiated:userInitiated];
 }
 
 - (void)loginAccount:(OTRAccount *)account