From 5f5e20b462fc1c6832b810a72619e64a8f0b3416 Mon Sep 17 00:00:00 2001 From: fmodf Date: Wed, 18 Sep 2024 14:26:08 +0200 Subject: [PATCH] wip --- ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift | 5 +---- ConversationsClassic/AppData/Client/Client.swift | 4 ++-- ConversationsClassic/AppData/Model/Message+OMEMO.swift | 1 + ConversationsClassic/AppData/Model/OMEMO.swift | 4 ++-- ConversationsClassic/View/Entering/LoginScreen.swift | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift b/ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift index 77ae91f..7c36f15 100644 --- a/ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift +++ b/ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift @@ -3,10 +3,7 @@ import GRDB import Martin import MartinOMEMO - !!! https: // xmpp.org/extensions/xep-0384.html#usecases-announcing - - final class ClientMartinOMEMO -{ +final class ClientMartinOMEMO { let credentials: Credentials init(_ credentials: Credentials) { diff --git a/ConversationsClassic/AppData/Client/Client.swift b/ConversationsClassic/AppData/Client/Client.swift index 351a036..9155f0b 100644 --- a/ConversationsClassic/AppData/Client/Client.swift +++ b/ConversationsClassic/AppData/Client/Client.swift @@ -240,8 +240,8 @@ private extension Client { client.modulesManager.register(RosterModule(rosterManager: roster)) client.modulesManager.register(PubSubModule()) - client.modulesManager.register(PEPUserAvatarModule()) - client.modulesManager.register(PEPBookmarksModule()) + // client.modulesManager.register(PEPUserAvatarModule()) + // client.modulesManager.register(PEPBookmarksModule()) client.modulesManager.register(MessageModule(chatManager: chat)) client.modulesManager.register(MessageArchiveManagementModule()) diff --git a/ConversationsClassic/AppData/Model/Message+OMEMO.swift b/ConversationsClassic/AppData/Model/Message+OMEMO.swift index abf7199..773496b 100644 --- a/ConversationsClassic/AppData/Model/Message+OMEMO.swift +++ b/ConversationsClassic/AppData/Model/Message+OMEMO.swift @@ -54,6 +54,7 @@ extension Message { case .failure(let error): logIt(.error, "Error decoding omemo message: \(error)") + logIt(.error, "Message: \(martinMessage)") } } diff --git a/ConversationsClassic/AppData/Model/OMEMO.swift b/ConversationsClassic/AppData/Model/OMEMO.swift index 5a91842..af7bf99 100644 --- a/ConversationsClassic/AppData/Model/OMEMO.swift +++ b/ConversationsClassic/AppData/Model/OMEMO.swift @@ -49,12 +49,12 @@ extension OMEMOSession { do { let sql = """ - SELECT s.device_id + SELECT s.deviceId FROM omemo_sessions s LEFT JOIN omemo_identities i ON s.account = i.account AND s.name = i.name - AND s.device_id = i.device_id + AND s.deviceId = i.deviceId WHERE s.account = :account AND s.name = :name AND ((i.status >= 0 AND i.status % 2 = 0) OR i.status IS NULL) diff --git a/ConversationsClassic/View/Entering/LoginScreen.swift b/ConversationsClassic/View/Entering/LoginScreen.swift index 90c2321..d6da9b6 100644 --- a/ConversationsClassic/View/Entering/LoginScreen.swift +++ b/ConversationsClassic/View/Entering/LoginScreen.swift @@ -14,7 +14,7 @@ struct LoginScreen: View { @FocusState private var focus: Field? #if DEBUG - @State private var jidStr: String = "omemotest1@test.anal.company" + @State private var jidStr: String = "omemotest3@test.anal.company" @State private var pass: String = "12345" // @State private var jidStr: String = "nartest1@conversations.im" // @State private var pass: String = "nartest12345"