witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

sdk api changes

Browse source
This commit is contained in:
Paul Cartier 2020-03-17 15:05:01 +01:00
parent e0e8d35a19
commit 01b7d920a5
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Classes/LinphoneManager.m
View file

@ -2137,19 +2137,19 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) {
// TODO PAUL : fonctions a enlever
+ (NSString *)preferenceFile:(NSString *)file {
LinphoneFactory *factory = linphone_factory_get();
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_config_path(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_config_dir(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
return [fullPath stringByAppendingPathComponent:file];
}
+ (NSString *)dataFile:(NSString *)file {
LinphoneFactory *factory = linphone_factory_get();
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_data_path(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_data_dir(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
return [fullPath stringByAppendingPathComponent:file];
}
+ (NSString *)cacheDirectory {
LinphoneFactory *factory = linphone_factory_get();
NSString *cachePath = [NSString stringWithUTF8String:linphone_factory_get_download_path(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
NSString *cachePath = [NSString stringWithUTF8String:linphone_factory_get_download_dir(factory, kLinphoneMsgNotificationGroupId.UTF8String)];
BOOL isDir = NO;
NSError *error;
// cache directory must be created if not existing
@ -2165,14 +2165,14 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) {
+ (NSString *)oldPreferenceFile:(NSString *)file {
// migration
LinphoneFactory *factory = linphone_factory_get();
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_config_path(factory, nil)];
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_config_dir(factory, nil)];
return [fullPath stringByAppendingPathComponent:file];
}
+ (NSString *)oldDataFile:(NSString *)file {
// migration
LinphoneFactory *factory = linphone_factory_get();
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_data_path(factory, nil)];
NSString *fullPath = [NSString stringWithUTF8String:linphone_factory_get_data_dir(factory, nil)];
return [fullPath stringByAppendingPathComponent:file];
}

2
msgNotification/Utils.swift
View file

@ -32,7 +32,7 @@ class LinphoneLoggingServiceManager: LoggingServiceDelegate {
let debugEnabled = (debugLevel >= LogLevel.Debug.rawValue && debugLevel < LogLevel.Error.rawValue)
if (debugEnabled) {
Factory.Instance.logCollectionPath = Factory.Instance.getDownloadPath(context: UnsafeMutablePointer<Int8>(mutating: (GROUP_ID as NSString).utf8String))
Factory.Instance.logCollectionPath = Factory.Instance.getDownloadDir(context: UnsafeMutablePointer<Int8>(mutating: (GROUP_ID as NSString).utf8String))
Factory.Instance.enableLogCollection(state: LogCollectionState.Enabled)
log.domain = domain
log.logLevel = LogLevel(rawValue: debugLevel)

4
msgNotificationService/NotificationService.swift
View file

@ -51,7 +51,7 @@ class NotificationService: UNNotificationServiceExtension {
if let chatRoomInviteAddr = bestAttemptContent.userInfo["chat-room-addr"] as? String, !chatRoomInviteAddr.isEmpty {
NotificationService.log.message(msg: "fetch chat room for invite, addr: \(chatRoomInviteAddr)")
let chatRoom = lc!.getPushNotificationChatRoomInvite(chatRoomAddr: chatRoomInviteAddr)
let chatRoom = lc!.getNewChatRoomFromConfAddr(chatRoomAddr: chatRoomInviteAddr)
if let chatRoom = chatRoom {
stopCore()
@ -68,7 +68,7 @@ class NotificationService: UNNotificationServiceExtension {
}
} else if let callId = bestAttemptContent.userInfo["call-id"] as? String {
NotificationService.log.message(msg: "fetch msg")
let message = lc!.getPushNotificationMessage(callId: callId)
let message = lc!.getNewMessageFromCallid(callId: callId)
if let message = message, let chatRoom = message.chatRoom {
let msgData = parseMessage(room: chatRoom, message: message)