From d8f2deb5d9aa1e35b43a8388468cd21d25cef40b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 17:18:13 +0200
Subject: [PATCH 1/7] Update build tools from 4.0.1 to 4.1.0

---
 CHANGES.md   | 2 +-
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 732a70222c..8c145ec946 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,7 +40,7 @@ Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
- - Upgrade build tools from `3.5.3` to `4.0.1`
+ - Upgrade build tools from `3.5.3` to `4.0.1`, then to `4.1.0`
  - Upgrade com.google.gms:google-services from `4.3.2` to `4.3.4`
  - Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy to `4.1.0`
 
diff --git a/build.gradle b/build.gradle
index e68d545c91..05dcaa43ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'

From 17d1a4b6fb90a8d5cdc01ed776bb403f956c29d9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 13 Oct 2020 22:15:23 +0200
Subject: [PATCH 2/7] revert change from AS

---
 .idea/codeStyles/Project.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b3719669fd..89a7c466fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,7 +4,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />

From 79d7032e3a16333f081ffc2516a9dcd2ba14f387 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 22:34:08 +0200
Subject: [PATCH 3/7] Don't set presence when handling a push notification or
 polling (#2156)

---
 CHANGES.md                                    |  1 +
 .../sdk/internal/session/sync/SyncPresence.kt | 31 +++++++++++++++++++
 .../sdk/internal/session/sync/SyncTask.kt     |  8 +++--
 .../internal/session/sync/job/SyncService.kt  |  3 +-
 .../internal/session/sync/job/SyncThread.kt   |  3 +-
 .../internal/session/sync/job/SyncWorker.kt   |  3 +-
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt

diff --git a/CHANGES.md b/CHANGES.md
index 8c145ec946..dbb0bf51ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Bugfix 🐛:
  - Simplifies draft management and should fix bunch of draft issues (#952, #683)
  - 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)
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
new file mode 100644
index 0000000000..18e17c7d13
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+/**
+ * For `set_presence` parameter in the /sync request
+ *
+ * Controls whether the client is automatically marked as online by polling this API. If this parameter
+ * is omitted then the client is automatically marked as online when it uses this API. Otherwise if the
+ * parameter is set to "offline" then the client is not marked as being online when it uses this API.
+ * When set to "unavailable", the client is marked as being idle. One of: ["offline", "online", "unavailable"]
+ */
+enum class SyncPresence(val value: String) {
+    Offline("offline"),
+    Online("online"),
+    Unavailable("unavailable")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 9393d4703f..303bb45419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.R
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -25,13 +26,15 @@ import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilit
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
-import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
 
 internal interface SyncTask : Task<SyncTask.Params, Unit> {
 
-    data class Params(var timeout: Long = 6_000L)
+    data class Params(
+            val timeout: Long,
+            val presence: SyncPresence?
+    )
 }
 
 internal class DefaultSyncTask @Inject constructor(
@@ -63,6 +66,7 @@ internal class DefaultSyncTask @Inject constructor(
         }
         requestParams["timeout"] = timeout.toString()
         requestParams["filter"] = filterRepository.getFilter()
+        params.presence?.let { requestParams["set_presence"] = it.value }
 
         val isInitialSync = token == null
         if (isInitialSync) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index ccd7f770fb..6d100a71f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.failure.isTokenError
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
@@ -147,7 +148,7 @@ abstract class SyncService : Service() {
 
     private suspend fun doSync() {
         Timber.v("## Sync: Execute sync request with timeout $syncTimeoutSeconds seconds")
-        val params = SyncTask.Params(syncTimeoutSeconds * 1000L)
+        val params = SyncTask.Params(syncTimeoutSeconds * 1000L, SyncPresence.Offline)
         try {
             // never do that in foreground, let the syncThread work
             syncTask.execute(params)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 4aaca991dd..cfd7865269 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.session.call.MxCall
 import org.matrix.android.sdk.internal.session.call.ActiveCallHandler
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import timber.log.Timber
 import java.net.SocketTimeoutException
 import java.util.Timer
@@ -161,7 +162,7 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
                 // No timeout after a pause
                 val timeout = state.let { if (it is SyncState.Running && it.afterPause) 0 else DEFAULT_LONG_POOL_TIMEOUT }
                 Timber.v("Execute sync request with timeout $timeout")
-                val params = SyncTask.Params(timeout)
+                val params = SyncTask.Params(timeout, SyncPresence.Online)
                 val sync = syncScope.launch {
                     doSync(params)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index 17baa91cec..211b643516 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.failure.isTokenError
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
@@ -94,7 +95,7 @@ internal class SyncWorker(context: Context,
     }
 
     private suspend fun doSync(timeout: Long) {
-        val taskParams = SyncTask.Params(timeout * 1000)
+        val taskParams = SyncTask.Params(timeout * 1000, SyncPresence.Offline)
         syncTask.execute(taskParams)
     }
 

From 7f5c7c3beded6d6c9db2c5d175ad834c822d3a2e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 23:05:33 +0200
Subject: [PATCH 4/7] Trick to fix a change due to upgrade to build-tools 4.1.0
 (?)

---
 matrix-sdk-android/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 0bf4819d25..e4a8b8884a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -35,6 +35,10 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
+        // Seems that the build tools 4.1.0 does not generate BuildConfig.VERSION_NAME anymore.
+        // Add it manually here. We may remove this trick in the future
+        buildConfigField "String", "VERSION_NAME", "\"0.0.1\""
+
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision_unix_date", "\"${gitRevisionUnixDate()}\""

From 2b026b6bc618d45cd1052dd9d4cd0eb7dbaf6697 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 23:15:06 +0200
Subject: [PATCH 5/7] Fix vector tint compilation error. Tint at runtime. Also
 remove unused icon.

---
 .../settings/VectorSettingsRootFragment.kt         |  6 +-----
 .../res/drawable/ic_settings_root_advanced.xml     |  2 +-
 .../main/res/drawable/ic_settings_root_call.xml    |  4 ++--
 .../main/res/drawable/ic_settings_root_flair.xml   |  2 +-
 .../main/res/drawable/ic_settings_root_general.xml |  2 +-
 .../res/drawable/ic_settings_root_help_about.xml   |  2 +-
 .../drawable/ic_settings_root_ignored_users.xml    |  2 +-
 .../main/res/drawable/ic_settings_root_labs.xml    |  4 ++--
 .../main/res/drawable/ic_settings_root_legacy.xml  | 14 --------------
 .../res/drawable/ic_settings_root_notification.xml |  2 +-
 .../res/drawable/ic_settings_root_preferences.xml  |  2 +-
 .../drawable/ic_settings_root_security_privacy.xml |  2 +-
 12 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/ic_settings_root_legacy.xml

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index 3f3811ce76..79eb0216ee 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.settings
 
-import android.os.Build
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
 import javax.inject.Inject
@@ -27,10 +26,7 @@ class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragm
     override val preferenceXmlRes = R.xml.vector_settings_root
 
     override fun bindPref() {
-        // Tint icon on API < 24
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            tintIcons()
-        }
+        tintIcons()
     }
 
     private fun tintIcons() {
diff --git a/vector/src/main/res/drawable/ic_settings_root_advanced.xml b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
index fbcd165cda..ff229af4d6 100644
--- a/vector/src/main/res/drawable/ic_settings_root_advanced.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?riotx_header_panel_text_secondary" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
+    <path android:fillColor="@color/riotx_header_panel_text_secondary_light" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_call.xml b/vector/src/main/res/drawable/ic_settings_root_call.xml
index 0742e16e0d..7dad271556 100644
--- a/vector/src/main/res/drawable/ic_settings_root_call.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_call.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="25">
   <path
       android:pathData="M0.5,8C0.5,6.3432 1.8432,5 3.5,5H14.5C16.1569,5 17.5,6.3432 17.5,8V17C17.5,18.6569 16.1569,20 14.5,20H3.5C1.8432,20 0.5,18.6569 0.5,17V8Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
   <path
       android:pathData="M19.4229,9.4388L23.5259,6.8221C23.9142,6.5744 24.4229,6.8533 24.4229,7.3139V17.545C24.4229,18.0326 23.8601,18.305 23.4777,18.0025L19.4229,14.7959V9.4388Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
index 36b282455b..6ca6fceaf9 100644
--- a/vector/src/main/res/drawable/ic_settings_root_flair.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_flair.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="25">
   <path
       android:pathData="M12.4893,23C13.1012,23 13.6058,22.5491 13.6917,21.9156C14.6258,15.3344 15.5169,14.4325 21.8727,13.7132C22.5169,13.638 23,13.112 23,12.5C23,11.8773 22.5276,11.3727 21.8834,11.2868C15.5598,10.4601 14.7439,9.6549 13.6917,3.0736C13.5844,2.4402 13.1012,2 12.4893,2C11.888,2 11.3834,2.4402 11.2868,3.0844C10.3635,9.6656 9.4724,10.5675 3.1166,11.2868C2.4724,11.362 2,11.8773 2,12.5C2,13.112 2.4617,13.6273 3.1166,13.7132C9.4402,14.5936 10.2239,15.3451 11.2868,21.9264C11.4049,22.5598 11.8988,23 12.4893,23Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_general.xml b/vector/src/main/res/drawable/ic_settings_root_general.xml
index a07bf7a164..ca16d3c982 100644
--- a/vector/src/main/res/drawable/ic_settings_root_general.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_general.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M20.5988,9.5162C20.8188,10.0938 21.3825,10.4788 22.0013,10.4788C22.8263,10.4788 23.5,11.1525 23.5,11.9775V13.0225C23.5,13.8475 22.8263,14.5213 22.0013,14.5213C21.3825,14.5213 20.8188,14.9062 20.5988,15.4838C20.5806,15.5292 20.5624,15.5753 20.5441,15.6218C20.4792,15.7863 20.4125,15.9555 20.3375,16.1163C20.0763,16.68 20.2,17.34 20.64,17.78C21.2313,18.3575 21.2313,19.3062 20.64,19.8975L19.8975,20.64C19.32,21.2313 18.3713,21.2313 17.78,20.64C17.3538,20.2 16.68,20.0763 16.1163,20.3375C15.91,20.4338 15.7037,20.5163 15.4838,20.5988C14.9062,20.8188 14.5213,21.3825 14.5213,22.0013C14.5213,22.8263 13.8475,23.5 13.0225,23.5H11.9775C11.1525,23.5 10.4788,22.8263 10.4788,22.0013C10.4788,21.3825 10.0938,20.8188 9.5162,20.5988C9.4708,20.5806 9.4247,20.5624 9.3781,20.544C9.2137,20.4792 9.0445,20.4125 8.8837,20.3375C8.32,20.0763 7.66,20.2 7.22,20.64C6.6425,21.2313 5.6937,21.2313 5.1025,20.64L4.36,19.8975C3.7687,19.32 3.7687,18.3713 4.36,17.78C4.8,17.3538 4.9237,16.68 4.6625,16.1163C4.5662,15.91 4.4837,15.7037 4.4012,15.4838C4.1813,14.9062 3.6175,14.5213 2.9987,14.5213C2.1737,14.5213 1.5,13.8475 1.5,13.0225V11.9775C1.5,11.1525 2.1737,10.4788 2.9987,10.4788C3.6175,10.4788 4.1813,10.0938 4.4012,9.5162C4.4446,9.3774 4.499,9.2441 4.5539,9.1093C4.586,9.0305 4.6183,8.9512 4.6487,8.87C4.91,8.3062 4.7863,7.6462 4.3463,7.2063C3.755,6.6287 3.755,5.68 4.3463,5.0887L5.1025,4.36C5.68,3.7687 6.6287,3.7687 7.22,4.36C7.6462,4.8 8.32,4.9237 8.8837,4.6625C9.09,4.5662 9.2963,4.47 9.5162,4.4012C10.0938,4.1813 10.4788,3.6175 10.4788,2.9987C10.4788,2.1737 11.1525,1.5 11.9775,1.5H13.0225C13.8475,1.5 14.5213,2.1737 14.5213,2.9987C14.5213,3.6312 14.9062,4.1813 15.4838,4.4012C15.5292,4.4194 15.5753,4.4376 15.6218,4.4559C15.7863,4.5208 15.9555,4.5875 16.1163,4.6625C16.68,4.9237 17.34,4.8 17.78,4.36C18.3575,3.7687 19.3062,3.7687 19.8975,4.36L20.64,5.1025C21.2313,5.68 21.2313,6.6287 20.64,7.22C20.2,7.6462 20.0763,8.32 20.3375,8.8837C20.4338,9.09 20.5163,9.2963 20.5988,9.5162ZM12.5,18C9.4613,18 7,15.5387 7,12.5C7,9.4613 9.4613,7 12.5,7C15.5387,7 18,9.4613 18,12.5C18,15.5387 15.5387,18 12.5,18Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_help_about.xml b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
index 0c79955cba..2905df331f 100644
--- a/vector/src/main/res/drawable/ic_settings_root_help_about.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M12.5,22.5C18.0228,22.5 22.5,18.0228 22.5,12.5C22.5,6.9771 18.0228,2.5 12.5,2.5C6.9771,2.5 2.5,6.9771 2.5,12.5C2.5,18.0228 6.9771,22.5 12.5,22.5ZM12.5002,18.6458C13.1905,18.6458 13.7502,18.0862 13.7502,17.3958C13.7502,16.7055 13.1905,16.1458 12.5002,16.1458C11.8098,16.1458 11.2502,16.7055 11.2502,17.3958C11.2502,18.0862 11.8098,18.6458 12.5002,18.6458ZM10.7636,10.6163C10.7636,9.6542 11.5442,8.8802 12.4997,8.8802C13.4524,8.8802 14.2358,9.6636 14.2358,10.6163C14.2358,11.0576 14.0471,11.215 13.3036,11.7287C12.9741,11.9563 12.5223,12.2725 12.1705,12.7362C11.7939,13.2327 11.5622,13.8517 11.5622,14.6389H13.4372C13.4372,14.2533 13.5396,14.0339 13.6643,13.8695C13.8138,13.6724 14.0304,13.5055 14.3694,13.2713C14.405,13.2467 14.4426,13.2212 14.4818,13.1945C15.0963,12.7765 16.1108,12.0865 16.1108,10.6163C16.1108,8.6281 14.4879,7.0052 12.4997,7.0052C10.5142,7.0052 8.8885,8.6132 8.8885,10.6163H10.7636Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
index cf039d55dc..468d88879a 100644
--- a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M22.5,12.5C22.5,18.0228 18.0228,22.5 12.5,22.5C6.9771,22.5 2.5,18.0228 2.5,12.5C2.5,6.9771 6.9771,2.5 12.5,2.5C18.0228,2.5 22.5,6.9771 22.5,12.5ZM7,11.25C6.7239,11.25 6.5,11.4739 6.5,11.75V13.25C6.5,13.5261 6.7239,13.75 7,13.75H18C18.2761,13.75 18.5,13.5261 18.5,13.25V11.75C18.5,11.4739 18.2761,11.25 18,11.25H7Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_labs.xml b/vector/src/main/res/drawable/ic_settings_root_labs.xml
index 5416ad7089..0e137ecce7 100644
--- a/vector/src/main/res/drawable/ic_settings_root_labs.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_labs.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="25">
   <path
       android:pathData="M5.25,22.5C4.5596,22.5 4,21.9404 4,21.25V12.8687C4,12.6622 4.275,12.5 4.625,12.5H5.875C6.225,12.5 6.5,12.6622 6.5,12.8687V21.25C6.5,21.9404 5.9404,22.5 5.25,22.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
   <path
       android:pathData="M7.3481,2.5C4.8899,2.5 4.0004,4.1544 4.0004,5.1811V15.9785H5.8277C9.6771,14.2291 13.4294,17.5377 17.3919,17.4997C21.3545,17.4616 21.5,15.3319 21.5,14.267V5.7136C21.5,2.2337 19.0904,5.5804 14.9982,4.2304C11.4458,3.0584 10.8053,2.5 7.3481,2.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_legacy.xml b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
deleted file mode 100644
index c56a7d31f8..0000000000
--- a/vector/src/main/res/drawable/ic_settings_root_legacy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="20dp"
-    android:viewportWidth="24"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M21,6v13H3V6M1,1h22v5H1zM10,10h4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_notification.xml b/vector/src/main/res/drawable/ic_settings_root_notification.xml
index bf3786aeab..ced6133844 100644
--- a/vector/src/main/res/drawable/ic_settings_root_notification.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_notification.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M13.4923,3.0211C13.4974,2.9731 13.5,2.9243 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,2.9243 10.7526,2.9731 10.7577,3.0211C7.7183,3.6742 5.25,6.4401 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H20.5263C21.3513,19.3613 21.75,18.9213 21.75,18.3025C21.75,17.7525 21.0625,17.2988 20.4988,16.9688C19.6738,16.4875 19,15.6763 19,14.425V9.75C19,6.4401 16.5317,3.6742 13.4923,3.0211ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_preferences.xml b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
index 1aa5e338f0..8549924314 100644
--- a/vector/src/main/res/drawable/ic_settings_root_preferences.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M8.5,4.5C4.0817,4.5 0.5,8.0817 0.5,12.5C0.5,16.9183 4.0817,20.5 8.5,20.5H16.5C20.9183,20.5 24.5,16.9183 24.5,12.5C24.5,8.0817 20.9183,4.5 16.5,4.5H8.5ZM13.5,12.5C13.5,15.2614 11.2614,17.5 8.5,17.5C5.7386,17.5 3.5,15.2614 3.5,12.5C3.5,9.7386 5.7386,7.5 8.5,7.5C11.2614,7.5 13.5,9.7386 13.5,12.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
index 194eec1be3..1da0f2e288 100644
--- a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M11.8333,2.5C8.8878,2.5 6.5,4.8878 6.5,7.8333V10.5C5.3954,10.5 4.5,11.3954 4.5,12.5V20.5C4.5,21.6046 5.3954,22.5 6.5,22.5H18.5C19.6046,22.5 20.5,21.6046 20.5,20.5V12.5C20.5,11.3954 19.6046,10.5 18.5,10.5V7.8333C18.5,4.8878 16.1122,2.5 13.1667,2.5H11.8333ZM15.8333,10.5V7.8333C15.8333,6.3606 14.6394,5.1667 13.1667,5.1667H11.8333C10.3606,5.1667 9.1667,6.3606 9.1667,7.8333V10.5H15.8333Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>

From ea576972150e50a58fe3fb64da3f14f04fcf48bb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 14 Oct 2020 11:20:01 +0200
Subject: [PATCH 6/7] Fix warning with enum

---
 tools/check/forbidden_strings_in_code.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 9c00dca278..6e879df7ab 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -163,8 +163,8 @@ Formatter\.formatShortFileSize===1
 # DISABLED
 # android\.text\.TextUtils
 
-### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===81
+### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
+enum class===82
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 95df786227508ef1f541b8b4525f9ad5177c78a3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Oct 2020 12:21:27 +0200
Subject: [PATCH 7/7] Add a click action at the top of the drawer to open the
 general settings

---
 .../java/im/vector/app/features/home/HomeDrawerFragment.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index b8eb054076..12689cd983 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -25,6 +25,7 @@ import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.grouplist.GroupListFragment
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.workers.signout.SignOutUiWorker
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import org.matrix.android.sdk.api.session.Session
@@ -57,6 +58,11 @@ class HomeDrawerFragment @Inject constructor(
                 homeDrawerUserIdView.text = user.userId
             }
         }
+        // Profile
+        homeDrawerHeader.debouncedClicks {
+            sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
+            navigator.openSettings(requireActivity(), directAccess = VectorSettingsActivity.EXTRA_DIRECT_ACCESS_GENERAL)
+        }
         // Settings
         homeDrawerHeaderSettingsView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)