6.4.0b2

Monal/Classes/AddContactMenu.swift

@@ -145,18 +145,16 @@ struct AddContactMenu: View {
                 trustFingerprints(self.importScannedFingerprints ? self.scannedFingerprints : [:], for:jid, on:account)
                 successAlert(title: Text("Permission Requested"), message: Text("The new contact will be added to your contacts list when the person you've added has approved your request."))
             } else if type == "muc" {
-                showLoadingOverlay(overlay, headline: NSLocalizedString("Adding Group/Channel...", comment: ""))
-                account.mucProcessor.addUIHandler({_data in let data = _data as! NSDictionary
-                    let success : Bool = data["success"] as! Bool;
+                performMucAction(account:account, mucJid:jid, overlay:overlay, headlineView:Text("Adding Group/Channel..."), descriptionView:Text("")) {
+                    account.joinMuc(jid)
+                }.done { _ in
+                    self.newContact = MLContact.createContact(fromJid: jid, andAccountNo: account.accountNo)
+                    successAlert(title: Text("Success!"), message: Text("Successfully joined group/channel \(jid)!"))
+                }.catch { error in
+                    errorAlert(title: Text("Error entering group/channel!"), message: Text("\(String(describing:error))"))
+                }.finally {
                     hideLoadingOverlay(overlay)
-                    if success {
-                        self.newContact = MLContact.createContact(fromJid: jid, andAccountNo: account.accountNo)
-                        successAlert(title: Text("Success!"), message: Text(String.localizedStringWithFormat("Successfully joined group/channel %@!", jid)))
-                    } else {
-                        errorAlert(title: Text("Error entering group/channel!"), message: Text(data["errorMessage"] as! String))
-                    }
-                }, forMuc: jid)
-                account.joinMuc(jid)
+                }
             } else {
                 hideLoadingOverlay(overlay)
                 errorAlert(title: Text("Error"), message: Text(errorMsg ?? "Undefined error"))
@@ -287,7 +285,7 @@ struct AddContactMenu: View {
             }
         }
         .addLoadingOverlay(overlay)
