Rebased to new swift ChatViewController.

Signed-off-by: Ivan Sein <[email protected]>
nextcloud · Oct 24, 2023 · 6d22d82 · 6d22d82
1 parent 1ac50ed
commit 6d22d82
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/NextcloudTalk/BaseChatViewController.swift b/NextcloudTalk/BaseChatViewController.swift
@@ -969,7 +969,8 @@ import QuickLook
     }
 
     func didPressTranslate(for message: NCChatMessage) {
-        let translateMessageVC = MessageTranslationViewController(message: message.parsedMessage().string, availableTranslations: NCSettingsController.sharedInstance().availableTranslations())
+        let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
+        let translateMessageVC = MessageTranslationViewController(message: message.parsedMessage().string, availableTranslations: NCDatabaseManager.sharedInstance().availableTranslations(forAccountId: activeAccount.accountId))
         self.presentWithNavigation(translateMessageVC, animated: true)
     }
 

diff --git a/NextcloudTalk/ChatViewController.swift b/NextcloudTalk/ChatViewController.swift
@@ -1467,6 +1467,7 @@ import UIKit
         }
 
         var actions: [UIMenuElement] = []
+        let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
         let hasChatPermissions = !NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityChatPermission) || (self.room.permissions & NCPermission.chat.rawValue) != 0
 
         // Reply option
@@ -1477,7 +1478,6 @@ import UIKit
         }
 
         // Reply-privately option (only to other users and not in one-to-one)
-        let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
         if self.isMessageReplyable(message: message), self.room.type != kNCRoomTypeOneToOne, message.actorType == "users", message.actorId != activeAccount.userId {
             actions.append(UIAction(title: NSLocalizedString("Reply privately", comment: ""), image: .init(systemName: "person")) { _ in
                 self.didPressReplyPrivately(for: message)
@@ -1553,7 +1553,7 @@ import UIKit
         })
 
         // Translate
-        if !self.offlineMode, !NCSettingsController.sharedInstance().availableTranslations().isEmpty {
+        if !self.offlineMode, NCDatabaseManager.sharedInstance().hasAvailableTranslations(forAccountId: activeAccount.accountId) {
             actions.append(UIAction(title: NSLocalizedString("Translate", comment: ""), image: .init(systemName: "character.book.closed")) { _ in
                 self.didPressTranslate(for: message)
             })

diff --git a/NextcloudTalk/NCDatabaseManager.h b/NextcloudTalk/NCDatabaseManager.h
@@ -124,7 +124,7 @@ extern NSString * const kMinimumRequiredTalkCapability;
 
 - (BOOL)hasAvailableTranslationsForAccountId:(NSString *)accountId;
 - (BOOL)hasTranslationProvidersForAccountId:(NSString *)accountId;
-- (NSArray *)availableTranslationsForAccountId:(NSString *)accountId;
+- (NSArray<NCTranslation *> *)availableTranslationsForAccountId:(NSString *)accountId;
 - (NSArray *)translationsFromTranslationsArray:(NSArray *)translations;
 
 @end