From f68eb449bda60ec48b01280858998197af3830b8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 15 Oct 2020 15:27:32 +0200 Subject: [PATCH 1/4] Be robust against `StrandHogg` task injection --- CHANGES.md | 1 + vector/src/main/AndroidManifest.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index d9ab78db82..320df0b6e7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -31,6 +31,7 @@ Bugfix 🐛: - Very long topic cannot be fully visible (#1957) - Properly detect cross signing keys reset - Don't set presence when handling a push notification or polling (#2156) + - Be robust against `StrandHogg` task injection Translations 🗣: - Move store data to `/fastlane/metadata/android` (#812) diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index bfd09a65dc..643d5599de 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -63,6 +63,8 @@ From 95142274fad45a4fef19a33f79e6da51c0d9ecba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 15 Oct 2020 14:23:45 +0200 Subject: [PATCH 2/4] Clear alerts if user sign out --- CHANGES.md | 1 + .../java/im/vector/app/features/MainActivity.kt | 5 +++++ .../app/features/popup/PopupAlertManager.kt | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 320df0b6e7..8f3dfd8489 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,7 @@ Bugfix 🐛: - Properly detect cross signing keys reset - Don't set presence when handling a push notification or polling (#2156) - Be robust against `StrandHogg` task injection + - Clear alerts if user sign out Translations 🗣: - Move store data to `/fastlane/metadata/android` (#812) diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index 7977d969e8..b5552e4d62 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -36,6 +36,7 @@ import im.vector.app.features.notifications.NotificationDrawerManager import im.vector.app.features.pin.PinCodeStore import im.vector.app.features.pin.PinLocker import im.vector.app.features.pin.UnlockedActivity +import im.vector.app.features.popup.PopupAlertManager import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.signout.hard.SignedOutActivity import im.vector.app.features.signout.soft.SoftLogoutActivity @@ -89,6 +90,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity { @Inject lateinit var shortcutsHandler: ShortcutsHandler @Inject lateinit var pinCodeStore: PinCodeStore @Inject lateinit var pinLocker: PinLocker + @Inject lateinit var popupAlertManager: PopupAlertManager override fun injectWith(injector: ScreenComponent) { injector.inject(this) @@ -115,6 +117,9 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity { // Also clear the dynamic shortcuts shortcutsHandler.clearShortcuts() + + // Also clear the alerts + popupAlertManager.cancelAll() } private fun parseArgs(): MainActivityArgs { diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index 59386ffff0..665eb93428 100644 --- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt @@ -78,6 +78,21 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy Date: Thu, 15 Oct 2020 15:46:18 +0200 Subject: [PATCH 3/4] Enable file system watch to reduce compilation time --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index 99fd9d64fd..b3f11e08a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,8 @@ org.gradle.jvmargs=-Xmx2048m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +# Enable file system watch (https://docs.gradle.org/6.7/release-notes.html) +org.gradle.vfs.watch=true vector.debugPrivateData=false vector.httpLogLevel=NONE From 9c451ffdd11cb7b8019b228a969f16301dbca5a4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 15 Oct 2020 15:49:22 +0200 Subject: [PATCH 4/4] Weblate is now hosted at https://translate.element.io --- CHANGES.md | 3 ++- CONTRIBUTING.md | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8f3dfd8489..cb31d2f40e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,6 +36,7 @@ Bugfix 🐛: Translations 🗣: - Move store data to `/fastlane/metadata/android` (#812) + - Weblate is now hosted at https://translate.element.io SDK API changes ⚠️: - Search messages in a room by using Session.searchService() or Room.search() @@ -137,7 +138,7 @@ Bugfix 🐛: - Replies to poll appears in timeline as unsupported events during sending (#1004) Translations 🗣: - - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.riot.im/projects/matrix-doc/) (#1909) + - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.element.io/projects/matrix-doc/) (#1909) - New translation to kabyle Build 🧱: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f10c87cdbe..3464fd9e76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ For now, the Matrix SDK and the Element application are in the same project. So ## I want to help translating Element If you want to fix an issue with an English string, please submit a PR. -If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/element-android/). +If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.element.io/projects/element-android/). ## I want to submit a PR to fix an issue diff --git a/README.md b/README.md index 64c6c9d04d..e89fb15010 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) -[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget) +[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget) [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org) [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)