narayana/snikket-ios
7
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Updates-Khalid

Browse source
This commit is contained in:
Matthew Wild 2021-11-18 09:33:08 +00:00
parent d077bde41a d133679611
commit 569afac883
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Snikket/database/DBChatStore.swift
View file

@ -998,7 +998,7 @@ public protocol ChatOptionsProtocol {
public struct RoomOptions: Codable, ChatOptionsProtocol {
var encryption: ChatEncryption?;
public var notifications: ConversationNotification = .mention;
public var notifications: ConversationNotification = .always;
init() {}
@ -1007,7 +1007,7 @@ public struct RoomOptions: Codable, ChatOptionsProtocol {
if let val = try container.decodeIfPresent(String.self, forKey: .encryption) {
encryption = ChatEncryption(rawValue: val);
}
notifications = ConversationNotification(rawValue: try container.decodeIfPresent(String.self, forKey: .notifications) ?? "") ?? .mention;
notifications = ConversationNotification(rawValue: try container.decodeIfPresent(String.self, forKey: .notifications) ?? "") ?? .always;
}
public func encode(to encoder: Encoder) throws {
@ -1015,7 +1015,7 @@ public struct RoomOptions: Codable, ChatOptionsProtocol {
if encryption != nil {
try container.encode(encryption!.rawValue, forKey: .encryption);
}
if notifications != .mention {
if notifications != .always {
try container.encode(notifications.rawValue, forKey: .notifications);
}
}

2
Snikket/xmpp/SiskinPushNotificationsModule.swift
View file

@ -160,7 +160,7 @@ open class SiskinPushNotificationsModule: TigasePushNotificationsModule {
}
open func reenable(pushSettings: PushSettings, completionHandler: @escaping (Result<PushSettings,ErrorCondition>)->Void) {
self.enable(serviceJid: pushSettings.jid, node: pushSettings.node, deviceId: pushSettings.deviceId, features: pushSettings.encryption ? [TigasePushNotificationsModule.Encryption.XMLNS] : [], maxSize: pushSettings.maxSize, completionHandler: completionHandler);
self.enable(serviceJid: pushSettings.jid, node: pushSettings.node, deviceId: pushSettings.deviceId, pushkitDeviceId: pushSettings.pushkitDeviceId, features: pushSettings.encryption ? [TigasePushNotificationsModule.Encryption.XMLNS] : [], maxSize: pushSettings.maxSize, completionHandler: completionHandler);
}
private func hash(extensions: [PushNotificationsModuleExtension]) -> Int {