From e3ca89a81b8aa0c946dab7d77749c983e36442b2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 27 Nov 2020 13:43:58 +0100 Subject: [PATCH 1/4] Fix issue when there is no display name --- vector/src/main/res/layout/fragment_user_code_show.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml index deab9775d7..39537fe6a5 100644 --- a/vector/src/main/res/layout/fragment_user_code_show.xml +++ b/vector/src/main/res/layout/fragment_user_code_show.xml @@ -92,14 +92,14 @@ + android:minWidth="300dp" + android:paddingTop="40dp"> Date: Fri, 27 Nov 2020 13:59:23 +0100 Subject: [PATCH 2/4] Prepare version 1.0.11 --- CHANGES.md | 11 +++-------- .../metadata/android/en-US/changelogs/40100110.txt | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/40100110.txt diff --git a/CHANGES.md b/CHANGES.md index c3469f0661..b031e626eb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -Changes in Element 1.0.11 (2020-XX-XX) +Changes in Element 1.0.11 (2020-11-27) =================================================== Features ✨: @@ -30,14 +30,9 @@ Bugfix 🐛: - Update profile has no effect if user is in zero rooms - Fix issues with matrix.to deep linking (#2349) -Translations 🗣: - - - SDK API changes ⚠️: - - AccountService now exposes suspendable function instead of using MatrixCallback (#2354). Note: We will incrementally migrate all the SDK API in a near future. - -Build 🧱: - - + - AccountService now exposes suspendable function instead of using MatrixCallback (#2354). + Note: We will incrementally migrate all the SDK API in a near future (#2449) Test: - Add `allScreensTest` to cover all screens of the app diff --git a/fastlane/metadata/android/en-US/changelogs/40100110.txt b/fastlane/metadata/android/en-US/changelogs/40100110.txt new file mode 100644 index 0000000000..e587003352 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40100110.txt @@ -0,0 +1,2 @@ +This new version mainly contains user interface and user experience improvements. Now you can invite friends, and create DM very fast by scanning QR codes. +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.11 \ No newline at end of file From 163f4cfaf261efd8419418cdadacf81dba08ff75 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 27 Nov 2020 15:15:56 +0100 Subject: [PATCH 3/4] Ensure the Activity is destroyed, it seems that the intent flags are not enough now. --- vector/src/main/java/im/vector/app/features/MainActivity.kt | 6 ++++-- .../im/vector/app/features/home/HomeActivityViewModel.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 e553b5e0d3..f398a6ffa1 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -62,8 +62,8 @@ data class MainActivityArgs( ) : Parcelable /** - * This is the entry point of RiotX - * This Activity, when started with argument, is also doing some cleanup when user disconnects, + * This is the entry point of Element Android + * This Activity, when started with argument, is also doing some cleanup when user signs out, * clears cache, is logged out, or is soft logged out */ class MainActivity : VectorBaseActivity(), UnlockedActivity { @@ -78,6 +78,8 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity { intent.putExtra(EXTRA_ARGS, args) activity.startActivity(intent) + // Ensure the Activity is destroyed, it seems that the intent flags are not enough now. + activity.finish() } } diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index 6d0bb7395b..680ec17415 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt @@ -91,7 +91,7 @@ class HomeActivityViewModel @AssistedInject constructor( val isVerified = it.getOrNull()?.isTrusted() ?: false if (!isVerified && onceTrusted) { // cross signing keys have been reset - // Tigger a popup to re-verify + // Trigger a popup to re-verify // Note: user can be null in case of logout safeActiveSession.getUser(safeActiveSession.myUserId) ?.toMatrixItem() From 7b969ebd749a701c263a106926bd0a4512548c74 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 27 Nov 2020 16:00:30 +0100 Subject: [PATCH 4/4] Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all --- vector/src/main/java/im/vector/app/features/MainActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f398a6ffa1..8499b740f7 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -78,8 +78,8 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity { intent.putExtra(EXTRA_ARGS, args) activity.startActivity(intent) - // Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - activity.finish() + // Ensure all the Activities are destroyed, it seems that the intent flags are not enough now. + activity.finishAffinity() } }