buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

Move off of macosxinternal sdk

Browse Source 
This moves kordophone off of using the internal SDK and switches to using class dumped headers instead.
This commit is contained in:
James Magahern
2019-12-16 17:29:53 -08:00
parent 6c089f737b
commit 4f7a6d1b87
20 changed files with 8610 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Config Files/DebugDefaults.xcconfig
View File

@@ -1,88 +0,0 @@
//
// Many defines in this file are based on the selected SDK; it does not set an SDK.
// NOTE: This is inherited by ALL projects and all types, be careful in here
//
// ####################### HEADER SEARCH PATHS ########################
HEADER_SEARCH_PATHS = $(SDK_DIR)/usr/local/include $(SDK_DIR)/usr/include
// ##################### FRAMEWORK SEARCH PATHS #######################
ALWAYS_SEARCH_USER_PATHS = NO
FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDK_DIR)/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks
FRAMEWORK_SEARCH_PATHS[sdk=embedded*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks
FRAMEWORK_SEARCH_PATHS[sdk=embeddedsimulator*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks
// ###################### LIBRARY SEARCH PATHS ########################
LIBRARY_SEARCH_PATHS[sdk=embedded*] = $(SDK_DIR)/usr/local/lib $(SDK_DIR)/usr/lib
LIBRARY_SEARCH_PATHS[sdk=embeddedsimulator*] = $(SDK_DIR)/usr/local/lib $(SDK_DIR)/usr/lib
// ############################# FLAGS ################################
OTHER_CFLAGS = -Wshadow -DIM_DEBUG -D_FORTIFY_SOURCE=2 -D__IMCORE_INTERNAL__ -Wno-error=deprecated-declarations
OTHER_CFLAGS[sdk=embedded*] = -Wshadow -DIM_DEBUG -D_FORTIFY_SOURCE=2 -DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS -D__IMCORE_INTERNAL__ -Wno-error=deprecated-declarations
OTHER_CFLAGS[sdk=embeddedsimulator*] = -Wshadow -DIM_DEBUG -D_FORTIFY_SOURCE=2 -DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS -D__IMCORE_INTERNAL__ -Wno-error=deprecated-declarations
WARNING_CFLAGS = -Wno-error=deprecated-declarations
// ######################### ARCHITECTURES ###########################
ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
VALID_ARCHS[sdk=macosx*] = x86_64
VALID_ARCHS[sdk=embeddedsimulator*] = i386 x86_64
// ######################### CONFIGURATION ###########################
CODE_SIGN_IDENTITY = -
DYLIB_CURRENT_VERSION = 800
DYLIB_COMPATIBILITY_VERSION = 1
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES
TARGETED_DEVICE_FAMILY = 1,2
TARGETED_DEVICE_FAMILY[sdk=watch*] = 4
// ######################## INSTALLATION #############################
SKIP_INSTALL = NO
// ########################### CLANG #################################
CLANG_MODULES_AUTOLINK = NO
RUN_CLANG_STATIC_ANALYZER = YES
// ######################### COMPILER ################################
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES
// ######################### LANGUAGE MISC ###########################
GCC_C_LANGUAGE_STANDARD = c99
// ########################## DEBUGGING ##############################
GCC_OPTIMIZATION_LEVEL = 0
// ############################ MISC #################################
VERSIONING_SYSTEM = apple-generic
// ############################ USER OVERRIDE #################################
// Override global settings in a git ignored UserDebug.xcconfig file at the repo root.
// I seem to have to restart Xcode if I add/remove this file.
#include? "UserDebug.xcconfig"

5
Config Files/OSXDebugDefaults.xcconfig
View File

@@ -1,5 +0,0 @@
//
// To be used by OSX targets
//
SDKROOT = macosx.internal

5
Config Files/OSXReleaseDefaults.xcconfig
View File

@@ -1,5 +0,0 @@
#include "OSXDebugDefaults.xcconfig"
//
// To be used by OSX targets
//

36
Config Files/ReleaseDefaults.xcconfig
View File

@@ -1,36 +0,0 @@
#include "DebugDefaults.xcconfig"
// #################### INSTALLATION FLAGS #####################
SKIP_INSTALL = NO
// ####################### DEBUG FLAGS #########################
STRIP_INSTALLED_PRODUCT = YES
STRIP_STYLE = non-global;
COPY_PHASE_STRIP = YES
GCC_OPTIMIZATION_LEVEL = s
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_SYMBOLS_PRIVATE_EXTERN = YES
ONLY_ACTIVE_ARCH = NO
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
// ######################### C FLAGS ###########################
OTHER_CFLAGS = -Wshadow -D_FORTIFY_SOURCE=2 -D__IMCORE_INTERNAL__
OTHER_CFLAGS[sdk=embedded*] = -Wshadow -D_FORTIFY_SOURCE=2 -DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS -D__IMCORE_INTERNAL__ -Wno-error=deprecated-declarations
OTHER_CFLAGS[sdk=embeddedsimulator*] = -Wshadow -D_FORTIFY_SOURCE=2 -DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS -D__IMCORE_INTERNAL__ -Wno-error=deprecated-declarations
// ########################## CLANG ############################
RUN_CLANG_STATIC_ANALYZER = NO
// ####################### Order File ##########################
ORDER_FILE = Order Files/$(PROJECT_NAME).order
GCC_PREPROCESSOR_DEFINITIONS = NDEBUG

4976
Dumped Classes/IMCore_ClassDump.h Normal file
View File

File diff suppressed because it is too large Load Diff

1900
Dumped Classes/IMFoundation_ClassDump.h Normal file
View File

File diff suppressed because it is too large Load Diff

1698
Dumped Classes/IMSharedUtilities_ClassDump.h Normal file
View File

File diff suppressed because it is too large Load Diff

34
MessagesBridge.xcodeproj/project.pbxproj
View File

@@ -131,7 +131,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1A0C445D219A458400F2AC00 /* SOAPlugInControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOAPlugInControllerProtocol.h; sourceTree = "<group>"; };
1A0C445F219A45B400F2AC00 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 1A0C445F219A45B400F2AC00 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
1A0C4461219A45B900F2AC00 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; 1A0C4461219A45B900F2AC00 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
1A0C4463219A45C700F2AC00 /* MessagesKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessagesKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/PrivateFrameworks/MessagesKit.framework; sourceTree = DEVELOPER_DIR; }; 1A0C4463219A45C700F2AC00 /* MessagesKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessagesKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/PrivateFrameworks/MessagesKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -139,10 +138,9 @@
1A0C4467219A45D500F2AC00 /* IMCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IMCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/PrivateFrameworks/IMCore.framework; sourceTree = DEVELOPER_DIR; }; 1A0C4467219A45D500F2AC00 /* IMCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IMCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.Internal.sdk/System/Library/PrivateFrameworks/IMCore.framework; sourceTree = DEVELOPER_DIR; };
1A0C4469219A4BC300F2AC00 /* MBIMBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMBridge.h; sourceTree = "<group>"; }; 1A0C4469219A4BC300F2AC00 /* MBIMBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMBridge.h; sourceTree = "<group>"; };
1A0C446A219A4BC300F2AC00 /* MBIMBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMBridge.m; sourceTree = "<group>"; }; 1A0C446A219A4BC300F2AC00 /* MBIMBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMBridge.m; sourceTree = "<group>"; };
1A33B43A219A5ACD0034485A /* OSXReleaseDefaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OSXReleaseDefaults.xcconfig; sourceTree = "<group>"; }; 1A257CB023A8570100A4A2C8 /* IMCore_ClassDump.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IMCore_ClassDump.h; sourceTree = "<group>"; };
1A33B43B219A5ACD0034485A /* DebugDefaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugDefaults.xcconfig; sourceTree = "<group>"; }; 1A257CB123A857DF00A4A2C8 /* IMSharedUtilities_ClassDump.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IMSharedUtilities_ClassDump.h; sourceTree = "<group>"; };
1A33B43C219A5ACD0034485A /* OSXDebugDefaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OSXDebugDefaults.xcconfig; sourceTree = "<group>"; }; 1A257CB223A85DF200A4A2C8 /* IMFoundation_ClassDump.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IMFoundation_ClassDump.h; sourceTree = "<group>"; };
1A33B43D219A5ACD0034485A /* ReleaseDefaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ReleaseDefaults.xcconfig; sourceTree = "<group>"; };
1A33B43E219A5BD80034485A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; }; 1A33B43E219A5BD80034485A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1AA43E8D219EBB2D00EDF1A7 /* MBIMJSONDataResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMJSONDataResponse.h; sourceTree = "<group>"; }; 1AA43E8D219EBB2D00EDF1A7 /* MBIMJSONDataResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMJSONDataResponse.h; sourceTree = "<group>"; };
1AA43E8E219EBB2D00EDF1A7 /* MBIMJSONDataResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMJSONDataResponse.m; sourceTree = "<group>"; }; 1AA43E8E219EBB2D00EDF1A7 /* MBIMJSONDataResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMJSONDataResponse.m; sourceTree = "<group>"; };
@@ -297,8 +295,7 @@
children = ( children = (
1A33B43E219A5BD80034485A /* README.md */, 1A33B43E219A5BD80034485A /* README.md */,
CDF62333219A895D00690038 /* kordophone */, CDF62333219A895D00690038 /* kordophone */,
1A33B439219A5ACD0034485A /* Config Files */, 1A0C445C219A457C00F2AC00 /* Dumped Classes */,
1A0C445C219A457C00F2AC00 /* Pilfered Headers */,
CD83E162219BE91600F4CCEA /* agentHook */, CD83E162219BE91600F4CCEA /* agentHook */,
CD14F18C219E2DB400E7DD22 /* Tests */, CD14F18C219E2DB400E7DD22 /* Tests */,
1ACFCDE3219EB28A00E2C237 /* CocoaHTTPServer */, 1ACFCDE3219EB28A00E2C237 /* CocoaHTTPServer */,
@@ -318,12 +315,14 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1A0C445C219A457C00F2AC00 /* Pilfered Headers */ = { 1A0C445C219A457C00F2AC00 /* Dumped Classes */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1A0C445D219A458400F2AC00 /* SOAPlugInControllerProtocol.h */, 1A257CB023A8570100A4A2C8 /* IMCore_ClassDump.h */,
1A257CB223A85DF200A4A2C8 /* IMFoundation_ClassDump.h */,
1A257CB123A857DF00A4A2C8 /* IMSharedUtilities_ClassDump.h */,
); );
path = "Pilfered Headers"; path = "Dumped Classes";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1A0C445E219A45B400F2AC00 /* Frameworks */ = { 1A0C445E219A45B400F2AC00 /* Frameworks */ = {
@@ -360,17 +359,6 @@
path = Bridge; path = Bridge;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1A33B439219A5ACD0034485A /* Config Files */ = {
isa = PBXGroup;
children = (
1A33B43A219A5ACD0034485A /* OSXReleaseDefaults.xcconfig */,
1A33B43B219A5ACD0034485A /* DebugDefaults.xcconfig */,
1A33B43C219A5ACD0034485A /* OSXDebugDefaults.xcconfig */,
1A33B43D219A5ACD0034485A /* ReleaseDefaults.xcconfig */,
);
path = "Config Files";
sourceTree = "<group>";
};
1AA43E90219EBB3400EDF1A7 /* Utilities */ = { 1AA43E90219EBB3400EDF1A7 /* Utilities */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@@ -1148,7 +1136,7 @@
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
GCC_PREFIX_HEADER = kordophone/KPServer.pch; GCC_PREFIX_HEADER = kordophone/KPServer.pch;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx.internal; SDKROOT = macosx;
SYSTEM_FRAMEWORK_SEARCH_PATHS = ( SYSTEM_FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks", "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -1163,7 +1151,7 @@
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
GCC_PREFIX_HEADER = kordophone/KPServer.pch; GCC_PREFIX_HEADER = kordophone/KPServer.pch;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx.internal; SDKROOT = macosx;
SYSTEM_FRAMEWORK_SEARCH_PATHS = ( SYSTEM_FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks", "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",

10
MessagesBridge.xcodeproj/xcshareddata/xcschemes/kordophoned.xcscheme
View File

@@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion> <MacroExpansion>
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
ReferencedContainer = "container:MessagesBridge.xcodeproj"> ReferencedContainer = "container:MessagesBridge.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
<AdditionalOptions> <Testables>
</AdditionalOptions> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Debug"
@@ -64,11 +62,9 @@
<CommandLineArguments> <CommandLineArguments>
<CommandLineArgument <CommandLineArgument
argument = "-s -c certificate.p12 -a access.asc" argument = "-s -c certificate.p12 -a access.asc"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
</CommandLineArguments> </CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"

16
Pilfered Headers/SOAPlugInControllerProtocol.h
View File

@@ -1,16 +0,0 @@
//
// MessagesHelperProtocol.h
// MessagesHelpers
//
// Created by Jeremy Payne on 7/10/12.
// Copyright (c) 2012 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
@protocol SOAPlugInControllerProtocol <NSObject>
- (oneway void)connectPlugIn:(NSString *)plugInName withConnectionHandler:(void (^)(NSXPCListenerEndpoint *))replyHandler;
- (void)reconnect;
@end

19
kordophone/Bridge/MBIMBridge.m
View File

@@ -16,11 +16,8 @@
#import <CocoaHTTPServer/HTTPServer.h> #import <CocoaHTTPServer/HTTPServer.h>
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
#import <IMCore/IMCore_Private.h> #import "IMFoundation_ClassDump.h"
#import <IMFoundation/IMFoundation.h>
#import <IMFoundation/IMFoundation_Private.h>
static const UInt16 kDefaultPort = 5738; static const UInt16 kDefaultPort = 5738;
@@ -136,11 +133,11 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
[self registerForNotifications]; [self registerForNotifications];
[sDaemonController setDelegate:self]; [[IMDaemonController sharedInstance] setDelegate:(id)self];
[sDaemonListener addHandler:self]; [[[IMDaemonController sharedInstance] listener] addHandler:self];
if (![sDaemonController hasListenerForID:MBIMBridgeToken]) { if (![[IMDaemonController sharedInstance] hasListenerForID:MBIMBridgeToken]) {
if (![sDaemonController addListenerID:MBIMBridgeToken capabilities:(kFZListenerCapFileTransfers | kFZListenerCapManageStatus | kFZListenerCapChats | kFZListenerCapMessageHistory | kFZListenerCapIDQueries | kFZListenerCapSendMessages)]) { if (![[IMDaemonController sharedInstance] addListenerID:MBIMBridgeToken capabilities:(kFZListenerCapFileTransfers | kFZListenerCapManageStatus | kFZListenerCapChats | kFZListenerCapMessageHistory | kFZListenerCapIDQueries | kFZListenerCapSendMessages)]) {
MBIMLogFatal(@"Failed to connect to imagent"); MBIMLogFatal(@"Failed to connect to imagent");
[self _terminate]; [self _terminate];
@@ -153,7 +150,7 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
- (void)disconnect - (void)disconnect
{ {
[sDaemonController removeListenerID:MBIMBridgeToken]; [[IMDaemonController sharedInstance] removeListenerID:MBIMBridgeToken];
} }
#pragma mark - #pragma mark -
@@ -196,7 +193,7 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
- (void)_chatRegistryDidLoad:(NSNotification *)notification - (void)_chatRegistryDidLoad:(NSNotification *)notification
{ {
MBIMLogInfo(@"Loaded chat registry. %lu existing chats", (unsigned long)[sChatRegistry numberOfExistingChats]); MBIMLogInfo(@"Loaded chat registry. %lu existing chats", (unsigned long)[[IMChatRegistry sharedInstance] numberOfExistingChats]);
} }
- (void)_chatItemsDidChange:(NSNotification *)notification - (void)_chatItemsDidChange:(NSNotification *)notification

4
kordophone/Bridge/MBIMUpdateQueue.h
View File

@@ -6,8 +6,8 @@
// Copyright © 2018 James Magahern. All rights reserved. // Copyright © 2018 James Magahern. All rights reserved.
// //
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
#import <IMFoundation/IMFoundation.h> #import "IMFoundation_ClassDump.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

4
kordophone/Bridge/Operations/MBIMConversationListOperation.m
View File

@@ -10,7 +10,7 @@
#import "MBIMHTTPUtilities.h" #import "MBIMHTTPUtilities.h"
#import "IMChat+Encoded.h" #import "IMChat+Encoded.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
@implementation MBIMConversationListOperation @implementation MBIMConversationListOperation
@@ -26,7 +26,7 @@
__block NSMutableArray *conversations = [NSMutableArray array]; __block NSMutableArray *conversations = [NSMutableArray array];
dispatch_sync([[self class] sharedIMAccessQueue], ^{ dispatch_sync([[self class] sharedIMAccessQueue], ^{
NSArray<IMChat *> *chats = [sChatRegistry allExistingChats]; NSArray<IMChat *> *chats = [[IMChatRegistry sharedInstance] allExistingChats];
for (IMChat *chat in chats) { for (IMChat *chat in chats) {
NSDictionary *chatDict = [chat mbim_dictionaryRepresentation]; NSDictionary *chatDict = [chat mbim_dictionaryRepresentation];
[conversations addObject:chatDict]; [conversations addObject:chatDict];

2
kordophone/Bridge/Operations/MBIMFetchAttachmentOperation.m
View File

@@ -9,7 +9,7 @@
#import "MBIMFetchAttachmentOperation.h" #import "MBIMFetchAttachmentOperation.h"
#import "MBIMDataResponse.h" #import "MBIMDataResponse.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
@implementation MBIMFetchAttachmentOperation @implementation MBIMFetchAttachmentOperation

4
kordophone/Bridge/Operations/MBIMMarkOperation.m
View File

@@ -7,7 +7,7 @@
// //
#import "MBIMMarkOperation.h" #import "MBIMMarkOperation.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
@implementation MBIMMarkOperation @implementation MBIMMarkOperation
@@ -31,7 +31,7 @@
} }
dispatch_sync([[self class] sharedIMAccessQueue], ^{ dispatch_sync([[self class] sharedIMAccessQueue], ^{
IMChat *chat = [sChatRegistry existingChatWithGUID:guid]; IMChat *chat = [[IMChatRegistry sharedInstance] existingChatWithGUID:guid];
if (!chat) { if (!chat) {
MBIMLogInfo(@"Chat with guid: %@ not found", guid); MBIMLogInfo(@"Chat with guid: %@ not found", guid);
response = [[HTTPErrorResponse alloc] initWithErrorCode:500]; response = [[HTTPErrorResponse alloc] initWithErrorCode:500];

4
kordophone/Bridge/Operations/MBIMMessagesListOperation.m
View File

@@ -10,7 +10,7 @@
#import "MBIMHTTPUtilities.h" #import "MBIMHTTPUtilities.h"
#import "IMMessageItem+Encoded.h" #import "IMMessageItem+Encoded.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
@implementation MBIMMessagesListOperation @implementation MBIMMessagesListOperation
@@ -35,7 +35,7 @@
__block NSMutableArray *messages = [NSMutableArray array]; __block NSMutableArray *messages = [NSMutableArray array];
dispatch_sync([[self class] sharedIMAccessQueue], ^{ dispatch_sync([[self class] sharedIMAccessQueue], ^{
IMChat *chat = [sChatRegistry existingChatWithGUID:guid]; IMChat *chat = [[IMChatRegistry sharedInstance] existingChatWithGUID:guid];
if (!chat) { if (!chat) {
MBIMLogInfo(@"Chat with guid: %@ not found", guid); MBIMLogInfo(@"Chat with guid: %@ not found", guid);
response = [[HTTPErrorResponse alloc] initWithErrorCode:500]; response = [[HTTPErrorResponse alloc] initWithErrorCode:500];

5
kordophone/Bridge/Operations/MBIMSendMessageOperation.m
View File

@@ -8,8 +8,7 @@
#import "MBIMSendMessageOperation.h" #import "MBIMSendMessageOperation.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
#import <IMCore/IMCore_Private.h>
@implementation MBIMSendMessageOperation @implementation MBIMSendMessageOperation
@@ -25,7 +24,7 @@
__block BOOL result = YES; __block BOOL result = YES;
dispatch_sync([[self class] sharedIMAccessQueue], ^{ dispatch_sync([[self class] sharedIMAccessQueue], ^{
IMChat *chat = [sChatRegistry existingChatWithGUID:chatGUID]; IMChat *chat = [[IMChatRegistry sharedInstance] existingChatWithGUID:chatGUID];
// TODO: chat might not be an iMessage chat! // TODO: chat might not be an iMessage chat!
IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]]; IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];

2
kordophone/Bridge/Operations/MBIMUploadAttachmentOperation.m
View File

@@ -9,7 +9,7 @@
#import "MBIMUploadAttachmentOperation.h" #import "MBIMUploadAttachmentOperation.h"
#import "MBIMDataResponse.h" #import "MBIMDataResponse.h"
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
@implementation MBIMUploadAttachmentOperation @implementation MBIMUploadAttachmentOperation

2
kordophone/Categories/IMChat+Encoded.h
View File

@@ -6,7 +6,7 @@
// Copyright © 2018 James Magahern. All rights reserved. // Copyright © 2018 James Magahern. All rights reserved.
// //
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

3
kordophone/Categories/IMMessageItem+Encoded.h
View File

@@ -6,8 +6,7 @@
// Copyright © 2018 James Magahern. All rights reserved. // Copyright © 2018 James Magahern. All rights reserved.
// //
#import <IMCore/IMCore.h> #import "IMCore_ClassDump.h"
#import <IMSharedUtilities/IMSharedUtilities.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN