Merge branch 'release/tchap_v2.7.1'

tchapgouv · Feb 23, 2023 · 59235c0 · 59235c0
2 parents efda234 + c9a6fec
commit 59235c0
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 304 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,16 @@
+Changes in Tchap 2.7.1 (2023-02-23)
+===================================
+
+Bugfixes 🐛
+----------
+ - Prevent selecting multiple languages ([#853](https://github.com/tchapgouv/tchap-android-v2/issues/853))
+ - Crash on logout ([#857](https://github.com/tchapgouv/tchap-android-v2/issues/857))
+
+SDK API changes ⚠️
+------------------
+ - [Mainlining] Remove deprecated endpoint /_matrix/client/unstable/users/info ([#811](https://github.com/tchapgouv/tchap-android-v2/issues/811))
+
+
 Changes in Tchap 2.7.0 (2023-02-13)
 ===================================
 

diff --git a/...-android/src/main/java/fr/gouv/tchap/android/sdk/api/session/userinfo/UsersInfoService.kt b/...-android/src/main/java/fr/gouv/tchap/android/sdk/api/session/userinfo/UsersInfoService.kt
diff --git a/...dk-android/src/main/java/fr/gouv/tchap/android/sdk/api/session/userinfo/model/UserInfo.kt b/...dk-android/src/main/java/fr/gouv/tchap/android/sdk/api/session/userinfo/model/UserInfo.kt
diff --git a/...roid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoParams.kt b/...roid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoParams.kt
diff --git a/...roid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoResult.kt b/...roid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoResult.kt
diff --git a/...ndroid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoTask.kt b/...ndroid/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/GetUsersInfoTask.kt
diff --git a/...id/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/TchapUsersInfoModule.kt b/...id/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/TchapUsersInfoModule.kt
diff --git a/...d/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/TchapUsersInfoService.kt b/...d/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/TchapUsersInfoService.kt
diff --git a/...dk-android/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/UsersInfoAPI.kt b/...dk-android/src/main/java/fr/gouv/tchap/android/sdk/internal/session/users/UsersInfoAPI.kt
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
 import fr.gouv.tchap.android.sdk.api.auth.AccountValidityService
-import fr.gouv.tchap.android.sdk.api.session.userinfo.UsersInfoService
 import io.realm.RealmConfiguration
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
@@ -274,11 +273,6 @@ interface Session {
      */
     fun accountDataService(): SessionAccountDataService
 
-    /**
-     * Returns the users info service associated with the session.
-     */
-    fun usersInfoService(): UsersInfoService
-
     /**
      * Returns the account validity service associated with the session.
      */

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session
 import androidx.annotation.MainThread
 import dagger.Lazy
 import fr.gouv.tchap.android.sdk.api.auth.AccountValidityService
-import fr.gouv.tchap.android.sdk.api.session.userinfo.UsersInfoService
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.withContext
@@ -132,7 +131,6 @@ internal class DefaultSession @Inject constructor(
         private val presenceService: Lazy<PresenceService>,
         private val toDeviceService: Lazy<ToDeviceService>,
         private val eventStreamService: Lazy<EventStreamService>,
-        private val usersInfoService: Lazy<UsersInfoService>,
         private val accountValidityService: Lazy<AccountValidityService>,
         @UnauthenticatedWithCertificate
         private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
@@ -235,8 +233,6 @@ internal class DefaultSession @Inject constructor(
     override fun accountDataService(): SessionAccountDataService = accountDataService.get()
     override fun sharedSecretStorageService(): SharedSecretStorageService = sharedSecretStorageService.get()
 
-    override fun usersInfoService(): UsersInfoService = usersInfoService.get()
-
     override fun accountValidityService(): AccountValidityService = accountValidityService.get()
 
     override fun getOkHttpClient(): OkHttpClient {

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session
 import dagger.BindsInstance
 import dagger.Component
 import fr.gouv.tchap.android.sdk.internal.auth.TchapAccountValidityModule
-import fr.gouv.tchap.android.sdk.internal.session.users.TchapUsersInfoModule
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.securestorage.SecureStorageModule
@@ -70,7 +69,6 @@ import org.matrix.android.sdk.internal.util.system.SystemModule
 @Component(
         dependencies = [MatrixComponent::class],
         modules = [
-            TchapUsersInfoModule::class,
             TchapAccountValidityModule::class,
             SessionModule::class,
             RoomModule::class,

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.7.0"
+    version = "2.7.1"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 7
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 0
+ext.versionPatch = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -158,6 +158,9 @@ android {
 //            abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
 //        }
 
+        // Tchap: Use only en and fr
+        resConfigs "en", "fr"
+
         // Ref: https://developer.android.com/studio/build/configure-apk-splits.html
         splits {
             // Configures multiple APKs based on ABI.

diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -46,6 +46,8 @@ class DebugVectorFeatures(
 
     override fun tchapIsKeyBackupEnabled() = read(DebugFeatureKeys.tchapIsKeyBackupEnabled) ?: vectorFeatures.tchapIsKeyBackupEnabled()
 
+    override fun tchapIsThreadEnabled() = vectorFeatures.tchapIsThreadEnabled()
+
     override fun onboardingVariant(): OnboardingVariant {
         return readPreferences().getEnum<OnboardingVariant>() ?: vectorFeatures.onboardingVariant()
     }

diff --git a/vector-config/src/btchap/res/values/config-features.xml b/vector-config/src/btchap/res/values/config-features.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
+    <bool name="tchap_is_thread_enabled">false</bool>
 </resources>
diff --git a/vector-config/src/devTchap/res/values/config-features.xml b/vector-config/src/devTchap/res/values/config-features.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
+    <bool name="tchap_is_thread_enabled">false</bool>
 </resources>