Merge pull request #6045 from vector-im/ismail/6038_threads_server_check

Author: ismailgulek

Riot/Assets/en.lproj/Vector.strings

@@ -507,6 +507,8 @@ Tap the + to start adding people.";
 "threads_beta_information_link" = "Learn more";
 "threads_beta_enable" = "Try it out";
 "threads_beta_cancel" = "Not now";
+"threads_discourage_information_1" = "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. ";
+"threads_discourage_information_2" = "\n\nDo you want to enable threads anyway?";
 
 "media_type_accessibility_image" = "Image";
 "media_type_accessibility_audio" = "Audio";

Riot/Generated/Strings.swift

@@ -7703,6 +7703,14 @@ public class VectorL10n: NSObject {
   public static var threadsBetaTitle: String { 
     return VectorL10n.tr("Vector", "threads_beta_title") 
   }
+  /// Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. 
+  public static var threadsDiscourageInformation1: String { 
+    return VectorL10n.tr("Vector", "threads_discourage_information_1") 
+  }
+  /// \n\nDo you want to enable threads anyway?
+  public static var threadsDiscourageInformation2: String { 
+    return VectorL10n.tr("Vector", "threads_discourage_information_2") 
+  }
   /// Threads help keep your conversations on-topic and easy to track.
   public static var threadsEmptyInfoAll: String { 
     return VectorL10n.tr("Vector", "threads_empty_info_all") 

Riot/Modules/Room/RoomViewController.m

@@ -3485,9 +3485,7 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
 
     MXWeakify(self);
 
-    BOOL showThreadOption = RiotSettings.shared.enableThreads
-    && !self.roomDataSource.threadId
-    && !selectedEvent.threadId;
+    BOOL showThreadOption = [self showThreadOptionForEvent:selectedEvent];
     if (showThreadOption && [self canCopyEvent:selectedEvent andCell:cell])
     {
         [self.eventMenuBuilder addItemWithType:EventMenuItemTypeCopy
@@ -6417,7 +6415,7 @@ - (void)removeMXSessionStateChangeNotificationsListener
 
     BOOL showMoreOption = (event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForStates)
         || (!event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForMessages);
-    BOOL showThreadOption = !self.roomDataSource.threadId && !event.threadId;
+    BOOL showThreadOption = [self showThreadOptionForEvent:event];
 
     NSMutableArray<RoomContextualMenuItem*> *items = [NSMutableArray arrayWithCapacity:5];
 
@@ -6808,6 +6806,13 @@ - (RoomContextualMenuItem *)moreMenuItemWithEvent:(MXEvent*)event andCell:(id<MX
 
 #pragma mark - Threads
 
+- (BOOL)showThreadOptionForEvent:(MXEvent*)event
+{
+    return !self.roomDataSource.threadId
+        && !event.threadId
+        && (RiotSettings.shared.enableThreads || self.mainSession.store.supportedMatrixVersions.supportsThreads);
+}
+
 - (void)showThreadsNotice
 {
     if (!self.threadsNoticeModalPresenter)
@@ -6845,7 +6850,9 @@ - (void)showThreadsBetaForEvent:(MXEvent *)event
         self.threadsBetaBridgePresenter = nil;
     }
 
-    self.threadsBetaBridgePresenter = [[ThreadsBetaCoordinatorBridgePresenter alloc] initWithThreadId:event.eventId];
+    self.threadsBetaBridgePresenter = [[ThreadsBetaCoordinatorBridgePresenter alloc] initWithThreadId:event.eventId
+                                                                                             infoText:VectorL10n.threadsBetaInformation
+                                                                                       additionalText:nil];
     self.threadsBetaBridgePresenter.delegate = self;
 
     [self.threadsBetaBridgePresenter presentFrom:self.presentedViewController?:self animated:YES];

Riot/Modules/Settings/SettingsViewController.m

@@ -187,7 +187,8 @@ @interface SettingsViewController () <UITextFieldDelegate, MXKCountryPickerViewC
 SettingsDiscoveryTableViewSectionDelegate, SettingsDiscoveryViewModelCoordinatorDelegate,
 SettingsIdentityServerCoordinatorBridgePresenterDelegate,
 ServiceTermsModalCoordinatorBridgePresenterDelegate,
-TableViewSectionsDelegate>
+TableViewSectionsDelegate,
+ThreadsBetaCoordinatorBridgePresenterDelegate>
 {
     // Current alert (if any).
     __weak UIAlertController *currentAlert;
@@ -288,6 +289,8 @@ @interface SettingsViewController () <UITextFieldDelegate, MXKCountryPickerViewC
 
 @property (nonatomic, strong) UserInteractiveAuthenticationService *userInteractiveAuthenticationService;
 
+@property (nonatomic, strong) ThreadsBetaCoordinatorBridgePresenter *threadsBetaBridgePresenter;
+
 /**
  Whether or not to check for contacts access after the user accepts the service terms. The value of this property is
  set automatically when calling `prepareIdentityServiceAndPresentTermsWithSession:checkingAccessForContactsOnAccept`
@@ -3254,8 +3257,31 @@ - (void)toggleEnableRingingForGroupCalls:(UISwitch *)sender
 
 - (void)toggleEnableThreads:(UISwitch *)sender
 {
-    RiotSettings.shared.enableThreads = sender.isOn;
-    MXSDKOptions.sharedInstance.enableThreads = sender.isOn;
+    if (sender.isOn && !self.mainSession.store.supportedMatrixVersions.supportsThreads)
+    {
+        //  user wants to turn on the threads setting but the server does not support it
+        if (self.threadsBetaBridgePresenter)
+        {
+            [self.threadsBetaBridgePresenter dismissWithAnimated:YES completion:nil];
+            self.threadsBetaBridgePresenter = nil;
+        }
+
+        self.threadsBetaBridgePresenter = [[ThreadsBetaCoordinatorBridgePresenter alloc] initWithThreadId:@""
+                                                                                                 infoText:VectorL10n.threadsDiscourageInformation1
+                                                                                           additionalText:VectorL10n.threadsDiscourageInformation2];
+        self.threadsBetaBridgePresenter.delegate = self;
+
+        [self.threadsBetaBridgePresenter presentFrom:self.presentedViewController?:self animated:YES];
+        return;
+    }
+
+    [self enableThreads:sender.isOn];
+}
+
+- (void)enableThreads:(BOOL)enable
+{
+    RiotSettings.shared.enableThreads = enable;
+    MXSDKOptions.sharedInstance.enableThreads = enable;
     [[MXKRoomDataSourceManager sharedManagerForMatrixSession:self.mainSession] reset];
     [[AppDelegate theDelegate] restoreEmptyDetailsViewController];
 }
@@ -4724,4 +4750,24 @@ - (void)tableViewSectionsDidUpdateSections:(TableViewSections *)sections
     [self.tableView reloadData];
 }
 
+#pragma mark - ThreadsBetaCoordinatorBridgePresenterDelegate
+
+- (void)threadsBetaCoordinatorBridgePresenterDelegateDidTapEnable:(ThreadsBetaCoordinatorBridgePresenter *)coordinatorBridgePresenter
+{
+    MXWeakify(self);
+    [self.threadsBetaBridgePresenter dismissWithAnimated:YES completion:^{
+        MXStrongifyAndReturnIfNil(self);
+        [self enableThreads:YES];
+    }];
+}
+
+- (void)threadsBetaCoordinatorBridgePresenterDelegateDidTapCancel:(ThreadsBetaCoordinatorBridgePresenter *)coordinatorBridgePresenter
+{
+    MXWeakify(self);
+    [self.threadsBetaBridgePresenter dismissWithAnimated:YES completion:^{
+        MXStrongifyAndReturnIfNil(self);
+        [self updateSections];
+    }];
+}
+
 @end

Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift

@@ -26,8 +26,10 @@ final class ThreadsBetaCoordinator: NSObject, ThreadsBetaCoordinatorProtocol {
     // MARK: Private
 
     private let threadId: String
+    private let infoText: String
+    private let additionalText: String?
     private lazy var viewController: ThreadsBetaViewController = {
-        let result = ThreadsBetaViewController.instantiate()
+        let result = ThreadsBetaViewController.instantiate(infoText: infoText, additionalText: additionalText)
         result.didTapEnableButton = { [weak self] in
             guard let self = self else { return }
             RiotSettings.shared.enableThreads = true
@@ -50,8 +52,10 @@ final class ThreadsBetaCoordinator: NSObject, ThreadsBetaCoordinatorProtocol {
 
     // MARK: - Setup
 
-    init(threadId: String) {
+    init(threadId: String, infoText: String, additionalText: String?) {
         self.threadId = threadId
+        self.infoText = infoText
+        self.additionalText = additionalText
     }    
 
     // MARK: - Public

Riot/Modules/Threads/Beta/ThreadsBetaCoordinatorBridgePresenter.swift

@@ -38,6 +38,8 @@ final class ThreadsBetaCoordinatorBridgePresenter: NSObject {
     // MARK: Private
 
     public let threadId: String
+    public let infoText: String
+    public let additionalText: String?
     private let slidingModalPresenter = SlidingModalPresenter()
     private var coordinator: ThreadsBetaCoordinator?
 
@@ -47,16 +49,20 @@ final class ThreadsBetaCoordinatorBridgePresenter: NSObject {
 
     // MARK: - Setup
 
-    init(threadId: String) {
+    init(threadId: String, infoText: String, additionalText: String?) {
         self.threadId = threadId
+        self.infoText = infoText
+        self.additionalText = additionalText
         super.init()
     }
 
     // MARK: - Public
 
     func present(from viewController: UIViewController, animated: Bool) {
 
-        let threadsBetaCoordinator = ThreadsBetaCoordinator(threadId: threadId)
+        let threadsBetaCoordinator = ThreadsBetaCoordinator(threadId: threadId,
+                                                            infoText: infoText,
+                                                            additionalText: additionalText)
         threadsBetaCoordinator.delegate = self
         guard let presentable = threadsBetaCoordinator.toPresentable() as? SlidingModalPresentable.ViewControllerType else {
             MXLog.error("[ThreadsBetaCoordinatorBridgePresenter] Presentable is not 'SlidingModalPresentable'")

Riot/Modules/Threads/Beta/ThreadsBetaViewController.swift

@@ -39,6 +39,8 @@ class ThreadsBetaViewController: UIViewController {
     // MARK: Private
 
     private var theme: Theme!
+    private var infoText: String!
+    private var additionalText: String?
 
     // MARK: Public
 
@@ -69,9 +71,11 @@ class ThreadsBetaViewController: UIViewController {
 
     // MARK: - Setup
 
-    @objc class func instantiate() -> ThreadsBetaViewController {
+    @objc class func instantiate(infoText: String, additionalText: String?) -> ThreadsBetaViewController {
         let viewController = StoryboardScene.ThreadsBetaViewController.initialScene.instantiate()
         viewController.theme = ThemeService.shared().theme
+        viewController.infoText = infoText
+        viewController.additionalText = additionalText
         return viewController
     }
 
@@ -98,12 +102,17 @@ class ThreadsBetaViewController: UIViewController {
         guard let font = self.informationTextView.font else {
             return
         }
-        let attributedString = NSMutableAttributedString(string: VectorL10n.threadsBetaInformation,
+        let attributedString = NSMutableAttributedString(string: infoText,
                                                          attributes: [.font: font])
         let link = NSAttributedString(string: VectorL10n.threadsBetaInformationLink,
                                       attributes: [.link: Constants.learnMoreLink,
                                                    .font: font])
         attributedString.append(link)
+
+        if let additionalText = additionalText {
+            attributedString.append(NSAttributedString(string: additionalText,
+                                                       attributes: [.font: font]))
+        }
         self.informationTextView.attributedText = attributedString
     }
 

changelog.d/6038.change

@@ -0,0 +1 @@
+Settings: Add threads discourage view when server doesn't support threads.