Merge branch 'release/1.4.8/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+#### Describe the bug.
+A clear and concise description of what the bug is.
+
+#### Steps to reproduce:
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+#### Expected behavior
+A clear and concise description of what you expected to happen.
+
+#### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+#### Contextual information:
+<!-- You can find your device information under Settings -> General -> About -->
+ - Device: <!-- e.g. iPhone6, under "model name"-->
+ - OS: <!-- e.g. iOS8.1, under "software version" -->
+<!-- The app version should be displayed in the side-panel of the home screen -->
+ - App Version: <!-- e.g. 1.4.5 -->

.github/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Element iOS Community Support
+    url: "https://matrix.to/#/#element-ios:matrix.org"
+    about: General Element iOS support questions can be asked here.
+  - name: Matrix Security Policy
+    url: https://www.matrix.org/security-disclosure-policy/
+    about: Learn more about our security disclosure policy.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature'
+assignees: ''
+
+---
+
+#### Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+#### Describe the solution you'd like.
+A clear and concise description of what you want to happen.
+
+#### Describe alternatives you've considered.
+A clear and concise description of any alternative solutions or features you've considered.
+
+#### Additional context.
+Add any other context or screenshots about the feature request here.

.github/workflows/ci.yml → .github/workflows/ci-build.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Build CI
 
 on:
   # Triggers the workflow on any pull request and push to develop
@@ -52,43 +52,3 @@ jobs:
       # Main step
       - name: Build iOS simulator
         run: bundle exec fastlane build
-
-
-  tests:
-    name: Tests
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      # Common cache
-      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
-      - uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      # Make sure we use the latest version of MatrixKit
-      - name: Reset MatrixKit pod
-        run: rm -rf Pods/MatrixKit
-
-      # Common setup
-      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
-      - name: Use right MatrixKit and MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
-
-      # Main step
-      - name: Unit tests
-        run: bundle exec fastlane test

.github/workflows/ci-tests.yml

@@ -0,0 +1,54 @@
+name: Tests CI
+
+on:
+  # Triggers the workflow on any pull request and push to develop
+  push:
+    branches: [ develop ]
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  # Make the git branch for a PR available to our Fastfile
+  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - uses: actions/cache@v2
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      # Make sure we use the latest version of MatrixKit
+      - name: Reset MatrixKit pod
+        run: rm -rf Pods/MatrixKit
+
+      # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3    
+      - name: Use right MatrixKit and MatrixSDK versions
+        run: bundle exec fastlane point_dependencies_to_related_branches
+
+      # Main step
+      - name: Unit tests
+        run: bundle exec fastlane test

CHANGES.rst

@@ -1,3 +1,44 @@
+Changes in 1.4.8 (2021-07-29)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * Room: Added support for Voice Messages (#4090, #4091, #4092, #4094, #4095, #4096)
+ * Rooms Tab: Remove the directory section (#4521).
+ * Notifications: Show decrypted content is enabled by default (#4519).
+ * People Tab: Remove the local contacts section (#4523).
+ * Contacts: Delay access to local contacts until they're needed for display (#4616).
+ * RecentsDataSource: Factorize section reset in one place (target #4591).
+ * Voice Messages: Tap/hold to send voice messages isn't intuitive (#4601).
+ * Voice Messages: copy could be improved (#4604).
+ * Slide to lock should be more generous (#4602).
+
+🐛 Bugfix
+ * Room: Fixed mentioning users from room info member details (#4583)
+ * Settings: Disabled autocorrection when entering an identity server (#4593).
+ * Room Notification Settings: Fix Crash when opening the new Room Notification Settings Screen (Not yet released) (#4599).
+ * AuthenticationViewController: Fix crash on authentication if an intermediate view was presented (#4606).
+ * Room: Fixed crash when opening a read-only room (#4620).
+ * Voice Messages: Tapping on waveform in composer glitches UI (#4603).
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * Separated CI jobs into individual actions
+ * Update Gemfile.lock
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.15.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.6)).
+
 Changes in 1.4.7 (2021-07-22)
 =================================================
 
@@ -20,7 +61,7 @@ Changes in 1.4.7 (2021-07-22)
  * 
 
 Others
- * 
+ * Updated issue templates.
 
 Improvements:
  * Upgrade MatrixKit version ([v0.15.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.5)).

Config/AppIdentifiers.xcconfig

@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Version
-MARKETING_VERSION = 1.4.7
-CURRENT_PROJECT_VERSION = 1.4.7
+MARKETING_VERSION = 1.4.8
+CURRENT_PROJECT_VERSION = 1.4.8
 
 
 // Team

Config/BuildSettings.swift

@@ -148,7 +148,7 @@ final class BuildSettings: NSObject {
 
 
     // MARK: -  Public rooms Directory
-    static let publicRoomsShowDirectory: Bool = true
+    #warning("Unused build setting: should this be implemented in ShowDirectory?")
     static let publicRoomsAllowServerChange: Bool = true
     // List of homeservers for the public rooms directory
     static let publicRoomsDirectoryServers = [
@@ -309,6 +309,13 @@ final class BuildSettings: NSObject {
     static let messageDetailsAllowCopyMedia: Bool = true
     static let messageDetailsAllowPasteMedia: Bool = true
 
+    // MARK: - Voice Message
+
+    static let voiceMessagesEnabled = false
+
+    // MARK: - Notifications
+    static let decryptNotificationsByDefault: Bool = true
+
     // MARK: - HTTP
     /// Additional HTTP headers will be sent by all requests. Not recommended to use request-specific headers, like `Authorization`.
     /// Empty dictionary by default.

DesignKit/Source/Colors.swift

@@ -45,6 +45,10 @@ import UIKit
     /// - Icons
     var quarterlyContent: UIColor { get }
 
+    /// - Text
+    /// - Icons
+    var quinaryContent: UIColor { get }
+
     /// Separating line
     var separator: UIColor { get }
 

DesignKit/Variants/Colors/Dark/DarkColors.swift

@@ -32,6 +32,8 @@ public class DarkColors: Colors {
 
     public let quarterlyContent: UIColor = UIColor(rgb: 0x6F7882)
 
+    public let quinaryContent: UIColor = UIColor(rgb: 0x394049)
+
     public let separator: UIColor = UIColor(rgb: 0x21262C)
 
     public let tile: UIColor = UIColor(rgb: 0x394049)

DesignKit/Variants/Colors/Light/LightColors.swift

@@ -32,6 +32,8 @@ public class LightColors: Colors {
 
     public let quarterlyContent: UIColor = UIColor(rgb: 0xC1C6CD)
 
+    public let quinaryContent: UIColor = UIColor(rgb: 0xE3E8F0)
+
     public let separator: UIColor = UIColor(rgb: 0xE3E8F0)
 
     public let tile: UIColor = UIColor(rgb: 0xF3F8FD)

Gemfile.lock

@@ -7,7 +7,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -252,4 +252,4 @@ DEPENDENCIES
   xcode-install
 
 BUNDLED WITH
-   2.2.14
+   2.2.21

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.15.5'
+$matrixKitVersion = '= 0.15.6'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 
@@ -69,6 +69,8 @@ abstract_target 'RiotPods' do
     pod 'SwiftBase32', '~> 0.9.0'
     pod 'SwiftJWT', '~> 3.6.200'
     pod 'SideMenu', '~> 6.5'
+    pod 'DSWaveformImage', '~> 6.1.1'
+    pod 'ffmpeg-kit-ios-audio', '~> 4.4.LTS'
 
     pod 'FLEX', '~> 4.4.1', :configurations => ['Debug']