narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
fmodf 2024-09-18 14:26:08 +02:00
parent a60fae1a3a
commit 5f5e20b462
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift
View file

@ -3,10 +3,7 @@ import GRDB
import Martin import Martin
import MartinOMEMO import MartinOMEMO
!!! https: // xmpp.org/extensions/xep-0384.html#usecases-announcing final class ClientMartinOMEMO {
final class ClientMartinOMEMO
{
let credentials: Credentials let credentials: Credentials
init(_ credentials: Credentials) { init(_ credentials: Credentials) {

4
ConversationsClassic/AppData/Client/Client.swift
View file

@ -240,8 +240,8 @@ private extension Client {
client.modulesManager.register(RosterModule(rosterManager: roster)) client.modulesManager.register(RosterModule(rosterManager: roster))
client.modulesManager.register(PubSubModule()) client.modulesManager.register(PubSubModule())
client.modulesManager.register(PEPUserAvatarModule()) // client.modulesManager.register(PEPUserAvatarModule())
client.modulesManager.register(PEPBookmarksModule()) // client.modulesManager.register(PEPBookmarksModule())
client.modulesManager.register(MessageModule(chatManager: chat)) client.modulesManager.register(MessageModule(chatManager: chat))
client.modulesManager.register(MessageArchiveManagementModule()) client.modulesManager.register(MessageArchiveManagementModule())

1
ConversationsClassic/AppData/Model/Message+OMEMO.swift
View file

@ -54,6 +54,7 @@ extension Message {
case .failure(let error): case .failure(let error):
logIt(.error, "Error decoding omemo message: \(error)") logIt(.error, "Error decoding omemo message: \(error)")
logIt(.error, "Message: \(martinMessage)")
} }
} }

4
ConversationsClassic/AppData/Model/OMEMO.swift
View file

@ -49,12 +49,12 @@ extension OMEMOSession {
do { do {
let sql = let sql =
""" """
SELECT s.device_id SELECT s.deviceId
FROM omemo_sessions s FROM omemo_sessions s
LEFT JOIN omemo_identities i LEFT JOIN omemo_identities i
ON s.account = i.account ON s.account = i.account
AND s.name = i.name AND s.name = i.name
AND s.device_id = i.device_id AND s.deviceId = i.deviceId
WHERE s.account = :account WHERE s.account = :account
AND s.name = :name AND s.name = :name
AND ((i.status >= 0 AND i.status % 2 = 0) OR i.status IS NULL) AND ((i.status >= 0 AND i.status % 2 = 0) OR i.status IS NULL)

2
ConversationsClassic/View/Entering/LoginScreen.swift
View file

@ -14,7 +14,7 @@ struct LoginScreen: View {
@FocusState private var focus: Field? @FocusState private var focus: Field?
#if DEBUG #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 pass: String = "12345"
// @State private var jidStr: String = "nartest1@conversations.im" // @State private var jidStr: String = "nartest1@conversations.im"
// @State private var pass: String = "nartest12345" // @State private var pass: String = "nartest12345"