Merge branch 'release/1.1.2/master'

CHANGES.rst

@@ -1,3 +1,31 @@
+Changes in 1.1.2 (2020-12-02)
+=================================================
+
+✨ Features
+ * Added blur background support for iPhone and iPad (#3842)
+
+🙌 Improvements
+ * Room History: Remove the report option for outgoing messages.
+ * Empty views: Add empty screen when there is nothing to display on home, people, favourites and rooms screen (#3836).
+
+🐛 Bugfix
+ * Restore the modular widget events in the rooms histories.
+
+⚠️ API Changes
+ * Slight API changes for SlidingModalPresenter to avoid race conditions while sharing a presenter. (#3842)
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.13.2](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.13.2)).
+
 Changes in 1.1.1 (2020-11-24)
 =================================================
 
@@ -39,6 +67,7 @@ Changes in 1.1.0 (2020-11-17)
  * MXProfiler: Use this new module to track launch animation time reliably.
  * KeyValueStore improvements.
  * Jitsi: Support authenticated Jitsi widgets (#3655).
+ * Room invites: Allow to accept a room invite without preview.
 
 🐛 Bugfix
  * Fix analytics in order to track performance improvements.

Config/AppConfiguration.swift

@@ -31,6 +31,10 @@ class AppConfiguration: CommonConfiguration {
         // Enable CallKit for app
         MXKAppSettings.standard()?.isCallKitEnabled = true
 
+        // Get modular widget events in rooms histories
+        MXKAppSettings.standard()?.addSupportedEventTypes([kWidgetMatrixEventTypeString,
+                                                           kWidgetModularEventTypeString])
+
         // Hide undecryptable messages that were sent while the user was not in the room
         MXKAppSettings.standard()?.hidePreJoinedUndecryptableEvents = true
 

Config/BuildSettings.swift

@@ -25,19 +25,31 @@ final class BuildSettings: NSObject {
 
     // MARK: - Bundle Settings
     static var bundleDisplayName: String {
-        Bundle.app.object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
+        guard let bundleDisplayName = Bundle.app.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String else {
+            fatalError("CFBundleDisplayName should be defined")
+        }
+        return bundleDisplayName
     }
 
     static var applicationGroupIdentifier: String {
-        Bundle.app.object(forInfoDictionaryKey: "applicationGroupIdentifier") as! String
+        guard let applicationGroupIdentifier = Bundle.app.object(forInfoDictionaryKey: "applicationGroupIdentifier") as? String else {
+            fatalError("applicationGroupIdentifier should be defined")
+        }
+        return applicationGroupIdentifier
     }
 
     static var baseBundleIdentifier: String {
-        Bundle.app.object(forInfoDictionaryKey: "baseBundleIdentifier") as! String
+        guard let baseBundleIdentifier = Bundle.app.object(forInfoDictionaryKey: "baseBundleIdentifier") as? String else {
+            fatalError("baseBundleIdentifier should be defined")
+        }
+        return baseBundleIdentifier
     }
 
     static var keychainAccessGroup: String {
-        Bundle.app.object(forInfoDictionaryKey: "keychainAccessGroup") as! String
+        guard let keychainAccessGroup = Bundle.app.object(forInfoDictionaryKey: "keychainAccessGroup") as? String else {
+            fatalError("keychainAccessGroup should be defined")
+        }
+        return keychainAccessGroup
     }
 
     static var pushKitAppIdProd: String {

INSTALL.md

@@ -6,9 +6,7 @@ To build Element iOS project you need:
 
 - Xcode 12.1+.
 - [Ruby](https://www.ruby-lang.org/), a dynamic programming language used by several build tools.
-- [cmake](https://gitlab.kitware.com/cmake/cmake), used to build [cmark](https://github.com/commonmark/cmark) dependency of [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) pod.
 - [CocoaPods](https://cocoapods.org), library dependencies manager for Xcode projects.
-- [Homebrew](http://brew.sh/) (recommended), is a package manager for macOS that can be used to install cmake.
 - [bundler](https://bundler.io/) (optional), is also a dependency manager used to manage build tools dependency (CocoaPods, Fastlane).
 
 ### Install Ruby
@@ -17,15 +15,6 @@ Ruby is required for several build tools like CocoaPods, bundler and fastlane. R
 
 If you do not want to grant the ruby package manager, [RubyGems](https://rubygems.org/), admin privileges and you prefer install gems into your user directory, you can read instructions from the CocoaPods [guide about sudo-less installation](https://guides.cocoapods.org/using/getting-started.html#sudo-less-installation).
 
-### Install cmake
-
-There are several ways to install cmake, downloading binary from [official website](https://cmake.org/download/) or using a package manager like [MacPorts](https://ports.macports.org/port/cmake/summary) or [Homebrew](http://brew.sh/).
-To keep it up to date, we recommend you to install cmake using [Homebrew](http://brew.sh/):
-
-```
-brew install cmake
-```
-
 ### Install CocoaPods
 
 To install CocoaPods you can grab the right version by using `bundler` (recommended) or you can directly install it with RubyGems:

Podfile

@@ -11,7 +11,7 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.13.1'
+$matrixKitVersion = '= 0.13.2'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 

Podfile.lock

@@ -47,7 +47,7 @@ PODS:
   - GBDeviceInfo/Core (6.4.0)
   - GZIP (1.3.0)
   - HPGrowingTextView (1.1)
-  - JitsiMeetSDK (2.10.2)
+  - JitsiMeetSDK (2.11.0)
   - KeychainAccess (4.2.1)
   - KituraContracts (1.2.1):
     - LoggerAPI (~> 1.7)
@@ -60,48 +60,48 @@ PODS:
   - MatomoTracker (7.2.2):
     - MatomoTracker/Core (= 7.2.2)
   - MatomoTracker/Core (7.2.2)
-  - MatrixKit (0.13.1):
+  - MatrixKit (0.13.2):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.13.1)
-    - MatrixSDK (= 0.17.3)
-  - MatrixKit/AppExtension (0.13.1):
+    - MatrixKit/Core (= 0.13.2)
+    - MatrixSDK (= 0.17.4)
+  - MatrixKit/AppExtension (0.13.2):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.17.3)
-  - MatrixKit/Core (0.13.1):
+    - MatrixSDK (= 0.17.4)
+  - MatrixKit/Core (0.13.2):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.17.3)
-  - MatrixSDK (0.17.3):
-    - MatrixSDK/Core (= 0.17.3)
-  - MatrixSDK/Core (0.17.3):
+    - MatrixSDK (= 0.17.4)
+  - MatrixSDK (0.17.4):
+    - MatrixSDK/Core (= 0.17.4)
+  - MatrixSDK/Core (0.17.4):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.1.0)
-    - Realm (= 10.1.2)
-  - MatrixSDK/JingleCallStack (0.17.3):
-    - JitsiMeetSDK (= 2.10.2)
+    - Realm (= 10.1.4)
+  - MatrixSDK/JingleCallStack (0.17.4):
+    - JitsiMeetSDK (= 2.11.0)
     - MatrixSDK/Core
-  - MatrixSDK/SwiftSupport (0.17.3):
+  - MatrixSDK/SwiftSupport (0.17.4):
     - MatrixSDK/Core
   - OLMKit (3.1.0):
     - OLMKit/olmc (= 3.1.0)
     - OLMKit/olmcpp (= 3.1.0)
   - OLMKit/olmc (3.1.0)
   - OLMKit/olmcpp (3.1.0)
   - ReadMoreTextView (3.0.1)
-  - Realm (10.1.2):
-    - Realm/Headers (= 10.1.2)
-  - Realm/Headers (10.1.2)
+  - Realm (10.1.4):
+    - Realm/Headers (= 10.1.4)
+  - Realm/Headers (10.1.4)
   - Reusable (4.1.1):
     - Reusable/Storyboard (= 4.1.1)
     - Reusable/View (= 4.1.1)
@@ -129,8 +129,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.1)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.2.2)
-  - MatrixKit (= 0.13.1)
-  - MatrixKit/AppExtension (= 0.13.1)
+  - MatrixKit (= 0.13.2)
+  - MatrixKit/AppExtension (= 0.13.2)
   - MatrixSDK
   - MatrixSDK/JingleCallStack
   - MatrixSDK/SwiftSupport
@@ -193,7 +193,7 @@ SPEC CHECKSUMS:
   GBDeviceInfo: f29249891446a392e64b9c9bbef9554aad2a6beb
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
-  JitsiMeetSDK: d7612d73befd3f7f51f989458a816bbd05d0bc8e
+  JitsiMeetSDK: ddc915b751b0166aa4fdfee938bd60cc87aff9f3
   KeychainAccess: 9b07f665298d13c3a85881bd3171f6f49b8151c1
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
@@ -202,11 +202,11 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832
-  MatrixKit: 47bc0d4414761f5a88fc1e6429cb0d8ab4d10b2f
-  MatrixSDK: 673536e6b013185ce149ba61ff24b84becab40fd
+  MatrixKit: 411348d4690b414e18958a0437c13edc21054a18
+  MatrixSDK: 39282219213aebf621326f6335073b5a2b1e9113
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
-  Realm: 031fdd4be7094d01b43af1a5e49766ab644bb800
+  Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
   Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
   SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
@@ -215,6 +215,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 1f3cfce328f9e786da7240ccb9391754c65531eb
+PODFILE CHECKSUM: 5f40ae970fc6a939c548fedf78849358a895c315
 
 COCOAPODS: 1.10.0