Merge pull request #900 from tchapgouv/899-donner-la-possibilite-de-c…

…reer-un-sondage-depuis-iphone Donner la possibilité de créer un sondage depuis l'iPhone
tchapgouv · Oct 25, 2023 · 1cf3e04 · 1cf3e04
2 parents d2eb063 + 270ba3e
commit 1cf3e04
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift
@@ -395,7 +395,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -417,7 +417,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/DevTchap/Config/BuildSettings.swift b/DevTchap/Config/BuildSettings.swift
@@ -396,7 +396,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/Riot/Modules/Room/RoomCoordinator.swift b/Riot/Modules/Room/RoomCoordinator.swift
@@ -617,7 +617,7 @@ extension RoomCoordinator: RoomViewControllerDelegate {
     }
 
     func roomViewControllerDidRequestPollCreationFormPresentation(_ roomViewController: RoomViewController) {
-//        startEditPollCoordinator()
+        startEditPollCoordinator()
     }
 
     func roomViewControllerDidRequestLocationSharingFormPresentation(_ roomViewController: RoomViewController) {

diff --git a/Riot/Modules/Room/RoomDisplayConfiguration.swift b/Riot/Modules/Room/RoomDisplayConfiguration.swift
@@ -38,7 +38,7 @@ class RoomDisplayConfiguration: NSObject {
         super.init()
     }
 
-    static let `default`: RoomDisplayConfiguration = RoomDisplayConfiguration(callsEnabled: true,
+    static let `default`: RoomDisplayConfiguration = RoomDisplayConfiguration(callsEnabled: false, // Tchap: don't allow calls.
                                                                               integrationsEnabled: true,
                                                                               jitsiWidgetRemoverEnabled: true,
                                                                               sendingPollsEnabled: true)

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -261,7 +261,7 @@ + (instancetype)roomViewController
 {
     RoomViewController *controller = [[[self class] alloc] initWithNibName:NSStringFromClass(self.class)
                                                                     bundle:[NSBundle bundleForClass:self.class]];
-//    controller.displayConfiguration = [RoomDisplayConfiguration default];
+    controller.displayConfiguration = [RoomDisplayConfiguration default];
     return controller;
 }
 
@@ -270,7 +270,7 @@ + (instancetype)instantiateWithConfiguration:(RoomDisplayConfiguration *)configu
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
     NSString *storyboardId = [NSString stringWithFormat:@"%@StoryboardId", self.className];
     RoomViewController *controller = [storyboard instantiateViewControllerWithIdentifier:storyboardId];
-//    controller.displayConfiguration = configuration;
+    controller.displayConfiguration = configuration;
     return controller;
 }
 

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.swift
@@ -20,7 +20,7 @@ import GBDeviceInfo
 
 extension RoomInputToolbarView {
     open override func sendCurrentMessage() {
-        // Tchap fix : don't autocorrecxt if it is a command (starts with a '/')
+        // Tchap fix : don't autocorrect if it is a command (starts with a '/')
         // Tchap fix will be removed when Element fix will come via rebase (https://github.com/vector-im/element-ios/pull/7462)
         // Triggers auto-correct if needed and if it is not a command.
         let isCommand = self.textMessage.hasPrefix("/")

diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift
@@ -425,7 +425,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift
@@ -425,7 +425,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
@@ -425,7 +425,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Polls
 
-    static let pollsEnabled = false //true : Currently disabled in Tchap.
+    static let pollsEnabled = true
     static var pollsHistoryEnabled: Bool = false
 
     // MARK: - Location Sharing

diff --git a/changelog.d/899.feature b/changelog.d/899.feature
@@ -0,0 +1 @@
+Donner la possibilité de créer un sondage depuis l'iPhone
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Donner la possibilité de créer un sondage depuis l'iPhone