Merge branch 'release/1.1.13' into develop

.github/ISSUE_TEMPLATE/release.md

@@ -7,24 +7,24 @@ assignees: bmarty
 
 ---
 
-For the example, we are releasing the version 1.1.10
+For the example, we are releasing the version 1.1.10. Delete this line and replace 1.1.10 with the version in the issue content.
 
 ### Before the release
 
 - [ ] Weblate sync, fix lint issue if any (in a dedicated PR)
 - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
+- [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
 
 ### Do the release
 
 - [ ] Create release with gitflow, branch name `release/1.1.10`
-- [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
 - [ ] Run `./tools/import_emojis.py` and commit the change if any.
 - [ ] Run `./tools/import_sas_strings.py` and commit the change if any. If there is no change since a while, ping Travis
 - [ ] Check the crashes from the PlayStore
-- [ ] Check the rageshake with the current dev version. For instance https://github.com/matrix-org/element-android-rageshakes/labels/1.1.10-dev
+- [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.1.10-dev
 - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
 - [ ] Create an account on matrix.org
-- [ ] Run towncrier: `./towncrier --version v1.1.10` (add `--draft` for a preview)
+- [ ] Run towncrier: `towncrier --version v1.1.10 --draft` (remove `--draft` do write the file CHANGES.md)
 - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
 - [ ] Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes.
 - [ ] Finish release with gitflow, delete the draft PR

CHANGES.md

@@ -1,3 +1,27 @@
+Changes in Element v1.1.13 (2021-07-19)
+=======================================
+
+Features ✨
+----------
+ - Remove redundant mimetype (vector-im/element-web#2547) ([#3273](https://github.com/vector-im/element-android/issues/3273))
+ - Room version capabilities and room upgrade support, better error feedback ([#3551](https://github.com/vector-im/element-android/issues/3551))
+ - Add retry support in room addresses screen ([#3635](https://github.com/vector-im/element-android/issues/3635))
+ - Better management of permission requests ([#3667](https://github.com/vector-im/element-android/issues/3667))
+
+Bugfixes 🐛
+----------
+ - Standardise spelling and casing of homeserver, identity server, and integration manager. ([#491](https://github.com/vector-im/element-android/issues/491))
+ - Perform .well-known request first, even if the entered URL is a valid homeserver base url ([#2843](https://github.com/vector-im/element-android/issues/2843))
+ - Use different copy for self verification. ([#3624](https://github.com/vector-im/element-android/issues/3624))
+ - Crash when opening room addresses screen with no internet connection ([#3634](https://github.com/vector-im/element-android/issues/3634))
+ - Fix unread messages marker being hidden in collapsed membership item ([#3655](https://github.com/vector-im/element-android/issues/3655))
+ - Ensure reaction emoji picker tabs look fine on small displays ([#3661](https://github.com/vector-im/element-android/issues/3661))
+
+SDK API changes ⚠️
+------------------
+ - RawService.getWellknown() now takes a domain instead of a matrixId as parameter ([#3572](https://github.com/vector-im/element-android/issues/3572))
+
+
 Changes in Element 1.1.12 (2021-07-05)
 ======================================
 

changelog.d/2843.bugfix

@@ -1 +0,0 @@
-Perform .well-known request first, even if the entered URL is a valid homeserver base url

changelog.d/3273.feature

@@ -1 +0,0 @@
-Remove redundant mimetype (vector-im/element-web#2547)

changelog.d/3551.feature

@@ -1 +0,0 @@
-Room version capabilities and room upgrade support, better error feedback

changelog.d/3572.misc

@@ -1 +0,0 @@
-RawService.getWellknown() now takes a domain instead of a matrixId as parameter

changelog.d/3624.bugfix

@@ -1 +0,0 @@
-Use different copy for self verification.

changelog.d/3634.bugfix

@@ -1 +0,0 @@
-Crash when opening room addresses screen with no internet connection

changelog.d/3635.feature

@@ -1 +0,0 @@
-Add retry support in room addresses screen

changelog.d/3655.bugfix

@@ -1 +0,0 @@
-Fix unread messages marker being hidden in collapsed membership item

changelog.d/3661.bugfix

@@ -1 +0,0 @@
-Ensure reaction emoji picker tabs look fine on small displays

changelog.d/3667.feature

@@ -1 +0,0 @@
-Better management of permission requests

changelog.d/491.bugfix

@@ -1 +0,0 @@
-Standardise spelling and casing of homeserver, identity server, and integration manager.

fastlane/metadata/android/en-US/changelogs/40101130.txt

@@ -0,0 +1,2 @@
+Main changes in this version: mainly stability and bugfixes update.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.13

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt

@@ -17,9 +17,11 @@
 package org.matrix.android.sdk.api
 
 import org.matrix.android.sdk.BuildConfig
+import timber.log.Timber
 
 /**
  * This class contains pattern to match the different Matrix ids
+ * Ref: https://matrix.org/docs/spec/appendices#identifier-grammar
  */
 object MatrixPatterns {
 
@@ -27,7 +29,7 @@ object MatrixPatterns {
     private const val DOMAIN_REGEX = ":[A-Z0-9.-]+(:[0-9]{2,5})?"
 
     // regex pattern to find matrix user ids in a string.
-    // See https://matrix.org/speculator/spec/HEAD/appendices.html#historical-user-ids
+    // See https://matrix.org/docs/spec/appendices#historical-user-ids
     private const val MATRIX_USER_IDENTIFIER_REGEX = "@[A-Z0-9\\x21-\\x39\\x3B-\\x7F]+$DOMAIN_REGEX"
     val PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER = MATRIX_USER_IDENTIFIER_REGEX.toRegex(RegexOption.IGNORE_CASE)
 
@@ -173,8 +175,9 @@ object MatrixPatterns {
      * - "@bob:domain.org:3455".getDomain() will return "domain.org:3455"
      */
     fun String.getDomain(): String {
-        if (BuildConfig.DEBUG) {
-            assert(isUserId(this))
+        if (BuildConfig.DEBUG && !isUserId(this)) {
+            // They are some invalid userId localpart in the wild, but the domain part should be there anyway
+            Timber.w("Not a valid user ID: $this")
         }
         return substringAfter(":")
     }