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

Improvements to support for OMEMO in MUC #siskinim-254

Browse source
This commit is contained in:
Andrzej Wójcik 2020-12-11 12:14:54 +01:00
parent 0d0281638a
commit 611890393b
No known key found for this signature in database
GPG key ID: 2BE28BB9C1B5FF02
4 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SiskinIM/channel/ChannelJoinViewController.swift
View file

@ -250,6 +250,14 @@ class ChannelJoinViewController: UITableViewController {
}
}
}
if let whoisField: ListSingleField = config.getField(named: "muc#roomconfig_whois") {
if invitationOnly && whoisField.options.contains(where: { $0.value == "anyone" }) {
whoisField.value = "anyone";
}
if !invitationOnly && whoisField.options.contains(where: { $0.value == "moderators" }) {
whoisField.value = "moderators";
}
}
if let persistantField: BooleanField = config.getField(named: "muc#roomconfig_persistentroom") {
persistantField.value = true;
}

6
SiskinIM/groupchat/MucChatSettingsViewController.swift
View file

@ -47,7 +47,11 @@ class MucChatSettingsViewController: UITableViewController, UIImagePickerControl
roomSubjectField.text = room.subject ?? "";
pushNotificationsSwitch.isEnabled = false;
pushNotificationsSwitch.isOn = false;
encryptionField.text = room.options.encryption == .none ? "None" : "OMEMO";
if let encryption = room.options.encryption {
encryptionField.text = encryption == .none ? "None" : "OMEMO";
} else if room.isOMEMOCapable {
encryptionField.text = (ChatEncryption(rawValue: Settings.messageEncryption.getString() ?? "") ?? ChatEncryption.none) == .none ? "None" : "OMEMO";
}
refresh();
refreshPermissions();
}

17
SiskinIM/groupchat/MucChatViewController.swift
View file

@ -321,14 +321,21 @@ class MucChatViewController: BaseChatViewControllerWithDataSourceAndContextMenuA
}
guard room.state == .joined else {
let alert: UIAlertController? = UIAlertController.init(title: "Warning", message: "You are not connected to room.\nPlease wait reconnection to room", preferredStyle: .alert);
alert?.addAction(UIAlertAction(title: "OK", style: .default, handler: nil));
self.present(alert!, animated: true, completion: nil);
let alert = UIAlertController.init(title: "Warning", message: "You are not connected to room.\nPlease wait reconnection to room", preferredStyle: .alert);
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil));
self.present(alert, animated: true, completion: nil);
return;
}
let encryption: ChatEncryption = room.options.encryption ?? (ChatEncryption(rawValue: Settings.messageEncryption.string() ?? "") ?? .none);
guard encryption == .none || ((room.supportedFeatures?.contains("muc_nonanonymous") ?? false) && (room.supportedFeatures?.contains("muc_membersonly") ?? false)) else {
let canEncrypt = (room.supportedFeatures?.contains("muc_nonanonymous") ?? false) && (room.supportedFeatures?.contains("muc_membersonly") ?? false);
let encryption: ChatEncryption = room.options.encryption ?? (canEncrypt ? (ChatEncryption(rawValue: Settings.messageEncryption.string() ?? "") ?? .none) : .none);
guard encryption == .none || canEncrypt else {
if encryption == .omemo && !canEncrypt {
let alert = UIAlertController(title: "Warning", message: "This room is not capable of sending encrypted messages. Please change encryption settings to be able to send messages", preferredStyle: .alert);
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil));
self.present(alert, animated: true, completion: nil);
}
return;
}

1
SiskinIM/service/MucEventHandler.swift
View file

@ -179,6 +179,7 @@ class MucEventHandler: XmppServiceEventHandler {
let newName = identities.first(where: { (identity) -> Bool in
return identity.category == "conference";
})?.name?.trimmingCharacters(in: .whitespacesAndNewlines);
room.supportedFeatures = features;
DBChatStore.instance.updateChatName(for: room.account, with: room.roomJid, name: (newName?.isEmpty ?? true) ? nil : newName);
}, onError: nil);