Merge branch 'release/tchap_v1.99.2'

tchapgouv · May 17, 2022 · c5de3a9 · c5de3a9
2 parents dcd9c7f + 6b466b4
commit c5de3a9
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 222 deletions.
diff --git a/Btchap/target.yml b/Btchap/target.yml
@@ -60,9 +60,12 @@ targets:
 
     sources:
     - path: ../Btchap/Config
+    - path: ../Config/AppConfiguration.swift
     - path: ../Config/Project.xcconfig
     - path: ../Config/Project-Warnings.xcconfig
     - path: ../Config/AppIdentifiers.xcconfig
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Config/Configurable.swift
     - path: .
       excludes:
         - "**/*.strings" # Exclude all strings files
@@ -192,6 +195,7 @@ targets:
     - path: ../Riot/Modules/DotsView
     - path: ../Riot/Modules/EncryptionInfo/EncryptionInfoView.h
     - path: ../Riot/Modules/EncryptionInfo/EncryptionInfoView.m
+    - path: ../Riot/Modules/Favorites
     - path: ../Riot/Modules/Home/Fallback
     - path: ../Riot/Modules/Home/Views
     - path: ../Riot/Modules/GDPR
@@ -257,11 +261,6 @@ targets:
     - path: ../RiotShareExtension/Sources/ShareItemProtocol.swift
     - path: ../RiotShareExtension/Sources/ShareItemSender.h
     - path: ../RiotShareExtension/Sources/ShareItemSender.m
-
-    # Tchap
-    - path: ../Tchap/Config/AppConfiguration.swift
-    - path: ../Tchap/Config/CommonConfiguration.swift
-    - path: ../Tchap/Config/Configurable.swift
 
     # Resources
     - path: ../Riot/Assets/en.lproj/InfoPlist.strings

diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
@@ -27,13 +27,20 @@ class AppConfiguration: CommonConfiguration {
     }
 
     private func setupAppSettings() {
-        // Enable CallKit for app
-        MXKAppSettings.standard()?.isCallKitEnabled = true
+        // Tchap: Disable CallKit.
+        MXKAppSettings.standard()?.isCallKitEnabled = false
 
         // Get modular widget events in rooms histories
         MXKAppSettings.standard()?.addSupportedEventTypes([kWidgetMatrixEventTypeString,
                                                            kWidgetModularEventTypeString])
 
+        // Tchap: remove some state events from the rooms histories: creation, the history access, encryption, join rules
+        MXKAppSettings.standard()?.removeSupportedEventTypes([kMXEventTypeStringRoomCreate,
+                                                              kMXEventTypeStringRoomHistoryVisibility,
+                                                              kMXEventTypeStringRoomEncryption,
+                                                              kMXEventTypeStringRoomGuestAccess,
+                                                              kMXEventTypeStringRoomJoinRules])
+
         // Hide undecryptable messages that were sent while the user was not in the room
         MXKAppSettings.standard()?.hidePreJoinedUndecryptableEvents = true
 
@@ -46,8 +53,10 @@ class AppConfiguration: CommonConfiguration {
         // Use UIKit BackgroundTask for handling background tasks in the SDK
         MXSDKOptions.sharedInstance().backgroundModeHandler = MXUIKitBackgroundModeHandler()
 
+        #if SUPPORT_KEYS_BACKUP
         // Enable key backup on app
         MXSDKOptions.sharedInstance().enableKeyBackupWhenStartingMXCrypto = true
+        #endif
     }
 
 

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.99.1
-CURRENT_PROJECT_VERSION = 2
+MARKETING_VERSION = 1.99.2
+CURRENT_PROJECT_VERSION = 1
diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
@@ -62,10 +62,14 @@ class CommonConfiguration: NSObject, Configurable {
 
         // Enable e2e encryption for newly created MXSession
         sdkOptions.enableCryptoWhenStartingMXSession = true
+        sdkOptions.computeE2ERoomSummaryTrust = false
 
         // Disable identicon use
         sdkOptions.disableIdenticonUseForUserAvatar = true
 
+        // Use UIKit BackgroundTask for handling background tasks in the SDK
+        sdkOptions.backgroundModeHandler = MXUIKitBackgroundModeHandler()
+
         // Pass httpAdditionalHeaders to the SDK
         sdkOptions.httpAdditionalHeaders = BuildSettings.httpAdditionalHeaders
 

diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -677,7 +677,7 @@ - (void)configurePinCodeScreenFor:(UIApplication *)application
 //    {
 //        [self.setPinCoordinatorBridgePresenter dismiss];
 //        self.setPinCoordinatorBridgePresenter = nil;
-//        [self afterAppUnlockedByPin:application];
+        [self afterAppUnlockedByPin:application];
 //    }
 }
 

diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
@@ -40,6 +40,8 @@ targets:
       excludes:
       - "Shared/View/ShareRoomsRoomCell.*"
       - "Shared/View/ShareRoomsDiscussionCell.*"
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Config/Configurable.swift
     - path: ../Riot/Categories/Bundle.swift
     - path: ../Riot/Categories/Character.swift
     - path: ../Riot/Categories/MXKImageView.swift
@@ -86,8 +88,6 @@ targets:
 
     # Tchap
     - path: ../RiotShareExtension/BuildSettings.swift
-    - path: ../Tchap/Config/CommonConfiguration.swift
-    - path: ../Tchap/Config/Configurable.swift
     - path: ../Tchap/Extensions
     - path: ../Tchap/Generated/Images_Riot.swift
     - path: ../Tchap/Generated/InfoPlist.swift

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,11 @@
+## Changes in 1.99.2 (2022-05-17)
+
+🐛 Bugfixes
+
+- Messages are missing in the room timelines ([#527](https://github.com/tchapgouv/tchap-ios/issues/527))
+- Unexpected logout ([#528](https://github.com/tchapgouv/tchap-ios/issues/528))
+
+
 ## Changes in v1.99.1 (2022-05-10)
 
 🙌 Improvements

diff --git a/Tchap/Config/AppConfiguration.swift b/Tchap/Config/AppConfiguration.swift
diff --git a/Tchap/Config/CommonConfiguration.swift b/Tchap/Config/CommonConfiguration.swift
diff --git a/Tchap/Config/Configurable.swift b/Tchap/Config/Configurable.swift
diff --git a/Tchap/target.yml b/Tchap/target.yml
@@ -60,9 +60,12 @@ targets:
 
     sources:
     - path: ../Tchap/Config
+    - path: ../Config/AppConfiguration.swift
     - path: ../Config/Project.xcconfig
     - path: ../Config/Project-Warnings.xcconfig
     - path: ../Config/AppIdentifiers.xcconfig
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Config/Configurable.swift
     - path: .
       excludes:
         - "Tools"

diff --git a/TchapTests/target.yml b/TchapTests/target.yml
@@ -55,12 +55,12 @@ targets:
 
     sources:
     - path: .
+    - path: ../Config/AppConfiguration.swift
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Config/Configurable.swift
 
     # Tchap
-    - path: ../Tchap/Config/Configurable.swift
     - path: ../Tchap/Config/BuildSettings.swift
-    - path: ../Tchap/Config/AppConfiguration.swift
-    - path: ../Tchap/Config/CommonConfiguration.swift
 
     # Riot
     - path: ../Riot/Categories/Bundle.swift

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,6 +1,6 @@
 [tool.towncrier]
 name = "Changes in"
-version = "1.99.1"
+version = "1.99.2"
 filename = "TCHAP_CHANGES.md"
 directory = "changelog.d"
 template = "changelog.d/_template.md.jinja"