-        .navigationBarTitle("Add Contact or Channel", displayMode: .inline)
+        .navigationBarTitle(Text("Add Contact or Channel"), displayMode: .inline)
         .navigationViewStyle(.stack)
         .toolbar(content: {
             ToolbarItemGroup(placement: .navigationBarTrailing) {

Monal/Classes/BackgroundSettings.swift

@@ -70,7 +70,7 @@ struct BackgroundSettings: View {
                                         Image(systemName: "xmark.circle.fill")
                                             .resizable()
                                             .frame(width: 32.0, height: 32.0)
-                                            .accessibilityLabel("Remove Background Image")
+                                            .accessibilityLabel(Text("Remove Background Image"))
                                             .applyClosure { view in
                                                 if #available(iOS 15, *) {
                                                     view
@@ -89,7 +89,7 @@ struct BackgroundSettings: View {
                                     .frame(maxWidth: .infinity, alignment: .center)
                             }
                         }
-                        .accessibilityLabel("Change Background Image")
+                        .accessibilityLabel(Text("Change Background Image"))
                         .sheet(isPresented:$showingImagePicker) {
                             ImagePicker(image:$inputImage)
                         }

Monal/Classes/ChannelMemberList.swift

@@ -35,24 +35,27 @@ struct ChannelMemberList: View {
                 participants[nick] = memberInfo["affiliation"] as? String ?? "none"
             }
         }
+        participants.sort {
+            (mucAffiliationToInt($0.value), $0.key) < (mucAffiliationToInt($1.value), $1.key)
+        }
     }
 
 
     var body: some View {
         List {
             Section(header: Text("\(self.channel.contactDisplayName as String) (affiliation: \(mucAffiliationToString(ownAffiliation)))")) {
-                ForEach(participants.sorted(by: <), id: \.self.key) { participant in
+                ForEach(participants.keys, id: \.self) { participant_key in
                     ZStack(alignment: .topLeading) {
                         HStack(alignment: .center) {
-                            Text(participant.key)
+                            Text(participant_key)
                             Spacer()
-                            Text(mucAffiliationToString(participant.value))
+                            Text(mucAffiliationToString(participants[participant_key]))
                         }
                     }
                 }
             }
         }
-        .navigationBarTitle(NSLocalizedString("Channel Participants", comment: ""), displayMode: .inline)
+        .navigationBarTitle(Text("Channel Participants"), displayMode: .inline)
         .onAppear {
             updateParticipantList()
         }

Monal/Classes/ContactDetails.swift

@@ -61,19 +61,6 @@ struct ContactDetails: View {
         success = true // < dismiss entire view on close
     }
 
-    private func performAction(_ title: Text, action: @escaping ()->Void) {
-        self.account.mucProcessor.addUIHandler({_data in let data = _data as! NSDictionary
-            DispatchQueue.main.async {
-                hideLoadingOverlay(self.overlay)
-                let success : Bool = data["success"] as! Bool;
-                if !success {
-                    errorAlert(title: title, message: Text(data["errorMessage"] as? String ?? "Unknown error!"))
-                }
-            }
-        }, forMuc:self.contact.contactJid)
-        action()
-    }
-
     private func showImagePicker() {
 #if targetEnvironment(macCatalyst)
         let picker = DocumentPickerViewController(
@@ -105,7 +92,7 @@ struct ContactDetails: View {
                         .applyClosure {view in
                             if contact.isGroup {
                                 if ownAffiliation == "owner" {
-                                    view.accessibilityLabel((contact.mucType == "group") ? "Change Group Avatar" : "Change Channel Avatar")
+                                    view.accessibilityLabel((contact.mucType == "group") ? Text("Change Group Avatar") : Text("Change Channel Avatar"))
                                         .onTapGesture {
                                             showImagePicker()
                                         }
@@ -117,7 +104,7 @@ struct ContactDetails: View {
                                                     Image(systemName: "xmark.circle.fill")
                                                         .resizable()
                                                         .frame(width: 24.0, height: 24.0)
-                                                        .accessibilityLabel((contact.mucType == "group") ? "Remove Group Avatar" : "Remove Channel Avatar")
+                                                        .accessibilityLabel((contact.mucType == "group") ? Text("Remove Group Avatar") : Text("Remove Channel Avatar"))
                                                         .applyClosure { view in
                                                             if #available(iOS 15, *) {
                                                                 view
@@ -137,7 +124,7 @@ struct ContactDetails: View {
                                                     Image(systemName: "pencil.circle.fill")
                                                         .resizable()
                                                         .frame(width: 24.0, height: 24.0)
-                                                        .accessibilityLabel((contact.mucType == "group") ? "Change Group Avatar" : "Change Channel Avatar")
+                                                        .accessibilityLabel((contact.mucType == "group") ? Text("Change Group Avatar") : Text("Change Channel Avatar"))
 //                                                         .applyClosure { view in
 //                                                             if #available(iOS 15, *) {
 //                                                                 view
@@ -153,10 +140,10 @@ struct ContactDetails: View {
                                             }
                                         }
                                 } else {
-                                    view.accessibilityLabel((contact.mucType == "group") ? "Group Avatar" : "Channel Avatar")
+                                    view.accessibilityLabel((contact.mucType == "group") ? Text("Group Avatar") : Text("Channel Avatar"))
                                 }
                             } else {
-                                view.accessibilityLabel("Avatar")
+                                view.accessibilityLabel(Text("Avatar"))
                             }
                         }
                         .frame(width: 150, height: 150, alignment: .center)
@@ -173,9 +160,11 @@ struct ContactDetails: View {
                                     .destructive(
                                         Text("Yes"),
                                         action: {
-                                            showLoadingOverlay(overlay, headline: NSLocalizedString("Removing avatar...", comment: ""))
-                                            performAction(Text("Error removing avatar!")) {
+                                            performMucAction(account:account, mucJid:contact.contactJid, overlay:overlay, headlineView:Text("Removing avatar..."), descriptionView:Text("")) {
                                                 self.account.mucProcessor.publishAvatar(nil, forMuc: contact.contactJid)
+                                            }.catch { error in
+                                                errorAlert(title: Text("Error removing avatar!"), message: Text("\(String(describing:error))"))
+                                                hideLoadingOverlay(overlay)
                                             }
                                         }
                                     )
@@ -364,13 +353,13 @@ struct ContactDetails: View {
                     TextField(label, text: $contact.fullNameView, onEditingChanged: {
                         isEditingNickname = $0
                     })
-                    .accessibilityLabel(contact.obj.mucType == "group" ? "Group name" : "Channel name")
+                    .accessibilityLabel(contact.obj.mucType == "group" ? Text("Group name") : Text("Channel name"))
                     .addClearButton(isEditing: isEditingNickname, text: $contact.fullNameView)
                 } else if !contact.isGroup && !contact.isSelfChat {
                     TextField(NSLocalizedString("Rename Contact", comment: "placeholder text in contact details"), text: $contact.nickNameView, onEditingChanged: {
                         isEditingNickname = $0
                     })
-                    .accessibilityLabel("Nickname")
+                    .accessibilityLabel(Text("Nickname"))
                     .addClearButton(isEditing: isEditingNickname, text: $contact.nickNameView)
                 }
 
@@ -557,20 +546,18 @@ struct ContactDetails: View {
                                     .destructive(
                                         Text("Yes"),
                                         action: {
-                                            showLoadingOverlay(overlay, headline: contact.mucType == "group" ? NSLocalizedString("Destroying group...", comment: "") : NSLocalizedString("Destroying channel...", comment: ""))
-                                            self.account.mucProcessor.destroyRoom(contact.contactJid as String)
-                                            self.account.mucProcessor.addUIHandler({_data in let data = _data as! NSDictionary
-                                                hideLoadingOverlay(overlay)
-                                                let success : Bool = data["success"] as! Bool;
-                                                if success {
-                                                    if let callback = data["callback"] {
-                                                        self.successCallback = objcCast(callback) as monal_void_block_t
-                                                    }
-                                                    successAlert(title: Text("Success"), message: contact.mucType == "group" ? Text("Successfully destroyed group.") : Text("Successfully destroyed channel."))
-                                                } else {
-                                                    errorAlert(title: Text("Error destroying group!"), message: Text(data["errorMessage"] as! String))
+                                            performMucAction(account:account, mucJid:contact.contactJid, overlay:overlay, headlineView:contact.mucType == "group" ? Text("Destroying group...") : Text("Destroying channel..."), descriptionView:Text("")) {
+                                                self.account.mucProcessor.destroyRoom(contact.contactJid as String)
+                                            }.done { callback in
+                                                if let callback = callback {
+                                                    self.successCallback = callback
                                                 }
-                                            }, forMuc:contact.contactJid)
+                                                successAlert(title: Text("Success"), message: contact.mucType == "group" ? Text("Successfully destroyed group.") : Text("Successfully destroyed channel."))
+                                            }.catch { error in
+                                                errorAlert(title: Text("Error destroying group!"), message: Text("\(String(describing:error))"))
+                                            }.finally {
+                                                hideLoadingOverlay(overlay)
+                                            }
                                         }
                                     )
                                 ]
@@ -658,9 +645,11 @@ struct ContactDetails: View {
             }))
         }
         .onChange(of:inputImage) { _ in
-            showLoadingOverlay(overlay, headline: NSLocalizedString("Uploading avatar...", comment: ""))
-            performAction(Text("Error changing avatar!")) {
+            performMucAction(account:account, mucJid:contact.contactJid, overlay:overlay, headlineView:Text("Uploading avatar..."), descriptionView:Text("")) {
                 self.account.mucProcessor.publishAvatar(inputImage, forMuc: contact.contactJid)
+            }.catch { error in
+                errorAlert(title: Text("Error changing avatar!"), message: Text("\(String(describing:error))"))
+                hideLoadingOverlay(overlay)
             }
         }
         .onChange(of:contact.avatar as UIImage) { _ in

Monal/Classes/ContactEntry.swift

@@ -6,13 +6,23 @@
 //  Copyright © 2023 monal-im.org. All rights reserved.
 //
 
-struct ContactEntry: View {
+struct ContactEntry<AdditionalContent: View>: View {
     let contact: ObservableKVOWrapper<MLContact>
     let selfnotesPrefix: Bool
+    @ViewBuilder let additionalContent: () -> AdditionalContent
 
-    init(contact:ObservableKVOWrapper<MLContact>, selfnotesPrefix: Bool = true) {
+    init(contact:ObservableKVOWrapper<MLContact>, selfnotesPrefix: Bool = true) where AdditionalContent == EmptyView {
+        self.init(contact:contact, selfnotesPrefix:selfnotesPrefix, additionalContent:{ EmptyView() })
+    }
+
+    init(contact:ObservableKVOWrapper<MLContact>, @ViewBuilder additionalContent: @escaping () -> AdditionalContent) {
+        self.init(contact:contact, selfnotesPrefix:true, additionalContent:additionalContent)
+    }
+
+    init(contact:ObservableKVOWrapper<MLContact>, selfnotesPrefix: Bool, @ViewBuilder additionalContent: @escaping () -> AdditionalContent) {
         self.contact = contact
         self.selfnotesPrefix = selfnotesPrefix
+        self.additionalContent = additionalContent
     }
 
     var body:some View {
@@ -27,7 +37,10 @@ struct ContactEntry: View {
                     } else {
                         Text(contact.contactDisplayNameWithoutSelfnotesPrefix as String)
                     }
-                    Text(contact.contactJid as String).font(.footnote).opacity(0.6)
+                    additionalContent()
+                    Text(contact.contactJid as String)
+                        .foregroundColor(Color(UIColor.secondaryLabel))
+                        .font(.footnote)
                 }
             }
         }

Monal/Classes/ContactPicker.swift

@@ -127,7 +127,7 @@ struct ContactPicker: View {
                 }
             }
             .listStyle(.inset)
-            .navigationBarTitle(NSLocalizedString("Contact Selection", comment: ""), displayMode: .inline)
+            .navigationBarTitle(Text("Contact Selection"), displayMode: .inline)
             .onDisappear {
                 returnedContacts.removeAll()
                 for contact in selectedContacts {

Monal/Classes/ContactRequestsMenu.swift

@@ -85,7 +85,7 @@ struct ContactRequestsMenu: View {
                 }
             }
         }
-        .navigationBarTitle("Contact Requests", displayMode: .inline)
+        .navigationBarTitle(Text("Contact Requests"), displayMode: .inline)
         .navigationViewStyle(.stack)
         .onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("kMonalContactRefresh")).receive(on: RunLoop.main)) { notification in
             self.pendingRequests = DataLayer.sharedInstance().allContactRequests() as! [MLContact]

Monal/Classes/ContactResources.swift

@@ -144,7 +144,7 @@ struct ContactResources: View {
                 }
             }
         }
-        .navigationBarTitle("Devices of \(contact.contactDisplayName as String)", displayMode: .inline)
+        .navigationBarTitle(Text("Devices of \(contact.contactDisplayName as String)"), displayMode: .inline)
     }
 }
 

Monal/Classes/CreateGroupMenu.swift

@@ -117,7 +117,7 @@ struct CreateGroupMenu: View {
             }))
         }
         .addLoadingOverlay(overlay)
-        .navigationBarTitle(NSLocalizedString("Create new group", comment:""), displayMode: .inline)
+        .navigationBarTitle(Text("Create new group"), displayMode: .inline)
         .navigationViewStyle(.stack)
     }
 }

Monal/Classes/DataLayer.m

@@ -1024,8 +1024,8 @@ -(NSDictionary* _Nullable) getParticipantForNick:(NSString*) nick inRoom:(NSStri
     return [self.db idReadTransaction:^{
         NSMutableArray<NSDictionary<NSString*, id>*>* toReturn = [[NSMutableArray<NSDictionary<NSString*, id>*> alloc] init];
 
-        [toReturn addObjectsFromArray:[self.db executeReader:@"SELECT *, 1 as 'online' FROM muc_participants WHERE account_id=? AND room=?;" andArguments:@[accountNo, room]]];
-        [toReturn addObjectsFromArray:[self.db executeReader:@"SELECT *, 0 as 'online' FROM muc_members WHERE account_id=? AND room=? AND NOT EXISTS(SELECT * FROM muc_participants WHERE muc_members.account_id=muc_participants.account_id AND muc_members.room=muc_participants.room AND muc_members.member_jid=muc_participants.participant_jid);" andArguments:@[accountNo, room]]];
+        [toReturn addObjectsFromArray:[self.db executeReader:@"SELECT *, 1 as 'online' FROM muc_participants WHERE account_id=? AND room=? ORDER BY affiliation, room_nick;" andArguments:@[accountNo, room]]];
+        [toReturn addObjectsFromArray:[self.db executeReader:@"SELECT *, 0 as 'online' FROM muc_members WHERE account_id=? AND room=? AND NOT EXISTS(SELECT * FROM muc_participants WHERE muc_members.account_id=muc_participants.account_id AND muc_members.room=muc_participants.room AND muc_members.member_jid=muc_participants.participant_jid) ORDER BY affiliation;" andArguments:@[accountNo, room]]];
 
         return toReturn;
     }];