Add busy status support

Nextcloud.xcodeproj/project.pbxproj

@@ -6361,8 +6361,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
-				kind = exactVersion;
-				version = 7.1.4;
+				branch = main;
+				kind = branch;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

iOSClient/Account/Account Settings/NCAccountSettingsModel.swift

@@ -114,16 +114,16 @@ class NCAccountSettingsModel: ObservableObject, ViewOnAppearHandling {
     }
 
     /// Function to update the user data
-    func getUserStatus() -> (statusImage: UIImage?, statusMessage: String, descriptionMessage: String) {
+    func getUserStatus() -> (statusImage: UIImage?, statusImageColor: UIColor, statusMessage: String, descriptionMessage: String) {
         guard let tblAccount,
               let capabilities = NCNetworking.shared.capabilities[tblAccount.account] else {
-            return (UIImage(), "", "")
+            return (UIImage(), .black, "", "")
         }
         if capabilities.userStatusEnabled,
            let tableAccount = database.getTableAccount(predicate: NSPredicate(format: "account == %@", tblAccount.account)) {
             return NCUtility().getUserStatus(userIcon: tableAccount.userStatusIcon, userStatus: tableAccount.userStatusStatus, userMessage: tableAccount.userStatusMessage)
         }
-        return (nil, "", "")
+        return (nil, .black, "", "")
     }
 
     /// Is the user an Admin

iOSClient/Account/Account Settings/NCAccountSettingsView.swift

@@ -30,6 +30,7 @@ struct NCAccountSettingsView: View {
                         ForEach(0..<model.tblAccounts.count, id: \.self) { index in
                             let status = model.getUserStatus()
                             let avatar = NCUtility().loadUserImage(for: model.tblAccounts[index].user, displayName: model.tblAccounts[index].displayName, urlBase: model.tblAccounts[index].urlBase)
+
                             //
                             // User
                             VStack {
@@ -43,9 +44,11 @@ struct NCAccountSettingsView: View {
                                             .fill(.white)
                                             .frame(width: 30, height: 30)
                                         Image(uiImage: statusImage)
+                                            .renderingMode(.template)
                                             .resizable()
                                             .scaledToFit()
                                             .frame(width: 30, height: 30)
+                                            .foregroundStyle(Color(uiColor: status.statusImageColor))
                                     }
                                     .offset(x: 30, y: -30)
                                 }

iOSClient/Networking/NCNetworkingProcess.swift

@@ -126,7 +126,7 @@
 
                 await runMetadataPipelineAsync()
 
                 // TODO: Check temperature
 
                 if lastUsedInterval != minInterval {
                     await startTimer(interval: minInterval)
@@ -257,7 +257,7 @@
                     if metadata.isDirectoryE2EE {
                         await NCNetworkingE2EEUpload().upload(metadata: metadata, controller: controller)
 
-                        httpMaximumConnectionsPerHostInUpload = 1
+                        httpMaximumProcessUpload = 1
                     } else if metadata.chunk > 0 {
                         let controller = controller
 
@@ -283,7 +283,7 @@
                             hud.dismiss()
                         }
 
-                        httpMaximumConnectionsPerHostInUpload = 1
+                        httpMaximumProcessUpload = 1
                     } else {
                         await networking.uploadFileInBackground(metadata: metadata)
                     }

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -174,8 +174,8 @@
 
 /* User status */
 "_away_"                    = "Away";
-/* User status */
 
+/* User status */
 "_dnd_"                     = "Do not disturb";
 
 /* User status */
@@ -187,6 +187,9 @@
 /* User status */
 "_invisible_description_"   = "Appear offline";
 
+/* User status */
+"_busy_"                    = "Busy";
+
 /* User status */
 "_status_message_"          = "Status message";
 "_status_message_placehorder_"  = "What is your status?";