From c21625079e57d824a30d097d5f7365639345a92a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Jul 2021 12:07:23 +0200 Subject: [PATCH 1/5] Improve the template --- .github/ISSUE_TEMPLATE/release.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index af6bbe2190..154e93286c 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.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 From 2f6d2cfe09ff28f2490b9b88cf7a44c4ab8a05c0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Jul 2021 13:31:09 +0200 Subject: [PATCH 2/5] Avoid crash in debug app --- .../main/java/org/matrix/android/sdk/api/MatrixPatterns.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt index 3af1a22779..e7274db901 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt +++ b/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 { @@ -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(":") } From 9f631768eb8b103481855bd26177db29cd7134c7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Jul 2021 13:34:51 +0200 Subject: [PATCH 3/5] Avoid crash in debug app --- .../src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt index e7274db901..9a5e40ffeb 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt @@ -29,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) From 1894ad21e1942e16cd68703f9570ee28bb068685 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Jul 2021 13:36:34 +0200 Subject: [PATCH 4/5] Changelog --- CHANGES.md | 24 ++++++++++++++++++++++++ changelog.d/2843.bugfix | 1 - changelog.d/3273.feature | 1 - changelog.d/3551.feature | 1 - changelog.d/3572.misc | 1 - changelog.d/3624.bugfix | 1 - changelog.d/3634.bugfix | 1 - changelog.d/3635.feature | 1 - changelog.d/3655.bugfix | 1 - changelog.d/3661.bugfix | 1 - changelog.d/3667.feature | 1 - changelog.d/491.bugfix | 1 - 12 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 changelog.d/2843.bugfix delete mode 100644 changelog.d/3273.feature delete mode 100644 changelog.d/3551.feature delete mode 100644 changelog.d/3572.misc delete mode 100644 changelog.d/3624.bugfix delete mode 100644 changelog.d/3634.bugfix delete mode 100644 changelog.d/3635.feature delete mode 100644 changelog.d/3655.bugfix delete mode 100644 changelog.d/3661.bugfix delete mode 100644 changelog.d/3667.feature delete mode 100644 changelog.d/491.bugfix diff --git a/CHANGES.md b/CHANGES.md index e9a990f1b2..79e1e07520 100644 --- a/CHANGES.md +++ b/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) ====================================== diff --git a/changelog.d/2843.bugfix b/changelog.d/2843.bugfix deleted file mode 100644 index 881d6d4f90..0000000000 --- a/changelog.d/2843.bugfix +++ /dev/null @@ -1 +0,0 @@ -Perform .well-known request first, even if the entered URL is a valid homeserver base url \ No newline at end of file diff --git a/changelog.d/3273.feature b/changelog.d/3273.feature deleted file mode 100644 index 0edc81796b..0000000000 --- a/changelog.d/3273.feature +++ /dev/null @@ -1 +0,0 @@ -Remove redundant mimetype (vector-im/element-web#2547) \ No newline at end of file diff --git a/changelog.d/3551.feature b/changelog.d/3551.feature deleted file mode 100644 index 5575c6fb53..0000000000 --- a/changelog.d/3551.feature +++ /dev/null @@ -1 +0,0 @@ -Room version capabilities and room upgrade support, better error feedback \ No newline at end of file diff --git a/changelog.d/3572.misc b/changelog.d/3572.misc deleted file mode 100644 index 384b8e69c7..0000000000 --- a/changelog.d/3572.misc +++ /dev/null @@ -1 +0,0 @@ -RawService.getWellknown() now takes a domain instead of a matrixId as parameter \ No newline at end of file diff --git a/changelog.d/3624.bugfix b/changelog.d/3624.bugfix deleted file mode 100644 index 31f0844d15..0000000000 --- a/changelog.d/3624.bugfix +++ /dev/null @@ -1 +0,0 @@ -Use different copy for self verification. diff --git a/changelog.d/3634.bugfix b/changelog.d/3634.bugfix deleted file mode 100644 index 0b1f007030..0000000000 --- a/changelog.d/3634.bugfix +++ /dev/null @@ -1 +0,0 @@ -Crash when opening room addresses screen with no internet connection \ No newline at end of file diff --git a/changelog.d/3635.feature b/changelog.d/3635.feature deleted file mode 100644 index 30d2cc64b4..0000000000 --- a/changelog.d/3635.feature +++ /dev/null @@ -1 +0,0 @@ -Add retry support in room addresses screen \ No newline at end of file diff --git a/changelog.d/3655.bugfix b/changelog.d/3655.bugfix deleted file mode 100644 index c7e805ab84..0000000000 --- a/changelog.d/3655.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix unread messages marker being hidden in collapsed membership item diff --git a/changelog.d/3661.bugfix b/changelog.d/3661.bugfix deleted file mode 100644 index 9ca6b7d188..0000000000 --- a/changelog.d/3661.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ensure reaction emoji picker tabs look fine on small displays diff --git a/changelog.d/3667.feature b/changelog.d/3667.feature deleted file mode 100644 index 439a890dd0..0000000000 --- a/changelog.d/3667.feature +++ /dev/null @@ -1 +0,0 @@ -Better management of permission requests \ No newline at end of file diff --git a/changelog.d/491.bugfix b/changelog.d/491.bugfix deleted file mode 100644 index d61cdf3856..0000000000 --- a/changelog.d/491.bugfix +++ /dev/null @@ -1 +0,0 @@ -Standardise spelling and casing of homeserver, identity server, and integration manager. From 60a9f6fcb8e5b81e38828a1ca544d530db2b3a8c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Jul 2021 13:38:08 +0200 Subject: [PATCH 5/5] Changelog - fastlane --- fastlane/metadata/android/en-US/changelogs/40101130.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40101130.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40101130.txt b/fastlane/metadata/android/en-US/changelogs/40101130.txt new file mode 100644 index 0000000000..9fc3f23b3e --- /dev/null +++ b/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 \ No newline at end of file