Merge branch 'release/v0.11.0'

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,4 +6,4 @@
 * [ ] Pull request is based on the develop branch
 * [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-ios/blob/develop/CHANGES.rst)
 * [ ] Pull request includes screenshots or videos of UI changes
-* [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off)
+* [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off)

CHANGES.rst

@@ -1,11 +1,35 @@
+Changes in 0.11.0 (2020-04-17)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.12.0](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.12.0)).
+ * Crypto: Enable E2EE by default for DM
+ * Crypto: Cross-signing support
+ * Crypto: Do not warn anymore for unknown devices. Trust on First Use.
+ * RoomVC: Update encryption decoration with shields (#2934, #2930, #2906).
+ * Settings: Remove "End-to-End Encryption" from the LABS section (#2941).
+ * Room decoration: Use shields instead of padlocks (#2906).
+ * Room decoration: Remove horizontal empty space when there is no decoration badge to set on room message (#2978).
+ * RoomVC: For a room preview use room canonical alias if present when joining a room.
+ * Update Matomo app id (#3001)
+ * Verification by DM: Support QR code (#2921).
+ * Cross-Signing: Detect and expose new sign-ins (#2918).
+ * Cross-signing: Complete security at the end of sign in process( #3003).
+ * Make decoration uniform (#2972).
+ * DeactivateAccountViewController: Respect active theme (PR #3107).
+ * Verification by emojis: Center emojis in screen horizontally (PR #3119).
+
+Bug fix:
+ * Key backup banner is not hidden correctly (#2899). 
+
 Changes in 0.10.5 (2020-04-01)
 ===============================================
 
 Bug fix:
  * Fix error when joining some public rooms, thanks to @chrismoos (PR #2888).
  * Fix crash due to malformed widget (#2997).
  * Push notifications: Avoid any automatic deactivation (vector-im/riot-ios#3017).
- * Fix links breaking user out of SSO flow.
+ * Fix links breaking user out of SSO flow, thanks to @schultetwin (#3039).
 
 Changes in 0.10.4 (2019-12-11)
 ===============================================

CONTRIBUTING.rst

@@ -1,4 +1,4 @@
 Contributing code to Riot iOS
 ==================================
 
-riot-ios follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
+riot-ios follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md

Podfile

@@ -7,7 +7,7 @@ use_frameworks!
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.11.4'
+$matrixKitVersion = '0.12.0'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
@@ -61,8 +61,7 @@ abstract_target 'RiotPods' do
 
     pod 'GBDeviceInfo', '~> 6.3.0'
     pod 'Reusable', '~> 4.1'
-    pod 'SwiftUTI', :git => 'https://github.com/speramusinc/SwiftUTI.git', :branch => 'master'
-
+
     # Piwik for analytics
     pod 'MatomoTracker', '~> 7.2.0'
 
@@ -77,7 +76,9 @@ abstract_target 'RiotPods' do
 
     target "Riot" do
         import_MatrixKit
-        pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
+        pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'        
+        pod 'KTCenterFlowLayout', '~> 1.3.1'
+        pod 'ZXingObjC', '~> 3.6.5'
 
         target 'RiotTests' do
             inherit! :search_paths

Podfile.lock

@@ -44,46 +44,44 @@ PODS:
   - GZIP (1.2.3)
   - HPGrowingTextView (1.1)
   - JitsiMeetSDK (2.3.1)
+  - KTCenterFlowLayout (1.3.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
   - MatomoTracker (7.2.0):
     - MatomoTracker/Core (= 7.2.0)
   - MatomoTracker/Core (7.2.0)
-  - MatrixKit (0.11.4):
+  - MatrixKit (0.12.0):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.11.4)
-    - MatrixSDK (= 0.15.2)
-    - SwiftUTI (~> 1.0.6)
-  - MatrixKit/AppExtension (0.11.4):
+    - MatrixKit/Core (= 0.12.0)
+    - MatrixSDK (= 0.16.0)
+  - MatrixKit/AppExtension (0.12.0):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.15.2)
-    - SwiftUTI (~> 1.0.6)
-  - MatrixKit/Core (0.11.4):
+    - MatrixSDK (= 0.16.0)
+  - MatrixKit/Core (0.12.0):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.15.2)
-    - SwiftUTI (~> 1.0.6)
-  - MatrixSDK (0.15.2):
-    - MatrixSDK/Core (= 0.15.2)
-  - MatrixSDK/Core (0.15.2):
+    - MatrixSDK (= 0.16.0)
+  - MatrixSDK (0.16.0):
+    - MatrixSDK/Core (= 0.16.0)
+  - MatrixSDK/Core (0.16.0):
     - AFNetworking (~> 3.2.0)
     - GZIP (~> 1.2.2)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.1.0)
     - Realm (~> 3.17.3)
-  - MatrixSDK/JingleCallStack (0.15.2):
+  - MatrixSDK/JingleCallStack (0.16.0):
     - JitsiMeetSDK (~> 2.3.1)
     - MatrixSDK/Core
-  - MatrixSDK/SwiftSupport (0.15.2):
+  - MatrixSDK/SwiftSupport (0.16.0):
     - MatrixSDK/Core
   - OLMKit (3.1.0):
     - OLMKit/olmc (= 3.1.0)
@@ -100,24 +98,27 @@ PODS:
   - Reusable/View (4.1.0)
   - SwiftGen (6.1.0)
   - SwiftLint (0.36.0)
-  - SwiftUTI (1.0.7)
   - zxcvbn-ios (1.0.4)
+  - ZXingObjC (3.6.5):
+    - ZXingObjC/All (= 3.6.5)
+  - ZXingObjC/All (3.6.5)
 
 DEPENDENCIES:
   - cmark
   - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
   - GBDeviceInfo (~> 6.3.0)
+  - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.2.0)
-  - MatrixKit (= 0.11.4)
-  - MatrixKit/AppExtension (= 0.11.4)
+  - MatrixKit (= 0.12.0)
+  - MatrixKit/AppExtension (= 0.12.0)
   - MatrixSDK/JingleCallStack
   - MatrixSDK/SwiftSupport
   - OLMKit
   - Reusable (~> 4.1)
   - SwiftGen (~> 6.1)
   - SwiftLint (~> 0.36.0)
-  - SwiftUTI (from `https://github.com/speramusinc/SwiftUTI.git`, branch `master`)
   - zxcvbn-ios
+  - ZXingObjC (~> 3.6.5)
 
 SPEC REPOS:
   trunk:
@@ -130,6 +131,7 @@ SPEC REPOS:
     - GZIP
     - HPGrowingTextView
     - JitsiMeetSDK
+    - KTCenterFlowLayout
     - libbase58
     - libPhoneNumber-iOS
     - MatomoTracker
@@ -141,16 +143,7 @@ SPEC REPOS:
     - SwiftGen
     - SwiftLint
     - zxcvbn-ios
-
-EXTERNAL SOURCES:
-  SwiftUTI:
-    :branch: master
-    :git: https://github.com/speramusinc/SwiftUTI.git
-
-CHECKOUT OPTIONS:
-  SwiftUTI:
-    :commit: b6b46942fb3aad819610851f62a70e17a528444e
-    :git: https://github.com/speramusinc/SwiftUTI.git
+    - ZXingObjC
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
@@ -162,19 +155,20 @@ SPEC CHECKSUMS:
   GZIP: af5c90ef903776a7e9afe6ebebd794a84a2929d4
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   JitsiMeetSDK: 69e4978fbab21f9a535d1bec3b8d43721a4c72b2
+  KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   MatomoTracker: 6f89e2561083685a360e223fb663e9ccd57c1d1a
-  MatrixKit: 3db15f216e2de4d53b1405434028d44f42d4af22
-  MatrixSDK: f83bd3c5519c1cb9ac3998f6423574cf528f0250
+  MatrixKit: 2ae83c621caf3c11681e00a0b802086ac4d1106c
+  MatrixSDK: caad3d93c665163d9d414f6876e9a7d220c6c46f
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
   Realm: 5a1d9d47bfc101dd597668b1a8af4288a2557f6d
   Reusable: 82be188f29d96dc5eff0db7b2393bcc08d2cdd5b
   SwiftGen: f872ca75cbd17bf7103c17f13dcfa0d9a15667b0
   SwiftLint: fc9859e4e1752340664851f667bb1898b9c90114
-  SwiftUTI: 917993c124f8eac25e88ced0202fc58d7eb50fa8
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
+  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c7b37d248a316ae786328d88148e3155fea6bee3
+PODFILE CHECKSUM: 6f647ad2f6c765719fd7e9a5d1e9e77e797d328f
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.1