Merge branch 'release/1.0.11' into develop

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.
+ - AccountService now exposes suspendable function instead of using MatrixCallback (#2354).
-
+   Note: We will incrementally migrate all the SDK API in a near future (#2449)
-Build 🧱:
- -
 
 Test:
  - Add `allScreensTest` to cover all screens of the app

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

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 is the entry point of Element Android
- * This Activity, when started with argument, is also doing some cleanup when user disconnects,
+ * 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 all the Activities are destroyed, it seems that the intent flags are not enough now.
+            activity.finishAffinity()
         }
     }
 

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()

vector/src/main/res/layout/fragment_user_code_show.xml

@@ -92,14 +92,14 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minWidth="300dp">
+                android:minWidth="300dp"
+                android:paddingTop="40dp">
 
                 <TextView
                     android:id="@+id/showUserCodeCardNameText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="40dp"
                     android:layout_marginEnd="16dp"
                     android:maxLines="1"
                     android:singleLine="true"