diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index 11a015c9a7..6c29bbfdf3 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,11 @@ +Changes in Tchap 2.11.6 (2024-05-30) +==================================== + +Other changes +------------- + - Changement du texte d'alerte affiché lors de la première utilisation du partage de position en temps réel. ([#1057](https://github.com/tchapgouv/tchap-android/issues/1057)) + + Changes in Tchap 2.11.5 (2024-05-23) ==================================== diff --git a/coverage.gradle b/coverage.gradle index 97b954bd6f..923932ce77 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -81,7 +81,7 @@ task generateCoverageReport(type: JacocoReport) { task unitTestsWithCoverage(type: GradleBuild) { // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage startParameter.projectProperties.coverage = "false" - // Tchap: Specify variant for every module + // TCHAP Specify variant for every module tasks = [/*':matrix-sdk-android:testDebugUnitTest',*/ ':vector:testGplayBtchapWithdmvoipWithoutpinningDebugUnitTest', ':vector-app:testGplayBtchapWithdmvoipWithoutpinningDebugUnitTest', ':vector-config:testBtchapWithdmvoipDebugUnitTest'] } diff --git a/library/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle index c089ccfc8e..dafac2fdac 100644 --- a/library/attachment-viewer/build.gradle +++ b/library/attachment-viewer/build.gradle @@ -34,7 +34,7 @@ android { } } - // Tchap: Add tchap flavors + // TCHAP Add tchap flavors // The 'target' dimension permits to specify which platform are used flavorDimensions = ["target"] diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt index 7ca9a2550f..d4582cf7b1 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt @@ -31,7 +31,7 @@ class AudioPicker : Picker() { * Returns selected audio files or empty list if user did not select any files. */ override fun getSelectedFiles(context: Context, data: Intent?): List { - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. return getSelectedUriList(context, data).mapNotNull { selectedUri -> selectedUri.toMultiPickerAudioType(context) } diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt index 021260fd00..1dc4a94ee6 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt @@ -41,7 +41,7 @@ class FilePicker : Picker() { * Returns selected files or empty list if user did not select any files. */ override fun getSelectedFiles(context: Context, data: Intent?): List { - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. return getSelectedUriList(context, data).mapNotNull { selectedUri -> val type = context.contentResolver.getType(selectedUri) diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt index 87b03a0fb8..3666e93ffd 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt @@ -31,7 +31,7 @@ class ImagePicker : Picker() { * Returns selected image files or empty list if user did not select any files. */ override fun getSelectedFiles(context: Context, data: Intent?): List { - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. return getSelectedUriList(context, data).mapNotNull { selectedUri -> selectedUri.toMultiPickerImageType(context) } diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt index b76ce3bc53..ebb95ff591 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt @@ -33,7 +33,7 @@ class MediaPicker : Picker() { * Returns selected image/video files or empty list if user did not select any files. */ override fun getSelectedFiles(context: Context, data: Intent?): List { - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. return getSelectedUriList(context, data).mapNotNull { selectedUri -> val mimeType = context.contentResolver.getType(selectedUri) diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt index d03cbd7fe1..1ee01c66ea 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt @@ -59,7 +59,7 @@ abstract class Picker { uriList.forEach { for (resolveInfo in resInfoList) { val packageName: String = resolveInfo.activityInfo.packageName - // Tchap: Replace implicit intent by an explicit to fix crash on some devices like Xiaomi. + // TCHAP Replace implicit intent by an explicit to fix crash on some devices like Xiaomi. try { context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) } catch (e: Exception) { @@ -113,7 +113,7 @@ abstract class Picker { } } } - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. val packageName = context.applicationContext.packageName return selectedUriList.onEach { context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) } } diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt index 37d287ed3c..1c7c226d3f 100644 --- a/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt +++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt @@ -31,7 +31,7 @@ class VideoPicker : Picker() { * Returns selected video files or empty list if user did not select any files. */ override fun getSelectedFiles(context: Context, data: Intent?): List { - // Tchap: Grant permission to access the selected file. + // TCHAP Grant permission to access the selected file. return getSelectedUriList(context, data).mapNotNull { selectedUri -> selectedUri.toMultiPickerVideoType(context) } diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml index d7af47ac36..340611eda6 100644 --- a/library/ui-strings/src/main/res/values-fr/strings.xml +++ b/library/ui-strings/src/main/res/values-fr/strings.xml @@ -2492,7 +2492,7 @@ min h Activer le partage de localisation - Attention : c\'est une fonctionnalité expérimentale qui utilise une implémentation temporaire. Cela implique que vous ne pourrez pas supprimer votre historique de positions, et les utilisateurs avancés pourront voir votre historique de positions même après avoir arrêter le partage de votre position en continu dans ce salon. + Attention : l’historique des positions partagées sera accessible aux autres membres du salon même après avoir arrêté le partage. Partage de position en continu Passerelle actuelle : %s Passerelle diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle index 099954a5dc..01515c679d 100644 --- a/library/ui-styles/build.gradle +++ b/library/ui-styles/build.gradle @@ -39,7 +39,7 @@ android { } } - // Tchap: Add tchap flavors + // TCHAP Add tchap flavors // The 'target' dimension permits to specify which platform are used flavorDimensions = ["target"] diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index d9d42fb152..86a2e7c7ce 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -172,7 +172,7 @@ dependencies { // - https://github.com/square/okhttp/issues/3278 // - https://github.com/square/okhttp/issues/4455 // - https://github.com/square/okhttp/issues/3146 - // Tchap: Use api instead of implementation to share these dependencies with the other modules + // TCHAP Use api instead of implementation to share these dependencies with the other modules api(platform("com.squareup.okhttp3:okhttp-bom:4.10.0")) api 'com.squareup.okhttp3:okhttp' api 'com.squareup.okhttp3:logging-interceptor' diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt index 6bb500ae77..3ce5e2c976 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt @@ -134,7 +134,7 @@ class CommonTestHelper internal constructor(context: Context, val cryptoConfig: applicationFlavor = "TestFlavor", roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider(), syncConfig = SyncConfig(longPollTimeout = 5_000L), - // Tchap: Do not limit here key requests to my devices to unblock crypto tests + // TCHAP Do not limit here key requests to my devices to unblock crypto tests cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false), ) ) diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt index e5ff7a73eb..2b25fbb61f 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt @@ -55,7 +55,7 @@ class RealmSessionStoreMigration43Test { realm?.close() } - // Tchap: Use custom realm database + // TCHAP Use custom realm database @Test fun migrationShouldBeNeeed() { val realmName = "tchap_session_41.realm" @@ -76,7 +76,7 @@ class RealmSessionStoreMigration43Test { } } - // Tchap: Use custom realm database + // TCHAP Use custom realm database // Database key for alias `session_db_feb3823dd11e8b4b0b19d5d1d9e3b864`: 2948ff8106ad80ca8aeba7ef59775075258d8805f9f6eb306add6c3097154bf5c99bbc965931a29e4512f0b3981d3a562c4c86b860846bac2312e1ab61026762 // $167541532417nKwjC:agent2.tchap.incubateur.net // $167541543920SxkBP:agent2.tchap.incubateur.net diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt index c916ffc303..6cb1f19ad9 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/SessionSanityMigrationTest.kt @@ -46,7 +46,7 @@ class SessionSanityMigrationTest { realm?.close() } - // Tchap: use custom realm database + // TCHAP use custom realm database @Test fun sessionDatabaseShouldMigrateGracefully() { val realmName = "tchap_session_41.realm" diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt index a81faf11fd..8df261834f 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt @@ -148,7 +148,7 @@ class TimelineForwardPaginationTest : InstrumentedTest { snapshot.groupingBy { it -> it.root.type }.eachCountTo(snapshotTypes) // Some state events on room creation assertEquals("m.room.name", 1, snapshotTypes.remove("m.room.name")) - // Tchap: guest_access don't used (TimelineDisplayableEvents.kt) + // TCHAP guest_access don't used (TimelineDisplayableEvents.kt) // assertEquals("m.room.guest_access", 1, snapshotTypes.remove("m.room.guest_access")) assertEquals("m.room.history_visibility", 1, snapshotTypes.remove("m.room.history_visibility")) assertEquals("m.room.join_rules", 1, snapshotTypes.remove("m.room.join_rules")) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt index 9e2867fe6b..6bfabc2b2b 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt @@ -118,7 +118,7 @@ internal class DefaultRegistrationWizard( private suspend fun sendThreePid(threePid: RegisterThreePid): RegistrationResult { val safeSession = pendingSessionData.currentSession ?: throw IllegalStateException("developer error, call createAccount() method first") - // Tchap: add a specific nextLink requires by Tchap registration process. + // TCHAP add a specific nextLink requires by Tchap registration process. val hsUri = pendingSessionData.homeServerConnectionConfig.homeServerUri val isUri = pendingSessionData.homeServerConnectionConfig.identityServerUri val nextLink = "$hsUri#/register?client_secret=${pendingSessionData.clientSecret}" + 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 index a9ac9dcbde..1597fade89 100644 --- 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 @@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session import dagger.BindsInstance import dagger.Component -import fr.gouv.tchap.android.sdk.internal.auth.TchapAccountValidityModule // Tchap: forgotten module in Element. Made Variant with RustCrypto to fail. +import fr.gouv.tchap.android.sdk.internal.auth.TchapAccountValidityModule // TCHAP forgotten module in Element. Made Variant with RustCrypto to fail. 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 +70,7 @@ import org.matrix.android.sdk.internal.util.system.SystemModule @Component( dependencies = [MatrixComponent::class], modules = [ - TchapAccountValidityModule::class, // Tchap: forgotten module in Element. Made Variant with RustCrypto to fail. + TchapAccountValidityModule::class, // TCHAP forgotten module in Element. Made Variant with RustCrypto to fail. SessionModule::class, RoomModule::class, SyncModule::class, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt index 2f816e15e1..6e87732140 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt @@ -120,7 +120,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter .also { Timber.e("## Send: Work cancelled by user") - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION) } else { @@ -408,7 +408,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter return Result.success(WorkerParamsFactory.toData(sendParams)).also { Timber.v("## handleSuccess $attachmentUrl, work is stopped $isStopped") - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION) } else { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt index 909a9dcb59..64f4c6e613 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt @@ -331,7 +331,7 @@ internal class RoomSummaryDataSource @Inject constructor( RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false) RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0) RoomCategoryFilter.ALL -> { - // Tchap: we ignore DMs with directUserId different from a matrix id. + // TCHAP we ignore DMs with directUserId different from a matrix id. // directUserId could be an email if the user has no account and he was invited by email. query.beginGroup() query.beginGroup() diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js index b823cac515..d3e41ffb0a 100644 --- a/tools/danger/dangerfile.js +++ b/tools/danger/dangerfile.js @@ -106,7 +106,7 @@ if (github.requested_reviewers.users.length == 0 && !pr.draft) { } // Check that translations have not been modified by developers -// Tchap: deactivate translation file checking. +// TCHAP deactivate translation file checking. //if (user != "RiotTranslateBot") { // if (editedFiles.some(file => file.endsWith("strings.xml") && !file.endsWith("values/strings.xml"))) { // fail("Some translation files have been edited. Only user `RiotTranslateBot` (i.e. translations coming from Weblate) is allowed to do that.\nPlease read more about translations management [in the doc](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#internationalisation).") diff --git a/towncrier.toml b/towncrier.toml index 558b719f8d..1936bfcb2e 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.11.5" + version = "2.11.6" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index af841c8220..c14b440df8 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -27,7 +27,7 @@ knit { exclude '**/build/**' exclude '**/.gradle/**' exclude '**/towncrier/template.md' - exclude '**/*_CHANGES.md' // Tchap: Exclude all changes files + exclude '**/*_CHANGES.md' // TCHAP Exclude all changes files } } @@ -37,7 +37,7 @@ ext.versionMinor = 11 // 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 = 5 +ext.versionPatch = 6 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' @@ -101,7 +101,7 @@ static def gitBranchName() { // For Google Play build, build on any other branch than main will have a "-dev" suffix static def getGplayVersionSuffix() { - // Tchap: No suffix for tagged release + // TCHAP No suffix for tagged release if (gitBranchName() == "main" || gitTag().startsWith("tchap_v")) { return "" } else { @@ -115,7 +115,7 @@ static def gitTag() { } // For F-Droid build, build on a not tagged commit will have a "-dev" suffix -// Tchap: unused +// TCHAP unused @SuppressWarnings('unused') static def getFdroidVersionSuffix() { if (gitTag() == "") { @@ -171,13 +171,13 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - // Tchap: Disable universalApk + // TCHAP Disable universalApk // Keep abiFilter for the universalApk // ndk { // abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64' // } - // Tchap: Use only en and fr + // TCHAP Use only en and fr resConfigs "en", "fr" // Ref: https://developer.android.com/studio/build/configure-apk-splits.html @@ -196,7 +196,7 @@ android { // Specifies a list of ABIs that Gradle should create APKs for. include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" - // Tchap: Disable universalApk + // TCHAP Disable universalApk // Generate a universal APK that includes all ABIs, so user who install from CI tool can use this one by default. universalApk false } @@ -204,7 +204,7 @@ android { applicationVariants.all { variant -> // assign different version code for each output - // Tchap: Increase the factor from 10 to 100 due to Neo users integration + // TCHAP Increase the factor from 10 to 100 due to Neo users integration def baseVariantVersion = variant.versionCode * 100 variant.outputs.each { output -> def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) @@ -238,24 +238,24 @@ android { storeFile file('./signature/debug.keystore') storePassword 'android' } - // TODO Tchap: Update - /* nightly { - keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId") - keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword") - storeFile file('./signature/nightly.keystore') - storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword") - } - release { - keyAlias project.property("signing.element.keyId") - keyPassword project.property("signing.element.keyPassword") - storeFile file(project.property("signing.element.storePath")) - storePassword project.property("signing.element.storePassword") - } */ + // TCHAP no nightly and release signing configurations +// nightly { +// keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId") +// keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword") +// storeFile file('./signature/nightly.keystore') +// storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword") +// } +// release { +// keyAlias project.property("signing.element.keyId") +// keyPassword project.property("signing.element.keyPassword") +// storeFile file(project.property("signing.element.storePath")) +// storePassword project.property("signing.element.storePassword") +// } } buildTypes { debug { - // Tchap: no debug version + // TCHAP no debug version // applicationIdSuffix ".debug" // resValue "string", "app_name", "Element dbg" // resValue "color", "launcher_background", "#0DBD8B" @@ -282,7 +282,7 @@ android { // signingConfig signingConfigs.release } - // Tchap: No nightly + // TCHAP no nightly version // nightly { // initWith release // applicationIdSuffix ".nightly" @@ -316,7 +316,7 @@ android { // } } - // Tchap: no night mode + // TCHAP no nightly version // sourceSets { // nightly { // java.srcDirs += "src/release/java" @@ -384,7 +384,7 @@ android { } } - // Tchap: Rename unsigned apk + // TCHAP Rename unsigned apk applicationVariants.all { variant -> variant.outputs.all { output -> outputFileName = outputFileName @@ -424,7 +424,7 @@ android { } } -// Tchap: Use custom configuration for Flipper library +// TCHAP Use custom configuration for Flipper library configurations { fdroidBtchapWithvoipWithoutpinningDebugImplementation fdroidDevTchapWithvoipWithoutpinningDebugImplementation @@ -495,7 +495,7 @@ dependencies { // API-only library gplayImplementation libs.google.appdistributionApi // Full SDK implementation - // Tchap: No nightly + // TCHAP No nightly // nightlyImplementation libs.google.appdistribution // OSS License, gplay flavor only @@ -503,7 +503,7 @@ dependencies { kapt libs.dagger.hiltCompiler ksp libs.airbnb.epoxyProcessor - // Tchap: We had to exclude fbjni for withVoip, the library is already include in jitsi library + // TCHAP We had to exclude fbjni for withVoip, the library is already include in jitsi library // Flipper, debug builds only gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt index d748608fcd..4226167064 100644 --- a/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt +++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt @@ -40,7 +40,7 @@ import im.vector.app.waitForView class OnboardingRobot { - // Tchap: Override default feature values for tests + // TCHAP Override default feature values for tests private val context = InstrumentationRegistry.getInstrumentation().targetContext private val defaultVectorFeatures = DebugVectorFeatures( diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt index 1c754315ff..704d54b44e 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt @@ -30,7 +30,7 @@ class DebugJitsiActivity : VectorBaseActivity() { @SuppressLint("SetTextI18n") override fun initUiAndData() { - // Tchap: Jitsi is only available on withvoip flavor, just comment the following lines to remove the dependency + // TCHAP Jitsi is only available on withvoip flavor, just comment the following lines to remove the dependency // val isCrashReportingDisabled = JitsiMeet.isCrashReportingDisabled(this) // views.status.text = "Jitsi crash reporting is disabled: $isCrashReportingDisabled" // diff --git a/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt index 14c44753c0..146c6b000c 100644 --- a/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt +++ b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt @@ -46,7 +46,7 @@ class FdroidNotificationTroubleshootTestManagerFactory @Inject constructor( private val testUnifiedPushEndpoint: TestUnifiedPushEndpoint, private val testAvailableUnifiedPushDistributors: TestAvailableUnifiedPushDistributors, private val testEndpointAsTokenRegistration: TestEndpointAsTokenRegistration, - // private val testPushFromPushGateway: TestPushFromPushGateway, // Tchap: remove + // private val testPushFromPushGateway: TestPushFromPushGateway, // TCHAP remove private val testAutoStartBoot: TestAutoStartBoot, private val testBackgroundRestrictions: TestBackgroundRestrictions, private val testBatteryOptimization: TestBatteryOptimization, @@ -72,7 +72,7 @@ class FdroidNotificationTroubleshootTestManagerFactory @Inject constructor( mgr.addTest(testUnifiedPushGateway) mgr.addTest(testUnifiedPushEndpoint) mgr.addTest(testEndpointAsTokenRegistration) -// mgr.addTest(testPushFromPushGateway) // Tchap: remove +// mgr.addTest(testPushFromPushGateway) // TCHAP remove } mgr.addTest(testNotification) return mgr diff --git a/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt index fa5f9d9e13..a9cbfc4845 100644 --- a/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt +++ b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt @@ -49,7 +49,7 @@ class GoogleNotificationTroubleshootTestManagerFactory @Inject constructor( private val testUnifiedPushEndpoint: TestUnifiedPushEndpoint, private val testAvailableUnifiedPushDistributors: TestAvailableUnifiedPushDistributors, private val testEndpointAsTokenRegistration: TestEndpointAsTokenRegistration, - // private val testPushFromPushGateway: TestPushFromPushGateway, // Tchap: remove + // private val testPushFromPushGateway: TestPushFromPushGateway, // TCHAP remove private val testNotification: TestNotification, private val vectorFeatures: VectorFeatures, ) : NotificationTroubleshootTestManagerFactory { @@ -74,7 +74,7 @@ class GoogleNotificationTroubleshootTestManagerFactory @Inject constructor( mgr.addTest(testUnifiedPushEndpoint) mgr.addTest(testEndpointAsTokenRegistration) } - // mgr.addTest(testPushFromPushGateway) // Tchap: remove + // mgr.addTest(testPushFromPushGateway) // TCHAP remove mgr.addTest(testNotification) return mgr } diff --git a/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt index 2d1f50950c..bf2c3a6299 100644 --- a/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt +++ b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt @@ -165,7 +165,7 @@ import javax.inject.Singleton metricPlugins = vectorPlugins.plugins(), cryptoAnalyticsPlugin = vectorPlugins.cryptoMetricPlugin, customEventTypesProvider = vectorCustomEventTypesProvider, - // Tchap: Use custom permalink prefix + // TCHAP Use custom permalink prefix clientPermalinkBaseUrl = mdmService.getData(MdmData.PermalinkBaseUrl) ?: context.getString(R.string.permalink_prefix), syncConfig = SyncConfig( syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true) diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt index 976131e804..b4a746f749 100644 --- a/vector-config/src/main/java/im/vector/app/config/Config.kt +++ b/vector-config/src/main/java/im/vector/app/config/Config.kt @@ -23,7 +23,7 @@ import kotlin.time.Duration.Companion.days */ object Config { - // Tchap: The spaces feature is hidden, show all rooms in the home + // TCHAP The spaces feature is hidden, show all rooms in the home const val SHOW_SPACES = false const val SPACES_SHOW_ALL_IN_HOME = !SHOW_SPACES @@ -44,10 +44,10 @@ object Config { * - Changing the value from `false` to `true` will let the user be able to select an external UnifiedPush distributor; * - Changing the value from `true` to `false` will force the app to return to the background sync / Firebase Push. */ - const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false // Tchap: Disable UnifiedPush (use Firebase/background sync) + const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false // TCHAP Disable UnifiedPush (use Firebase/background sync) const val ENABLE_LOCATION_SHARING = true - const val LOCATION_MAP_TILER_KEY = "" // Tchap: No key for map is needed + const val LOCATION_MAP_TILER_KEY = "" // TCHAP No key for map is needed /** * Whether to read the `io.element.functional_members` state event @@ -83,22 +83,22 @@ object Config { * The analytics configuration to use for the Debug build type. * Can be disabled by providing Analytics.Disabled */ - val DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics + val DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics /** * The analytics configuration to use for the Release build type. * Can be disabled by providing Analytics.Disabled */ - val RELEASE_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics + val RELEASE_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics /** * The analytics configuration to use for the Nightly build type. * Can be disabled by providing Analytics.Disabled */ - val NIGHTLY_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics - val RELEASE_R_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics - val ER_NIGHTLY_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics - val ER_DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics + val NIGHTLY_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics + val RELEASE_R_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics + val ER_NIGHTLY_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics + val ER_DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics val SHOW_UNVERIFIED_SESSIONS_ALERT_AFTER_MILLIS = 7.days.inWholeMilliseconds // 1 Week } diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml index f9439b9f00..e30415e59d 100755 --- a/vector-config/src/tchap/res/values/config-features.xml +++ b/vector-config/src/tchap/res/values/config-features.xml @@ -4,7 +4,5 @@ true false - - agent.dinum.tchap.gouv.fr - + diff --git a/vector/build.gradle b/vector/build.gradle index 4102d4d435..ee636153cc 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -42,7 +42,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - // Tchap: Disable universalApk + // TCHAP Disable universalApk // Keep abiFilter for the universalApk // ndk { // abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64' @@ -269,7 +269,7 @@ dependencies { implementation "androidx.emoji2:emoji2:1.3.0" - // Tchap: Manage jitsi lib + // TCHAP Manage jitsi lib // WebRTC withdmvoipImplementation('org.jitsi:webrtc:111.0.1') // Jitsi @@ -284,7 +284,7 @@ dependencies { exclude group: 'com.android.support', module: 'appcompat-v7' } - // Tchap: Fix issue on okhttp3 import + // TCHAP Fix issue on okhttp3 import api 'com.squareup.okhttp3:okhttp' // QR-code diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt index 5177a7514d..dad68e5924 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt @@ -167,7 +167,7 @@ class UnrecognizedCertificateDialog @Inject constructor( // builder.setNegativeButton(R.string.action_cancel) { _, _ -> callback.onReject() } // } - // Tchap: user can only ignore unknown certificate + // TCHAP user can only ignore unknown certificate builder.setPositiveButton(R.string.ok) { _, _ -> callback.onIgnore() } diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt index 78b22a4194..fc5f0b9e3a 100644 --- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt @@ -49,7 +49,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device tchapMapRenderer.render(safeLocationUiData, holder.staticMapImageView) val pinMatrixItem = matrixItem.takeIf { safeLocationUiData.locationOwnerId != null } @@ -113,7 +113,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel(@LayoutRes la override fun bind(holder: T) { super.bind(holder) val bestName = matrixItem.getBestName() - // Tchap: Hide the Matrix Id + // TCHAP Hide the Matrix Id // val matrixId = matrixItem.id // .takeIf { it != bestName } // // Special case for ThreePid fake matrix item diff --git a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt index 58507fa070..b8c2f1622a 100644 --- a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt @@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.MatrixPatterns import org.matrix.android.sdk.api.extensions.ensurePrefix import java.util.regex.Pattern -// Tchap: regular expression in accordance with RFC 5322 for restricting consecutive, leading and trailing dots +// TCHAP regular expression in accordance with RFC 5322 for restricting consecutive, leading and trailing dots const val emailPattern = "^[a-zA-Z0-9_!#\$%&'*+/=?`{|}~^-]+(?:\\.[a-zA-Z0-9_!#\$%&'*+/=?`{|}~^-]+)*@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*\$" val emailAddress: Pattern = Pattern.compile(emailPattern) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index a662d3ee74..b28cb9e43c 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -310,7 +310,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver is GlobalError.InvalidToken -> handleInvalidToken(globalError) is GlobalError.ConsentNotGivenError -> displayConsentNotGivenDialog(globalError) is GlobalError.CertificateError -> handleCertificateError(globalError) - GlobalError.ExpiredAccount -> handleExpiredAccount() // Tchap: Custom expired account + GlobalError.ExpiredAccount -> handleExpiredAccount() // TCHAP Custom expired account is GlobalError.InitialSyncRequest -> handleInitialSyncRequest(globalError) } } diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt index 942d7ade91..40acadc548 100755 --- a/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt @@ -71,7 +71,7 @@ open class VectorPreference : Preference { init { // Set to false to remove the space when there is no icon - // Tchap: no space when no icon + // TCHAP no space when no icon // isIconSpaceReserved = true isIconSpaceReserved = false } diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt index ce980f0bfe..eb44278433 100644 --- a/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt @@ -40,7 +40,7 @@ class VectorPreferenceCategory : PreferenceCategory { init { // Set to false to remove the space when there is no icon - // Tchap: no space when no icon + // TCHAP no space when no icon // isIconSpaceReserved = true isIconSpaceReserved = false } @@ -52,7 +52,7 @@ class VectorPreferenceCategory : PreferenceCategory { titleTextView?.setTypeface(null, Typeface.BOLD) titleTextView?.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_primary)) - // Tchap: bigger title size for Preference Categories + // TCHAP bigger title size for Preference Categories titleTextView?.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18.0f) // "isIconSpaceReserved = false" does not work for preference category, so remove the padding diff --git a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt index d016f4ef22..e9d9529d37 100644 --- a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt @@ -73,7 +73,7 @@ class NotificationAreaView @JvmOverloads constructor( State.Initial -> Unit is State.Default -> renderDefault() is State.Hidden -> renderHidden() - // Tchap: custom error message + // TCHAP custom error message is State.NoPermissionToPost -> renderNoPermissionToPost(newState.message) is State.UnsupportedAlgorithm -> renderUnsupportedAlgorithm(newState) is State.Tombstone -> renderTombstone() @@ -182,7 +182,7 @@ class NotificationAreaView @JvmOverloads constructor( // View will be Invisible object Default : State() - // Tchap: User can't post messages to room because his power level doesn't allow it or he is alone in the DM. + // TCHAP User can't post messages to room because his power level doesn't allow it or he is alone in the DM. data class NoPermissionToPost(@StringRes val message: Int) : State() data class UnsupportedAlgorithm(val canRestore: Boolean) : State() diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt index 2baa60ebcd..df8b8f0459 100644 --- a/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/ShieldImageView.kt @@ -36,7 +36,7 @@ class ShieldImageView @JvmOverloads constructor( if (isInEditMode) { render(RoomEncryptionTrustLevel.Trusted) } - // Tchap: Hide the shield + // TCHAP Hide the shield isVisible = false } @@ -66,7 +66,7 @@ class ShieldImageView @JvmOverloads constructor( } fun render(roomEncryptionTrustLevel: RoomEncryptionTrustLevel?, borderLess: Boolean = false) { - // Tchap: Hide the shield + // TCHAP Hide the shield isVisible = false when (roomEncryptionTrustLevel) { 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 fee675a70a..cb6f12f246 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -165,7 +165,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity if (state.mayBeLongToProcess) { views.status.setText(R.string.updating_your_data) } - // Tchap: Hide status + // TCHAP Hide status views.status.isVisible = false // state.mayBeLongToProcess } @@ -219,7 +219,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity clearNotifications() } // Handle some wanted cleanup - // Tchap: handle account expiration + // TCHAP handle account expiration if (args.clearCache || args.clearCredentials || args.isAccountExpired) { doCleanUp() } else { @@ -384,7 +384,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity args.isUserLoggedOut -> // the homeserver has invalidated the token (password changed, device deleted, other security reasons) SignedOutActivity.newIntent(this) - // Tchap: add account expiration handling + // TCHAP add account expiration handling args.isAccountExpired -> // user account has expired, request to renew it ExpiredAccountActivity.newIntent(this) diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt index 3569bd8dbd..70e9593172 100644 --- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt +++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt @@ -73,9 +73,9 @@ class DefaultVectorFeatures @Inject constructor( domain == appNameProvider.getAppName() override fun onboardingVariant() = Config.ONBOARDING_VARIANT override fun isOnboardingAlreadyHaveAccountSplashEnabled() = true - override fun isOnboardingSplashCarouselEnabled() = false // Tchap: no carousel + override fun isOnboardingSplashCarouselEnabled() = false // TCHAP no carousel override fun isOnboardingUseCaseEnabled() = true - override fun isOnboardingPersonalizeEnabled() = false // Tchap: no personalization + override fun isOnboardingPersonalizeEnabled() = false // TCHAP no personalization override fun isOnboardingCombinedRegisterEnabled() = true override fun isOnboardingCombinedLoginEnabled() = true override fun allowExternalUnifiedPushDistributors(): Boolean = Config.ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS @@ -83,7 +83,7 @@ class DefaultVectorFeatures @Inject constructor( override fun isLocationSharingEnabled() = Config.ENABLE_LOCATION_SHARING override fun forceUsageOfOpusEncoder(): Boolean = false override fun isNewAppLayoutFeatureEnabled(): Boolean = true - override fun isQrCodeLoginEnabled(): Boolean = false // Tchap: disable QrCode login for now + override fun isQrCodeLoginEnabled(): Boolean = false // TCHAP disable QrCode login for now override fun isQrCodeLoginForAllServers(): Boolean = false override fun isReciprocateQrCodeLogin(): Boolean = false override fun isVoiceBroadcastEnabled(): Boolean = true diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt index a60158cf11..f2563a8fa1 100644 --- a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt @@ -104,7 +104,7 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment) { // when (state) { // is Loading -> renderCreationLoading() diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt index 14c2073c4d..869a80a069 100644 --- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt @@ -103,7 +103,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor( /** * If users already have a DM room then navigate to it instead of creating a new room. */ - // Tchap: unused, replaced by Tchap.onSubmitInvitees + // TCHAP unused, replaced by Tchap.onSubmitInvitees private fun onSubmitInvitees(selections: Set) { val existingRoomId = selections.singleOrNull()?.getMxId()?.let { userId -> session.roomService().getExistingDirectRoomWithUser(userId) @@ -166,10 +166,10 @@ class CreateDirectRoomViewModel @AssistedInject constructor( * If users already have a DM room then navigate to it instead of creating a new room. */ fun onSubmitInvitees(selections: Set) { - // Tchap: All the user invite and DM creation process has been reworked - // Tchap: - multi-selection is forbidden, DM are restricted to 1:1 - // Tchap: - invites by email might expire for external accounts so we have to cancel pending invites to send a new ones - // Tchap: - invites by msisdn are not supported yet + // TCHAP All the user invite and DM creation process has been reworked + // TCHAP - multi-selection is forbidden, DM are restricted to 1:1 + // TCHAP - invites by email might expire for external accounts so we have to cancel pending invites to send a new ones + // TCHAP - invites by msisdn are not supported yet val selection = selections.singleOrNull() ?: return setState { copy(isLoading = true) } when (selection) { diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt index f2fc500904..3be8f2435a 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt @@ -29,6 +29,6 @@ data class KeysBackupSettingViewState( val keysBackupVersion: KeysVersionResult? = null, val remainingKeysToBackup: Int = 0, val deleteBackupRequest: Async = Uninitialized, - val backupSuccessfullyDeleted: Boolean = false // Tchap + val backupSuccessfullyDeleted: Boolean = false // TCHAP ) : MavericksState diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt index 0ee6b48b24..c08af56d03 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt @@ -85,7 +85,7 @@ class KeysBackupSettingsFragment : } } - // Tchap + // TCHAP override fun didDeleteBackupSuccessfully() { activity?.let { it.finish() diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt index 435d4b6f99..3938c21001 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt @@ -53,14 +53,14 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor( val host = this var isBackupAlreadySetup = false - // Tchap: back to previous activity after deleting backup successfully. + // TCHAP back to previous activity after deleting backup successfully. if (data.backupSuccessfullyDeleted) { host.listener?.didDeleteBackupSuccessfully() return } val keyBackupState = data.keysBackupState -// val keyVersionResult = data.keysBackupVersion // Tchap: no more used +// val keyVersionResult = data.keysBackupVersion // TCHAP no more used when (keyBackupState) { KeysBackupState.Unknown -> { @@ -151,7 +151,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor( } if (isBackupAlreadySetup) { - // Tchap: no technical info + // TCHAP no technical info // // Add infos // genericItem { // id("version") @@ -178,7 +178,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor( textButton1(host.stringProvider.getString(R.string.keys_backup_settings_restore_backup_button)) clickOnButton1 { host.listener?.didSelectRestoreMessageRecovery() } - // Tchap: hide "Suppress backup" button + // TCHAP hide "Suppress backup" button // textButton2(host.stringProvider.getString(R.string.keys_backup_settings_delete_backup_button)) // clickOnButton2 { host.listener?.didSelectDeleteSetupMessageRecovery() } } else { @@ -314,6 +314,6 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor( fun didSelectDeleteSetupMessageRecovery() fun loadTrustData() fun loadKeysBackupState() - fun didDeleteBackupSuccessfully() // Tchap + fun didDeleteBackupSuccessfully() // TCHAP } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt index 25dd7d23ba..6c8e7d0ddb 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt @@ -187,7 +187,7 @@ class KeysBackupSettingsViewModel @AssistedInject constructor( keysBackupVersionTrust = Uninitialized, // We do not care about the success data deleteBackupRequest = Uninitialized, - backupSuccessfullyDeleted = true // Tchap + backupSuccessfullyDeleted = true // TCHAP ) } } catch (failure: Throwable) { diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt index 7692a341ec..051baf5a08 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt @@ -53,7 +53,7 @@ class KeysBackupSetupStep1Fragment : private fun onButtonClick() { // viewModel.navigateEvent.value = LiveEvent(KeysBackupSetupSharedViewModel.NAVIGATE_TO_STEP_2) - viewModel.prepareRecoveryKey(requireContext(), null) // Tchap: only recovery key + viewModel.prepareRecoveryKey(requireContext(), null) // TCHAP only recovery key } private fun onManualExportClick() { diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt index d05783e5c1..fb7ca36d29 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt @@ -96,9 +96,9 @@ class BootstrapSaveRecoveryKeyFragment : } private val copyStartForActivityResult = registerStartForActivityResult { activityResult -> - // Tchap: accept to close sheet even if result is RESULT_CANCELED. The Recovery code is in the clipboard. + // TCHAP accept to close sheet even if result is RESULT_CANCELED. The Recovery code is in the clipboard. if (activityResult.resultCode == Activity.RESULT_OK || activityResult.resultCode == Activity.RESULT_CANCELED) { - // Tchap: Close the dialog without having to tap "Continue" + // TCHAP Close the dialog without having to tap "Continue" sharedViewModel.handle(BootstrapActions.Completed) } } @@ -107,7 +107,7 @@ class BootstrapSaveRecoveryKeyFragment : val recoveryKey = state.recoveryKeyCreationInfo?.recoveryKey?.formatRecoveryKey() ?: return@withState - // Tchap: copy recovery key to clipboard right now after "Copy" button is tapped. + // TCHAP copy recovery key to clipboard right now after "Copy" button is tapped. val clipService = requireContext().getSystemService() clipService?.setPrimaryClip(ClipData.newPlainText("", recoveryKey)) @@ -119,7 +119,7 @@ class BootstrapSaveRecoveryKeyFragment : context?.getString(R.string.recovery_key) ) - // Tchap: Fix issue due to no download possible + // TCHAP Fix issue due to no download possible sharedViewModel.handle(BootstrapActions.RecoveryKeySaved) } @@ -127,7 +127,7 @@ class BootstrapSaveRecoveryKeyFragment : val step = state.step if (step !is BootstrapStep.SaveRecoveryKey) return@withState - views.recoveryContinue.isVisible = false // Tchap: don't display "Continue" button + views.recoveryContinue.isVisible = false // TCHAP don't display "Continue" button views.bootstrapRecoveryKeyText.text = state.recoveryKeyCreationInfo?.recoveryKey?.formatRecoveryKey() views.bootstrapSaveText.giveAccessibilityFocusOnce() } diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt index 31e71cadf5..5ec1c9858c 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt @@ -42,7 +42,7 @@ class BootstrapSetupRecoveryKeyFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - // Tchap: we directly send user to Security Key + // TCHAP we directly send user to Security Key // Actions when a key backup exist // views.bootstrapSetupSecureSubmit.views.bottomSheetActionClickableZone.debouncedClicks { // sharedViewModel.handle(BootstrapActions.StartKeyBackupMigration) @@ -94,7 +94,7 @@ class BootstrapSetupRecoveryKeyFragment : private fun renderBackupMethodActions(method: SecureBackupMethod) = with(views) { bootstrapSetupSecureUseSecurityKey.isVisible = method.isKeyAvailable - // Tchap: Hide Security Passphrase + // TCHAP Hide Security Passphrase // views.bootstrapSetupSecureUseSecurityPassphrase.isVisible = method.isPassphraseAvailable // views.bootstrapSetupSecureUseSecurityPassphraseSeparator.isVisible = method.isPassphraseAvailable } diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt index d6c6a77586..169c713664 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt @@ -37,7 +37,7 @@ abstract class BottomSheetVerificationBigImageItem : VectorEpoxyModel when (sharedAction) { - // Tchap: Custom implementation + // TCHAP Custom implementation is HomeActivitySharedAction.InviteByEmail -> Unit // no-op HomeActivitySharedAction.OpenTermAndConditions -> { - // Tchap: the Term And Conditions url is detected as a permalink (same prefix), which make the application fail to open it from + // TCHAP the Term And Conditions url is detected as a permalink (same prefix), which make the application fail to open it from // ChromeCustomTab, so we open it here directly in a WebView val intent = VectorWebViewActivity.getIntent(this, VectorSettingsUrls.TAC, getString(R.string.settings_app_term_conditions)) startActivity(intent) @@ -267,7 +267,7 @@ class HomeActivity : homeActivityViewModel.observeViewEvents { when (it) { - // Tchap: hide promote Xsss + // TCHAP hide promote Xsss // is HomeActivityViewEvents.AskPasswordToInitCrossSigning -> handleAskPasswordToInitCrossSigning(it) is HomeActivityViewEvents.AskPasswordToInitCrossSigning -> {} is HomeActivityViewEvents.CurrentSessionNotVerified -> handleOnNewSession(it) @@ -649,7 +649,7 @@ class HomeActivity : true } R.id.menu_home_report_bug -> { - // Tchap: Disable default value for screenshot + // TCHAP Disable default value for screenshot bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT, withScreenshot = false) true } @@ -680,7 +680,7 @@ class HomeActivity : true } R.id.menu_home_invite_friends -> { - // Tchap: change for invite by email + // TCHAP change for invite by email // launchInviteFriends() inviteByEmail() true @@ -689,7 +689,7 @@ class HomeActivity : launchQrCode() true } - // Tchap: new faq entry + // TCHAP new faq entry R.id.menu_home_faq -> { openUrlInChromeCustomTab(this, null, VectorSettingsUrls.HELP) true diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt index 5a0ccbd5c1..63e3432365 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt @@ -19,7 +19,7 @@ package im.vector.app.features.home import im.vector.app.core.platform.VectorViewModelAction sealed interface HomeActivityViewActions : VectorViewModelAction { - // Tchap: Use only in Tchap + // TCHAP Use only in Tchap object DisclaimerDialogShown : HomeActivityViewActions object ViewStarted : HomeActivityViewActions object PushPromptHasBeenReviewed : HomeActivityViewActions 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 99c30eb739..bc2bbad6bc 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 @@ -117,7 +117,7 @@ class HomeActivityViewModel @AssistedInject constructor( private var isInitialized = false private var checkBootstrap = false - // Tchap: Disable cross-signing + // TCHAP Disable cross-signing private var hasCheckedBootstrap = !vectorFeatures.tchapIsCrossSigningEnabled() private var onceTrusted = false @@ -136,12 +136,12 @@ class HomeActivityViewModel @AssistedInject constructor( observeAnalytics() observeReleaseNotes() initThreadsMigration() - // Tchap: force to false to deactivate "Never send messages to unverified devices" + // TCHAP force to false to deactivate "Never send messages to unverified devices" disableGlobalBlacklistUnverifiedDevices() viewModelScope.launch { stopOngoingVoiceBroadcastUseCase.execute() } } - // Tchap: force to false to deactivate "Never send messages to unverified devices" + // TCHAP force to false to deactivate "Never send messages to unverified devices" private fun disableGlobalBlacklistUnverifiedDevices() { val session = activeSessionHolder.getSafeActiveSession() ?: return @@ -251,7 +251,7 @@ class HomeActivityViewModel @AssistedInject constructor( .flow() .liveCrossSigningInfo(safeActiveSession.myUserId) .onEach { info -> - // Tchap: Disable cross-signing + // TCHAP Disable cross-signing val mxCrossSigningInfo = info.getOrNull() if (!vectorFeatures.tchapIsCrossSigningEnabled() && mxCrossSigningInfo != null) { @@ -283,7 +283,7 @@ class HomeActivityViewModel @AssistedInject constructor( // lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled()) // } - // Tchap: disable automatic thread migration + // TCHAP disable automatic thread migration if (!vectorFeatures.tchapIsThreadEnabled()) return when { @@ -326,7 +326,7 @@ class HomeActivityViewModel @AssistedInject constructor( .onEach { status -> when (status) { is SyncRequestState.Idle -> { - // Tchap: Force Identity server definition + // TCHAP Force Identity server definition updateIdentityServer() maybeVerifyOrBootstrapCrossSigning() @@ -343,7 +343,7 @@ class HomeActivityViewModel @AssistedInject constructor( .launchIn(viewModelScope) if (session.syncService().hasAlreadySynced()) { - // Tchap: Force Identity server definition even in case the user is already logged and initial Sync already occured. + // TCHAP Force Identity server definition even in case the user is already logged and initial Sync already occured. // This is to force fix IdentityServerUrl if needed. updateIdentityServer() @@ -561,7 +561,7 @@ class HomeActivityViewModel @AssistedInject constructor( } } - // Tchap: Force user consent as it should have been already accepted in TAC + // TCHAP Force user consent as it should have been already accepted in TAC if (!getUserConsent()) { setUserConsent(true) Timber.d("## updateIdentityServer user consent succeeded") @@ -573,7 +573,7 @@ class HomeActivityViewModel @AssistedInject constructor( override fun handle(action: HomeActivityViewActions) { when (action) { HomeActivityViewActions.DisclaimerDialogShown -> { - // Tchap: in case of migration, there is no initial sync, so force the update of the identity server url + // TCHAP in case of migration, there is no initial sync, so force the update of the identity server url updateIdentityServer() } HomeActivityViewActions.PushPromptHasBeenReviewed -> { diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt index 53147f0190..40c1f01b4d 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt @@ -540,7 +540,7 @@ class HomeDetailFragment : return this } - // Tchap: Used for the invitation by email + // TCHAP Used for the invitation by email private fun openRoom(roomId: String) { navigator.openRoom(requireActivity(), roomId) } diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt index 7e252c368b..9511943be4 100644 --- a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt @@ -91,7 +91,7 @@ class NewHomeDetailFragment : private val newHomeDetailViewModel: NewHomeDetailViewModel by fragmentViewModel() private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel() private val serverBackupStatusViewModel: ServerBackupStatusViewModel by activityViewModel() - private val createDirectRoomViewModel: CreateDirectRoomViewModel by activityViewModel() // Tchap: for managing invite + private val createDirectRoomViewModel: CreateDirectRoomViewModel by activityViewModel() // TCHAP for managing invite private lateinit var sharedActionViewModel: HomeSharedActionViewModel private lateinit var sharedRoomListActionViewModel: RoomListSharedActionViewModel @@ -185,7 +185,7 @@ class NewHomeDetailFragment : } } - // Tchap: observe invite action + // TCHAP observe invite action sharedActionViewModel .stream() .onEach { action -> @@ -203,7 +203,7 @@ class NewHomeDetailFragment : invalidateOptionsMenu() } - // Tchap: hide unread count for space (shown above "+" button on main view) + // TCHAP hide unread count for space (shown above "+" button on main view) // newHomeDetailViewModel.onEach { viewState -> // refreshUnreadCounterBadge(viewState.spacesNotificationCounterBadgeState) // } @@ -239,7 +239,7 @@ class NewHomeDetailFragment : private fun showFABs() { views.newLayoutCreateChatButton.show() - // Tchap: hide space button + // TCHAP hide space button if (Config.SHOW_SPACES) { views.newLayoutOpenSpacesButton.show() } @@ -437,7 +437,7 @@ class NewHomeDetailFragment : } } - // Tchap: action for invite + // TCHAP action for invite private fun onInviteByEmail(email: String) { createDirectRoomViewModel.handle(CreateDirectRoomAction.InviteByEmail(email)) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt index 886f601947..d35b32e008 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt @@ -66,7 +66,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents { val mimeType: String? ) : RoomDetailViewEvents() - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. data class RevokeFilePermission( val uri: Uri ) : RoomDetailViewEvents() diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 054ee3ae25..32ec0babb6 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -548,7 +548,7 @@ class TimelineFragment : ) } - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. private fun revokeFilePermission(revokeFilePermission: RoomDetailViewEvents.RevokeFilePermission) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { requireContext().revokeUriPermission( @@ -649,7 +649,7 @@ class TimelineFragment : } private fun startOpenFileIntent(action: RoomDetailViewEvents.OpenFile) { - // Tchap: Remove the ability to install an app from Tchap (https://github.com/tchapgouv/tchap-android/issues/832) + // TCHAP Remove the ability to install an app from Tchap (https://github.com/tchapgouv/tchap-android/issues/832) if (action.mimeType in listOf(MimeTypes.Apk, "application/x-authorware-bin")) { showApkAlert() } else { @@ -1292,7 +1292,7 @@ class TimelineFragment : val showPresence = roomSummary.isDirect views.includeRoomToolbar.roomToolbarPresenceImageView.render(showPresence, roomSummary.directUserPresence) val shieldView = if (showPresence) views.includeRoomToolbar.roomToolbarTitleShield else views.includeRoomToolbar.roomToolbarAvatarShield - shieldView.render(null) // Tchap does not display encryption trust level + shieldView.render(null) // TCHAP does not display encryption trust level views.includeRoomToolbar.roomToolbarPublicImageView.isVisible = roomSummary.isPublic && !roomSummary.isDirect } } @@ -1605,7 +1605,7 @@ class TimelineFragment : private fun handleCancelSend(action: EventSharedAction.Cancel) { if (action.force) { - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. timelineViewModel.handle(RoomDetailAction.CancelSend(action.event, true)) } else { MaterialAlertDialogBuilder(requireContext()) @@ -1613,7 +1613,7 @@ class TimelineFragment : .setMessage(getString(R.string.event_status_cancel_sending_dialog_message)) .setNegativeButton(R.string.no, null) .setPositiveButton(R.string.yes) { _, _ -> - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. timelineViewModel.handle(RoomDetailAction.CancelSend(action.event, false)) } .show() @@ -1631,7 +1631,7 @@ class TimelineFragment : override fun onAvatarClicked(informationData: MessageInformationData) { // roomDetailViewModel.handle(RoomDetailAction.RequestVerification(informationData.userId)) - // Tchap: Disable click on avatar in DM + // TCHAP Disable click on avatar in DM if (!timelineViewModel.isDirect()) { openRoomMemberProfile(informationData.senderId) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt index ee9ab9d793..47ea9b475b 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt @@ -245,7 +245,7 @@ class TimelineViewModel @AssistedInject constructor( } } - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" session.cryptoService().getLiveBlockUnverifiedDevices(room.roomId).asFlow().map { if (it) { session.coroutineScope.launch { @@ -862,8 +862,8 @@ class TimelineViewModel @AssistedInject constructor( when (itemId) { R.id.timeline_setting -> true R.id.invite -> state.canInvite - R.id.open_matrix_apps -> false // Tchap: there are no matrix apps - // Tchap: check if voip is enabled + R.id.open_matrix_apps -> false // TCHAP there are no matrix apps + // TCHAP check if voip is enabled R.id.video_call -> vectorPreferences.developerMode() && vectorFeatures.tchapIsVoipSupported(session.sessionParams.homeServerUrl) R.id.voice_call -> vectorFeatures.tchapIsVoipSupported(session.sessionParams.homeServerUrl) && (state.isCallOptionAvailable() || state.hasActiveElementCallWidget()) @@ -1101,7 +1101,7 @@ class TimelineViewModel @AssistedInject constructor( private fun handleCancel(action: RoomDetailAction.CancelSend) { if (room == null) return - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. // State must be in one of the sending states if (action.force || action.event.root.sendState.isSending()) { room.sendService().cancelSend(action.event.eventId) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt index e957c24b97..75ec300c62 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt @@ -280,7 +280,7 @@ class MessageComposerFragment : VectorBaseFragment(), A if (Config.SHOW_VOICE_RECORDER) { composer.sendButton.isInvisible = !messageComposerState.isSendButtonVisible } else { - // Tchap: set visibility to gone if there is no voice recorder button + // TCHAP set visibility to gone if there is no voice recorder button composer.sendButton.isGone = !messageComposerState.isSendButtonVisible (composer as? RichTextComposerLayout)?.also { val isTextFormattingEnabled = attachmentState.isTextFormattingEnabled @@ -381,7 +381,7 @@ class MessageComposerFragment : VectorBaseFragment(), A AttachmentType.POLL, !isThreadTimeLine() ) - // Tchap: Disable Stickers + // TCHAP Disable Stickers attachmentTypeSelector.setAttachmentVisibility( AttachmentType.STICKER, isVisible = false ) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt index b76e458992..a6a3dcabb4 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt @@ -202,7 +202,7 @@ class MessageComposerViewModel @AssistedInject constructor( room.flow().liveRoomSummary().unwrap(), room.flow().liveRoomMembers(roomMemberQueryParams) ) { pl, sum, members -> - // Tchap: We disable sending messages when the DM is empty or if powerLevel doesn't authorize the sending message action. + // TCHAP We disable sending messages when the DM is empty or if powerLevel doesn't authorize the sending message action. val isLastMember = members.none { it.userId != session.myUserId } val roomType = room.roomSummary()?.let { RoomUtils.getRoomType(it) } ?: TchapRoomType.UNKNOWN val isLastMemberInDm = isLastMember && roomType == TchapRoomType.DIRECT diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt index 303adfa6c8..905e2691f8 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt @@ -52,7 +52,7 @@ sealed interface CanSendStatus { object NoPermission : CanSendStatus data class UnSupportedE2eAlgorithm(val algorithm: String?) : CanSendStatus - // Tchap: Disable the sending message in a direct room if the recipient has left the room. + // TCHAP Disable the sending message in a direct room if the recipient has left the room. object EmptyDM : CanSendStatus } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt index ed47a7e314..bcb705e9bc 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt @@ -34,7 +34,7 @@ class MessageColorProvider @Inject constructor( @Suppress("UNUSED_PARAMETER") @ColorInt fun getMemberNameTextColor(matrixItem: MatrixItem): Int { - // Tchap: Use primary color for member name. + // TCHAP Use primary color for member name. return colorProvider.getColorFromAttribute(R.attr.colorPrimary) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/LocationUiData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/LocationUiData.kt index 1ff45df930..a657310eef 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/LocationUiData.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/LocationUiData.kt @@ -24,7 +24,7 @@ import im.vector.app.features.location.LocationData * Data used to display Location data in the message bottom sheet. */ data class LocationUiData( - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device val locationData: LocationData, val mapZoom: Double, val mapSize: Size, diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt index 5864e31512..381486db64 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt @@ -60,7 +60,7 @@ import javax.inject.Inject class MessageActionsEpoxyController @Inject constructor( private val stringProvider: StringProvider, private val avatarRenderer: AvatarRenderer, - private val tchapMapRenderer: TchapMapRenderer, // Tchap: Generate and load map on device + private val tchapMapRenderer: TchapMapRenderer, // TCHAP Generate and load map on device private val fontProvider: EmojiCompatFontProvider, private val imageContentRenderer: ImageContentRenderer, private val dimensionConverter: DimensionConverter, @@ -69,7 +69,7 @@ class MessageActionsEpoxyController @Inject constructor( private val eventDetailsFormatter: EventDetailsFormatter, private val vectorPreferences: VectorPreferences, private val dateFormatter: VectorDateFormatter, -// private val urlMapProvider: UrlMapProvider, // Tchap: remove +// private val urlMapProvider: UrlMapProvider, // TCHAP remove private val locationPinProvider: LocationPinProvider ) : TypedEpoxyController() { @@ -87,7 +87,7 @@ class MessageActionsEpoxyController @Inject constructor( bottomSheetMessagePreviewItem { id("preview") avatarRenderer(host.avatarRenderer) - tchapMapRenderer(host.tchapMapRenderer) // Tchap: Generate and load map on device + tchapMapRenderer(host.tchapMapRenderer) // TCHAP Generate and load map on device matrixItem(state.informationData.matrixItem) movementMethod(createLinkMovementMethod(host.listener)) imageContentRenderer(host.imageContentRenderer) @@ -235,7 +235,7 @@ class MessageActionsEpoxyController @Inject constructor( private fun buildLocationUiData(state: MessageActionState): LocationUiData? { if (state.timelineEvent()?.root?.isLocationMessage() != true) return null - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device val locationContent = state.timelineEvent()?.root?.getClearContent().toModel(catchError = true) ?: return null val locationData = locationContent.toLocationData() ?: return null val locationOwnerId = if (locationContent.isSelfLocation()) state.informationData.senderId else null diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index fcf3d8e950..06327ef305 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -313,7 +313,7 @@ class MessageActionsViewModel @AssistedInject constructor( private fun ArrayList.addActionsForSendingState(timelineEvent: TimelineEvent) { // TODO is uploading attachment? if (canCancel(timelineEvent)) { - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. add(EventSharedAction.Cancel(timelineEvent, false)) } } @@ -322,7 +322,7 @@ class MessageActionsViewModel @AssistedInject constructor( // If sent but not synced (synapse stuck at bottom bug) // Still offer action to cancel (will only remove local echo) timelineEvent.root.eventId?.let { - // Tchap: Revoke read permission to the local file. + // TCHAP Revoke read permission to the local file. add(EventSharedAction.Cancel(timelineEvent, true)) } @@ -459,7 +459,7 @@ class MessageActionsViewModel @AssistedInject constructor( ): Boolean { // We let reply in thread visible even if threads are not enabled, with an enhanced flow to attract users - // Tchap: don't show the canReplyInThread quick action if it's not enable in the labs + // TCHAP don't show the canReplyInThread quick action if it's not enable in the labs if (!vectorPreferences.areThreadMessagesEnabled()) return false // Disable beta prompt if the homeserver do not support threads diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt index cedc23dce8..569fb978da 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt @@ -97,7 +97,7 @@ class EncryptedItemFactory @Inject constructor( } } else -> { - // Tchap: Add faq link in unable to decrypt error + // TCHAP Add faq link in unable to decrypt error span { val learnMore = stringProvider.getString(R.string.action_learn_more) text = "${stringProvider.getString(R.string.notice_crypto_unable_to_decrypt_friendly)} $learnMore" diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt index 8184f3b622..a5a2a0a4cc 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt @@ -46,7 +46,7 @@ class LiveLocationShareMessageItemFactory @Inject constructor( private val avatarSizeProvider: AvatarSizeProvider, private val locationPinProvider: LocationPinProvider, private val vectorDateFormatter: VectorDateFormatter, - private val tchapMapRenderer: TchapMapRenderer, // Tchap: Generate and load map on device + private val tchapMapRenderer: TchapMapRenderer, // TCHAP Generate and load map on device ) { fun create( @@ -103,10 +103,10 @@ class LiveLocationShareMessageItemFactory @Inject constructor( attributes: AbsMessageItem.Attributes, runningState: LiveLocationShareViewState.Running, ): MessageLiveLocationItem { - // Tchap: Replace width and height by a size object + // TCHAP Replace width and height by a size object val size = Size(timelineMediaSizeProvider.getMaxSize().first, dimensionConverter.dpToPx(MessageItemFactory.MESSAGE_LOCATION_ITEM_HEIGHT_IN_DP)) - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device return MessageLiveLocationItem_() .attributes(attributes) .locationData(runningState.lastGeoUri.toLocationData()) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt index b6330b36d6..5f4017e4c3 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -128,7 +128,7 @@ class MessageItemFactory @Inject constructor( private val textRendererFactory: EventTextRenderer.Factory, private val stringProvider: StringProvider, private val imageContentRenderer: ImageContentRenderer, - private val tchapMapRenderer: TchapMapRenderer, // Tchap: Generate and load map on device + private val tchapMapRenderer: TchapMapRenderer, // TCHAP Generate and load map on device private val messageInformationDataFactory: MessageInformationDataFactory, private val messageItemAttributesFactory: MessageItemAttributesFactory, private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder, @@ -145,7 +145,7 @@ class MessageItemFactory @Inject constructor( private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker, private val locationPinProvider: LocationPinProvider, private val vectorPreferences: VectorPreferences, - // private val urlMapProvider: UrlMapProvider, // Tchap: remove + // private val urlMapProvider: UrlMapProvider, // TCHAP remove private val liveLocationShareMessageItemFactory: LiveLocationShareMessageItemFactory, private val pollItemViewStateFactory: PollItemViewStateFactory, private val voiceBroadcastItemFactory: VoiceBroadcastItemFactory, @@ -230,11 +230,11 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, attributes: AbsMessageItem.Attributes, ): MessageLocationItem? { - // Tchap: Replace width and height by a size object + // TCHAP Replace width and height by a size object val size = Size(timelineMediaSizeProvider.getMaxSize().first, dimensionConverter.dpToPx(MESSAGE_LOCATION_ITEM_HEIGHT_IN_DP)) val pinMatrixItem = if (locationContent.isSelfLocation()) informationData.matrixItem else null - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device return MessageLocationItem_() .attributes(attributes) .locationData(locationContent.toLocationData()) @@ -352,7 +352,7 @@ class MessageItemFactory @Inject constructor( .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder) .highlighted(highlight) .leftGuideline(avatarSizeProvider.leftGuideline) - // Tchap: Use for the Antivirus + // TCHAP Use for the Antivirus .elementToDecrypt(messageContent.encryptedFileInfo?.toElementToDecrypt()) .contentScannerStateTracker(contentScannerStateTracker) } @@ -418,7 +418,7 @@ class MessageItemFactory @Inject constructor( .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder) .highlighted(highlight) .leftGuideline(avatarSizeProvider.leftGuideline) - // Tchap: Use for the Antivirus + // TCHAP Use for the Antivirus .elementToDecrypt(messageContent.encryptedFileInfo?.toElementToDecrypt()) .contentScannerStateTracker(contentScannerStateTracker) } @@ -483,7 +483,7 @@ class MessageItemFactory @Inject constructor( .highlighted(highlight) .filename(messageContent.body) .iconRes(R.drawable.ic_paperclip) - // Tchap: Use for the Antivirus + // TCHAP Use for the Antivirus .contentScannerStateTracker(contentScannerStateTracker) .encryptedFileInfo(messageContent.encryptedFileInfo?.toElementToDecrypt()) } @@ -550,7 +550,7 @@ class MessageItemFactory @Inject constructor( .imageContentRenderer(imageContentRenderer) .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder) .playable(playable) - // Tchap: Use for the Antivirus + // TCHAP Use for the Antivirus .contentScannerStateTracker(contentScannerStateTracker) .highlighted(highlight) .mediaData(data) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 36d2d1565c..e14436e7fe 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -71,7 +71,7 @@ class NoticeEventFormatter @Inject constructor( fun format(timelineEvent: TimelineEvent, isDm: Boolean): CharSequence? { val event = timelineEvent.root - // Tchap: Hide the domain if we are in DM. + // TCHAP Hide the domain if we are in DM. val senderName = if (isDm) { TchapUtils.getNameFromDisplayName(timelineEvent.senderInfo.disambiguatedDisplayName) } else { @@ -690,7 +690,7 @@ class NoticeEventFormatter @Inject constructor( prevEventContent: RoomMemberContent?, isDm: Boolean ): String? { - // Tchap: Remove domain name in case of DM. + // TCHAP Remove domain name in case of DM. val senderDisplayName = senderName ?: event.senderId ?: "" val targetDisplayName: String = if (isDm) { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt index 6e25b123ad..cf07a2addb 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt @@ -37,7 +37,7 @@ class MatrixItemColorProvider @Inject constructor( @ColorInt fun getColor(matrixItem: MatrixItem): Int { return cache.getOrPut(matrixItem.id) { - // Tchap: Apply Tchap theme + // TCHAP Apply Tchap theme colorProvider.getColor(R.color.element_room_01) // colorProvider.getColor( // when (matrixItem) { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt index 6d3265c416..93c2fb5e47 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt @@ -44,7 +44,7 @@ object TimelineDisplayableEvents { EventType.CALL_REJECT, EventType.ENCRYPTED, EventType.STATE_ROOM_ENCRYPTION, - // Tchap: Unused in Tchap + // TCHAP Unused in Tchap // EventType.STATE_ROOM_GUEST_ACCESS, EventType.STATE_ROOM_THIRD_PARTY_INVITE, EventType.STICKER, @@ -63,7 +63,7 @@ object TimelineDisplayableEvents { fun TimelineEvent.isRoomConfiguration(roomCreatorUserId: String?): Boolean { return root.isStateEvent() && when (root.getClearType()) { - // Tchap: Unused in Tchap + // TCHAP Unused in Tchap // EventType.STATE_ROOM_GUEST_ACCESS, EventType.STATE_ROOM_HISTORY_VISIBILITY, EventType.STATE_ROOM_JOIN_RULES, diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt index afe3a2dc2b..46375a812f 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt @@ -88,7 +88,7 @@ abstract class AbsMessageItem( } if (attributes.informationData.messageLayout.showDisplayName) { holder.memberNameView.isVisible = true - // Tchap: Remove domain name in case of DM. + // TCHAP Remove domain name in case of DM. holder.memberNameView.text = if (attributes.informationData.isDirect) { TchapUtils.getNameFromDisplayName(attributes.informationData.memberName.toString()) } else { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt index 152a4ee748..d056e65165 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt @@ -53,13 +53,13 @@ abstract class AbsMessageLocationItem( var pinMatrixItem: MatrixItem? = null @EpoxyAttribute - var mapZoom: Double = 0.0 // Tchap: Generate and load map on device + var mapZoom: Double = 0.0 // TCHAP Generate and load map on device @EpoxyAttribute - var mapSize: Size = Size(0, 0) // Tchap: Replace width and height by a size object + var mapSize: Size = Size(0, 0) // TCHAP Replace width and height by a size object @EpoxyAttribute - lateinit var tchapMapRenderer: TchapMapRenderer // Tchap: Generate and load map on device + lateinit var tchapMapRenderer: TchapMapRenderer // TCHAP Generate and load map on device @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var locationPinProvider: LocationPinProvider? = null @@ -71,7 +71,7 @@ abstract class AbsMessageLocationItem( } override fun unbind(holder: H) { - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device tchapMapRenderer.clear(holder.staticMapImageView, holder.staticMapPinImageView) super.unbind(holder) } @@ -90,7 +90,7 @@ abstract class AbsMessageLocationItem( height = mapSize.height } - // Tchap: Generate and load map on device + // TCHAP Generate and load map on device tchapMapRenderer.render( location, mapZoom, diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt index dfde57c835..af9a82c7af 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt @@ -98,7 +98,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem { - // Tchap: Not used in Tchap + // TCHAP Not used in Tchap // roomListViewModel.handle(RoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_LOW_PRIORITY)) } is RoomListQuickActionsSharedAction.Leave -> { diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt index b52785dfbd..63516769ea 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt @@ -221,7 +221,7 @@ class RoomListSectionBuilder( liveSuggestedRooms.postValue(it) }.launchIn(viewModelScope) - // Tchap: bypass temporarily live suggested rooms to prevent infinite load + // TCHAP bypass temporarily live suggested rooms to prevent infinite load // sections.add( // RoomsSection( // sectionName = stringProvider.getString(R.string.suggested_header), diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt index 391a75513b..7e8f42ab1d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt @@ -105,7 +105,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel(R.layo @EpoxyAttribute var showSelected: Boolean = false - // Tchap items + // TCHAP items @EpoxyAttribute lateinit var roomType: TchapRoomType @@ -121,22 +121,22 @@ abstract class RoomSummaryItem : VectorEpoxyModel(R.layo it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) itemLongClickListener?.onLongClick(it) ?: false } - // Tchap: remove domain from the display name + // TCHAP remove domain from the display name holder.titleView.text = TchapUtils.getRoomNameFromDisplayName(matrixItem.getBestName(), roomType) holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State.Count(unreadNotificationCount, showHighlighted)) holder.unreadIndentIndicator.isVisible = hasUnreadMessage holder.draftView.isVisible = hasDraft avatarRenderer.render(matrixItem, holder.avatarImageView) - // Tchap: deleted in Tchap layout + // TCHAP deleted in Tchap layout // holder.roomAvatarDecorationImageView.render(encryptionTrustLevel) // holder.roomAvatarPublicDecorationImageView.isVisible = izPublic - // Tchap: Set invisible instead of gone to keep view size + // TCHAP Set invisible instead of gone to keep view size holder.roomAvatarFailSendingImageView.isInvisible = !hasFailedSending renderSelection(holder, showSelected) holder.roomAvatarPresenceImageView.render(showPresence, userPresence) - // Tchap items + // TCHAP items renderTchapRoomType(holder) if (useSingleLineForLastEvent) { @@ -213,14 +213,14 @@ abstract class RoomSummaryItem : VectorEpoxyModel(R.layo val avatarCheckedImageView by bind(R.id.roomAvatarCheckedImageView) val avatarImageView by bind(R.id.roomAvatarImageView) - // Tchap: deleted in Tchap layout + // TCHAP deleted in Tchap layout // val roomAvatarDecorationImageView by bind(R.id.roomAvatarDecorationImageView) // val roomAvatarPublicDecorationImageView by bind(R.id.roomAvatarPublicDecorationImageView) val roomAvatarFailSendingImageView by bind(R.id.roomAvatarFailSendingImageView) val roomAvatarPresenceImageView by bind(R.id.roomAvatarPresenceImageView) val rootView by bind(R.id.itemRoomLayout) - // Tchap items + // TCHAP items val domainNameView by bind(R.id.tchapRoomDomainNameView) val avatarRoomTypeImageView by bind(R.id.tchapRoomTypeImageView) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt index 5b7407cb13..172db1c19d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt @@ -106,7 +106,7 @@ class RoomSummaryItemFactory @Inject constructor( changeMembershipState: ChangeMembershipState, listener: RoomListListener? ): VectorEpoxyModel<*> { - // Tchap: userXXX invited you + // TCHAP userXXX invited you val secondLine = roomSummary.inviterId?.let { userId -> val displayName = sessionHolder.getSafeActiveSession()?.userService()?.getUser(userId)?.toMatrixItem()?.getBestName() ?.let { displayName -> @@ -129,7 +129,7 @@ class RoomSummaryItemFactory @Inject constructor( .changeMembershipState(changeMembershipState) .acceptListener { listener?.onAcceptRoomInvitation(roomSummary) } .rejectListener { listener?.onRejectRoomInvitation(roomSummary) } - // Tchap: There is no preview for invites + // TCHAP There is no preview for invites // .listener { listener?.onRoomClicked(roomSummary) } } @@ -204,7 +204,7 @@ class RoomSummaryItemFactory @Inject constructor( .useSingleLineForLastEvent(singleLineLastEvent) .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false } .itemClickListener { onClick?.invoke(roomSummary) } - // Tchap: Used only for Tchap + // TCHAP Used only for Tchap .roomType(RoomUtils.getRoomType(roomSummary)) private fun createCenteredRoomSummaryItem( diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt index d512afcdfe..9e608b61ab 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeLayoutPreferencesStore.kt @@ -44,7 +44,7 @@ class HomeLayoutPreferencesStore @Inject constructor( .distinctUntilChanged() val areFiltersEnabledFlow: Flow = context.dataStore.data - .map { preferences -> preferences[areFiltersEnabled].orTrue() } // Tchap: filter activate by default + .map { preferences -> preferences[areFiltersEnabled].orTrue() } // TCHAP filter activate by default .distinctUntilChanged() val isAZOrderingEnabledFlow: Flow = context.dataStore.data diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt index 0c73dbbc90..9ee0299227 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt @@ -96,7 +96,7 @@ class ReleaseNotesFragment : VectorBaseFragment( R.string.onboarding_new_app_layout_welcome_message, R.drawable.ill_app_layout_onboarding_rooms ), - // Tchap: No space function + // TCHAP No space function /* ReleaseCarouselData.Item( R.string.onboarding_new_app_layout_spaces_title, R.string.onboarding_new_app_layout_spaces_message, diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt index 807fd4b4ef..27d58a5873 100644 --- a/vector/src/main/java/im/vector/app/features/location/Config.kt +++ b/vector/src/main/java/im/vector/app/features/location/Config.kt @@ -16,12 +16,12 @@ package im.vector.app.features.location -// Tchap: Generate and load map on device +// TCHAP Generate and load map on device // const val MAP_BASE_URL = "https://api.maptiler.com/maps/streets/style.json" // const val STATIC_MAP_BASE_URL = "https://api.maptiler.com/maps/basic/static/" -// Tchap: Tiles from IGN +// TCHAP Tiles from IGN // const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json" -// Tchap: Tiles from geo.data.gouv.fr +// TCHAP Tiles from geo.data.gouv.fr const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json" const val DEFAULT_PIN_ID = "DEFAULT_PIN_ID" diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt index 895ec0a4cb..c0a8d13588 100644 --- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt +++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt @@ -40,7 +40,7 @@ class UrlMapProvider @Inject constructor( ?.mapStyleUrl return upstreamMapUrl ?: fallbackMapUrl } -// Tchap: Generate and load map on device +// TCHAP Generate and load map on device // fun buildStaticMapUrl( // locationData: LocationData, // zoom: Double, diff --git a/vector/src/main/java/im/vector/app/features/login/SignMode.kt b/vector/src/main/java/im/vector/app/features/login/SignMode.kt index 7dff31ae28..3438dbe41e 100644 --- a/vector/src/main/java/im/vector/app/features/login/SignMode.kt +++ b/vector/src/main/java/im/vector/app/features/login/SignMode.kt @@ -17,10 +17,10 @@ package im.vector.app.features.login enum class SignMode { - // Tchap: Login with email + // TCHAP Login with email TchapSignIn, - // Tchap: Account creation + // TCHAP Account creation TchapSignUp, Unknown, diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt index 07c07738db..e3dde8aa07 100644 --- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt @@ -195,7 +195,7 @@ class DefaultNavigator @Inject constructor( fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast()) return } - // Tchap: feature flag + // TCHAP feature flag if (!Config.SHOW_SPACES) { Timber.w("Spaces are not available in this version, navigation aborted") return diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt index 0537ad8042..4167a4d006 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt @@ -153,7 +153,7 @@ class OnboardingViewModel @AssistedInject constructor( } } - // Tchap + // TCHAP private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash() @@ -411,7 +411,7 @@ class OnboardingViewModel @AssistedInject constructor( copy(selectedAuthenticationState = SelectedAuthenticationState(authDescription)) } reAuthHelper.data = password - // Tchap: Need to override next stage to verify the email which is mandatory before creating a Tchap account + // TCHAP Need to override next stage to verify the email which is mandatory before creating a Tchap account val overrideNextStage = email?.let { { handleRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Email(email))) } } handleRegisterAction( RegisterAction.CreateAccount( @@ -596,7 +596,7 @@ class OnboardingViewModel @AssistedInject constructor( runCatching { loginWizard.resetPasswordMailConfirmed(newPassword, logoutAllDevices = logoutAllDevices) }.fold( onSuccess = { setState { copy(isLoading = false, resetState = ResetState()) } - val nextEvent = OnboardingViewEvents.OpenResetPasswordComplete // Tchap: always redirect to this screen + val nextEvent = OnboardingViewEvents.OpenResetPasswordComplete // TCHAP always redirect to this screen _viewEvents.post(nextEvent) }, onFailure = { @@ -740,7 +740,7 @@ class OnboardingViewModel @AssistedInject constructor( serverTypeOverride: ServerType?, postAction: suspend () -> Unit = {}, ) { - // Tchap + // TCHAP currentHomeServerConnectionConfig = homeServerConnectionConfig currentJob = viewModelScope.launch { @@ -775,7 +775,7 @@ class OnboardingViewModel @AssistedInject constructor( } private fun canEditServerSelectionError(@Suppress("UNUSED_PARAMETER") state: OnboardingViewState) = false - // Tchap: we should not be able to edit server + // TCHAP we should not be able to edit server // (state.onboardingFlow == OnboardingFlow.SignIn && vectorFeatures.isOnboardingCombinedLoginEnabled()) || // (state.onboardingFlow == OnboardingFlow.SignUp && vectorFeatures.isOnboardingCombinedRegisterEnabled()) @@ -981,7 +981,7 @@ class OnboardingViewModel @AssistedInject constructor( fun handleRegisterWith(action: AuthenticateAction.TchapRegister) { // TODO Tchap: restore the warning dialog for the external emails startTchapAuthenticationFlow(action.email) { - // Tchap registration doesn't require userName. + // TCHAP registration doesn't require userName. // The initialDeviceDisplayName is useless because the account will be created after the email validation (eventually on another device). // This first register request will link the account password with the returned session id (used in the following steps). checkPasswordPolicy(action.password) { diff --git a/vector/src/main/java/im/vector/app/features/onboarding/RegistrationWizardActionDelegate.kt b/vector/src/main/java/im/vector/app/features/onboarding/RegistrationWizardActionDelegate.kt index 20ad4370d8..db34dc08cc 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/RegistrationWizardActionDelegate.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/RegistrationWizardActionDelegate.kt @@ -103,7 +103,7 @@ sealed interface RegistrationResult { sealed interface RegisterAction { object StartRegistration : RegisterAction - // Tchap: username and initialDeviceName are not necessary to create an account + // TCHAP username and initialDeviceName are not necessary to create an account data class CreateAccount(val username: String?, val password: String, val initialDeviceName: String?) : RegisterAction data class AddThreePid(val threePid: RegisterThreePid) : RegisterAction diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt index 1fb2f9d269..03613b9bd7 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt @@ -52,7 +52,7 @@ class FtueAuthAccountCreatedFragment : } override fun updateWithState(state: OnboardingViewState) { - // Tchap: custom string + // TCHAP custom string val subtitle = getString(R.string.tchap_ftue_account_created_subtitle) views.accountCreatedSubtitle.text = subtitle val canPersonalize = state.personalizationState.supportsPersonalization() diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt index f983de214a..fb70bd1d26 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt @@ -138,7 +138,7 @@ class FtueAuthLoginFragment : // This can be called by the IME action, so deal with empty cases var error = 0 - // Tchap: custom error policy + // TCHAP custom error policy if (login.isEmpty() || !login.isEmail()) { views.loginFieldTil.error = getString(R.string.auth_invalid_email) error++ @@ -158,7 +158,7 @@ class FtueAuthLoginFragment : error++ } - // Tchap: password confirmation + // TCHAP password confirmation if (state.signMode == SignMode.TchapSignUp && password != views.tchapPasswordConfirmationField.text.toString()) { views.passwordFieldTil.error = getString(R.string.tchap_auth_password_dont_match) error++ @@ -225,7 +225,7 @@ class FtueAuthLoginFragment : views.loginNotice.text = getString(R.string.login_server_other_text) } ServerType.Unknown -> { - // Tchap: Hide views if empty + // TCHAP Hide views if empty views.loginServerIcon.isVisible = false views.loginTitle.isVisible = false views.loginNotice.isVisible = false diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt index d0678c9448..06767c3583 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt @@ -59,7 +59,7 @@ class FtueAuthResetPasswordEmailEntryFragment : override fun updateWithState(state: OnboardingViewState) { views.emailEntryHeaderSubtitle.text = getString( R.string.ftue_auth_reset_password_email_subtitle, - getString(R.string.app_name) // Tchap: do not show the server url + getString(R.string.app_name) // TCHAP do not show the server url ) } diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt index be225d05cf..45833a9779 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt @@ -91,7 +91,7 @@ class FtueAuthResetPasswordEntryFragment : private var showWarning: Boolean = true - // Tchap: Show warning once before changing the password + // TCHAP Show warning once before changing the password fun resetPassword() { if (showWarning) { showWarning = false diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt index d92b41bc12..5b55c4c977 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt @@ -59,7 +59,7 @@ import org.matrix.android.sdk.api.auth.registration.Stage import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms import org.matrix.android.sdk.api.extensions.tryOrNull -// Tchap: custom tag to separate the reset password screens from the initial login screen +// TCHAP custom tag to separate the reset password screens from the initial login screen private const val TCHAP_FRAGMENT_LOGIN_STAGE_TAG = "TCHAP_FRAGMENT_LOGIN_STAGE_TAG" private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG" private const val FRAGMENT_LOGIN_TAG = "FRAGMENT_LOGIN_TAG" @@ -236,7 +236,7 @@ class FtueAuthVariant( FRAGMENT_EDIT_HOMESERVER_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE ) - // Tchap: we should not edited server + // TCHAP we should not edited server // ensureEditServerBackstack() } OnboardingViewEvents.OpenCombinedLogin -> onStartCombinedLogin() diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt index 0b9d1891b6..86f2a14ab7 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt @@ -67,7 +67,7 @@ class FtueAuthWaitForEmailFragment : views.emailVerificationGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground()) views.emailVerificationTitle.text = getString(R.string.ftue_auth_email_verification_title) .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary)) - views.emailVerificationSubtitle.text = params.email // Tchap: email only + views.emailVerificationSubtitle.text = params.email // TCHAP email only views.emailVerificationResendEmail.debouncedClicks { hideWaitingForVerificationLoading() viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.SendAgainThreePid)) diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt index a4abfce415..6d3b970d73 100755 --- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt @@ -282,14 +282,14 @@ class BugReporter @Inject constructor( deviceId = session.sessionParams.deviceId olmVersion = session.cryptoService().getCryptoVersion(context, true) bugReportURL = session.sessionParams.homeServerUrl.removeSuffix("/") + BUG_REPORT_URL_SUFFIX - email = session.profileService().getThreePids().filterIsInstance().firstOrNull()?.email ?: "undefined" // Tchap: Add Email + email = session.profileService().getThreePids().filterIsInstance().firstOrNull()?.email ?: "undefined" // TCHAP Add Email } if (!mIsCancelled) { val text = when (reportType) { - // Tchap: Use BuildConfig.FLAVOR_target instead of Element + // TCHAP Use BuildConfig.FLAVOR_target instead of Element ReportType.BUG_REPORT -> "[${BuildConfig.FLAVOR_target}] $bugDescription" - ReportType.VOIP -> "[${BuildConfig.FLAVOR_target}] [voip-feedback] $bugDescription" // Tchap: add VoIP report type + ReportType.VOIP -> "[${BuildConfig.FLAVOR_target}] [voip-feedback] $bugDescription" // TCHAP add VoIP report type ReportType.SUGGESTION -> "[${BuildConfig.FLAVOR_target}] [Suggestion] $bugDescription" ReportType.SPACE_BETA_FEEDBACK -> "[${BuildConfig.FLAVOR_target}] [spaces-feedback] $bugDescription" ReportType.THREADS_BETA_FEEDBACK -> "[${BuildConfig.FLAVOR_target}] [threads-feedback] $bugDescription" @@ -303,7 +303,7 @@ class BugReporter @Inject constructor( .addFormDataPart("app", rageShakeAppNameForReport(reportType)) .addFormDataPart("user_agent", matrix.getUserAgent()) .addFormDataPart("user_id", userId) - .addFormDataPart("email", email) // Tchap: Add Email + .addFormDataPart("email", email) // TCHAP Add Email .addFormDataPart("can_contact", canContact.toString()) .addFormDataPart("device_id", deviceId) .addFormDataPart("version", versionProvider.getVersion(longFormat = true)) @@ -377,7 +377,7 @@ class BugReporter @Inject constructor( ReportType.BUG_REPORT -> { /* nop */ } - // Tchap: add VoIP report type + // TCHAP add VoIP report type ReportType.VOIP -> { builder.addFormDataPart("label", "voip-feedback") builder.addFormDataPart("context", "voip") @@ -560,7 +560,7 @@ class BugReporter @Inject constructor( ) } - // Tchap: add connection type in VoIP report + // TCHAP add connection type in VoIP report private fun getConnectionType(): String { val connectivityManager = context.getSystemService()!! return if (sdkIntProvider.isAtLeast(Build.VERSION_CODES.M)) { @@ -582,7 +582,7 @@ class BugReporter @Inject constructor( } } - // Tchap: check if a headset is connected + // TCHAP check if a headset is connected private fun getAudioInterface() = if (isBluetoothHeadsetConnected()) "headset_bluetooth" else "device" private fun isBluetoothHeadsetConnected(): Boolean { diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt index 2266fbec8d..adb88cfdca 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt @@ -54,7 +54,7 @@ import javax.inject.Inject class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback { - // Tchap: No menu + // TCHAP No menu // VectorMenuProvider { @Inject lateinit var publicRoomsController: PublicRoomsController @@ -68,7 +68,7 @@ class PublicRoomsFragment : return FragmentPublicRoomsBinding.inflate(inflater, container, false) } - // Tchap: Not displayed in Tchap + // TCHAP Not displayed in Tchap // override fun getMenuRes() = R.menu.menu_room_directory override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -110,7 +110,7 @@ class PublicRoomsFragment : super.onDestroyView() } - // Tchap: Not used in Tchap + // TCHAP Not used in Tchap // override fun handleMenuItemSelected(item: MenuItem): Boolean { // return when (item.itemId) { // R.id.menu_room_directory_change_protocol -> { diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt index d82d614265..545bef5b3b 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt @@ -194,7 +194,7 @@ class RoomDirectoryViewModel @AssistedInject constructor( val mutex = Mutex() currentJob = viewModelScope.launch { - // Tchap: Add forums list from all instances + // TCHAP Add forums list from all instances roomDirectories.map { roomDirectoryServer -> val roomDirectoryData = roomDirectoryServer.protocols.first() async { @@ -240,7 +240,7 @@ class RoomDirectoryViewModel @AssistedInject constructor( currentJob = null - // Tchap: Move setState outside of the map + // TCHAP Move setState outside of the map setState { copy( asyncPublicRoomsRequest = Success(Unit), diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt index 2cb9151760..e088fb274d 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt @@ -272,7 +272,7 @@ class CreateRoomViewModel @AssistedInject constructor( ) } - // Tchap: We use a custom configuration + // TCHAP We use a custom configuration // when (state.roomJoinRules) { // RoomJoinRules.PUBLIC -> { // // Directory visibility diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt index 37d7ace672..47a215e121 100644 --- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt @@ -101,7 +101,7 @@ class RoomMemberProfileController @Inject constructor( val host = this if (state.isRoomEncrypted) { - // Tchap: Hide the security part, we keep the footer. + // TCHAP Hide the security part, we keep the footer. genericFooterItem { id("verify_footer") text(host.stringProvider.getString(R.string.room_profile_encrypted_subtitle).toEpoxyCharSequence()) @@ -192,7 +192,7 @@ class RoomMemberProfileController @Inject constructor( buildProfileSection(stringProvider.getString(R.string.room_profile_section_more)) if (!state.isMine) { - // Tchap: Both myUserId and otherUserId are not external + // TCHAP Both myUserId and otherUserId are not external if (!TchapUtils.isExternalTchapUser(session.myUserId) || !TchapUtils.isExternalTchapUser(state.userId)) { buildProfileAction( id = "direct", @@ -203,7 +203,7 @@ class RoomMemberProfileController @Inject constructor( } } - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // buildProfileAction( // id = "overrideColor", // editable = false, diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt index 3539f576f2..aefad6e3f6 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt @@ -27,6 +27,6 @@ sealed class RoomProfileAction : VectorViewModelAction { object ShareRoomProfile : RoomProfileAction() object CreateShortcut : RoomProfileAction() object RestoreEncryptionState : RoomProfileAction() - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" // data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction() } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt index 98790e0863..8633ee84c4 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt @@ -70,7 +70,7 @@ class RoomProfileController @Inject constructor( fun doMigrateToVersion(newVersion: String) fun restoreEncryptionState() - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" // fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean) fun openGlobalBlockSettings() } @@ -182,7 +182,7 @@ class RoomProfileController @Inject constructor( } } - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // buildEncryptionAction(data.actionPermissions, roomSummary) if (roomSummary.isEncrypted && !encryptionMisconfigured) { @@ -207,7 +207,7 @@ class RoomProfileController @Inject constructor( } } } - // Tchap: don't display option "Never send messages to unverified devices in room" + // TCHAP don't display option "Never send messages to unverified devices in room" // else { // // per room setting is available // val shouldBlockUnverified = data.encryptToVerifiedDeviceOnly.invoke() @@ -278,7 +278,7 @@ class RoomProfileController @Inject constructor( ) } - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // buildProfileAction( // id = "poll_history", // title = stringProvider.getString(R.string.room_profile_section_more_polls), @@ -321,7 +321,7 @@ class RoomProfileController @Inject constructor( // Advanced buildProfileSection(stringProvider.getString(R.string.room_settings_category_advanced_title)) - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // buildProfileAction( // id = "alias", // title = stringProvider.getString(R.string.room_settings_alias_title), diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index ab35c368c2..61ba2abb6a 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt @@ -148,7 +148,7 @@ class RoomProfileFragment : private fun setupClicks() { // Shortcut to room settings - // Tchap: Disable the room settings access + // TCHAP Disable the room settings access // setOf( // headerViews.roomProfileNameView, // views.matrixProfileToolbarTitleView @@ -301,7 +301,7 @@ class RoomProfileFragment : val isPublicRoom = roomProfileViewModel.isPublicRoom() val message = buildString { append(getString(R.string.room_participants_leave_prompt_msg)) - // Tchap: Add custom string when the user is the last admin of the room + // TCHAP Add custom string when the user is the last admin of the room if (!isLastAdmin) { if (!isPublicRoom) { append("\n\n") @@ -360,7 +360,7 @@ class RoomProfileFragment : ) } - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" // override fun setEncryptedToVerifiedDevicesOnly(enabled: Boolean) { // roomProfileViewModel.handle(RoomProfileAction.SetEncryptToVerifiedDeviceOnly(enabled)) // } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt index fdf8e82fa0..b31fc1f81b 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt @@ -182,7 +182,7 @@ class RoomProfileViewModel @AssistedInject constructor( } } - // Tchap: Observe the admin members to know if the user is the last admin of the room + // TCHAP Observe the admin members to know if the user is the last admin of the room private fun observeAdminMembers() { val roomMemberQueryParams = roomMemberQueryParams { displayName = QueryStringValue.IsNotEmpty @@ -218,7 +218,7 @@ class RoomProfileViewModel @AssistedInject constructor( is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile() RoomProfileAction.CreateShortcut -> handleCreateShortcut() RoomProfileAction.RestoreEncryptionState -> restoreEncryptionState() - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" // is RoomProfileAction.SetEncryptToVerifiedDeviceOnly -> setEncryptToVerifiedDeviceOnly(action.enabled) } } @@ -291,7 +291,7 @@ class RoomProfileViewModel @AssistedInject constructor( } } - // Tchap: force to false to deactivate "Never send messages to unverified devices in room" + // TCHAP force to false to deactivate "Never send messages to unverified devices in room" // private fun setEncryptToVerifiedDeviceOnly(enabled: Boolean) { // session.coroutineScope.launch { // session.cryptoService().setRoomBlockUnverifiedDevices(room.roomId, enabled) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt index e96ab34cc3..24649b27b3 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt @@ -149,7 +149,7 @@ class RoomSettingsController @Inject constructor( buildRoomAccessRules(data, roomType) - // Tchap: Disable "Allow guest to join" switch + // TCHAP Disable "Allow guest to join" switch // val isPublic = (data.newRoomJoinRules.newJoinRules ?: data.currentRoomJoinRules) == RoomJoinRules.PUBLIC // if (vectorPreferences.developerMode() && isPublic) { // val guestAccess = data.newRoomJoinRules.newGuestAccess ?: data.currentGuestAccess diff --git a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt index bb91d17f8c..f513a4fd6f 100644 --- a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt +++ b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt @@ -39,11 +39,11 @@ enum class BackgroundSyncMode { FDROID_BACKGROUND_SYNC_MODE_DISABLED; companion object { - // Tchap: Force a default value: 120 sec + // TCHAP Force a default value: 120 sec const val DEFAULT_SYNC_DELAY_SECONDS = 120 const val DEFAULT_SYNC_TIMEOUT_SECONDS = 6 - // Tchap: Force a minimum value: 10 sec + // TCHAP Force a minimum value: 10 sec const val MINIMUM_SYNC_DELAY_SECONDS = 10 fun fromString(value: String?): BackgroundSyncMode = values().firstOrNull { it.name == value } diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt index 87512fad4d..0a13a4deb7 100755 --- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt @@ -747,7 +747,7 @@ class VectorPreferences @Inject constructor( * @return true if the markdown is enabled */ fun isMarkdownEnabled(): Boolean { - // Tchap: Enable markdown by default + // TCHAP Enable markdown by default return defaultPrefs.getBoolean(SETTINGS_ENABLE_MARKDOWN_KEY, true) } @@ -993,7 +993,7 @@ class VectorPreferences @Inject constructor( * The user does not allow screenshots of the application. */ fun useFlagSecure(): Boolean { - // Tchap: Screenshot is allowed when developer mode is enabled or for Gplay Pre-prod and Dev versions only. + // TCHAP Screenshot is allowed when developer mode is enabled or for Gplay Pre-prod and Dev versions only. return (!developerMode() && (BuildConfig.FLAVOR_store != "gplay" || BuildConfig.FLAVOR_target == "tchap")) } @@ -1098,7 +1098,7 @@ class VectorPreferences @Inject constructor( } fun prefSpacesShowAllRoomInHome(): Boolean { - // Tchap: Show all rooms in the home while the spaces are hidden + // TCHAP Show all rooms in the home while the spaces are hidden return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, Config.SPACES_SHOW_ALL_IN_HOME) } diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt index 3639bfc257..67cebadecb 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt @@ -217,7 +217,7 @@ class VectorSettingsGeneralFragment : } } - // Tchap: Displayname cannot change + // TCHAP Displayname cannot change // // Display name // mDisplayNamePreference.let { // it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> @@ -240,7 +240,7 @@ class VectorSettingsGeneralFragment : mPasswordPreference.isVisible = false } - // Tchap: User directory visibility + // TCHAP User directory visibility hideFromUsersDirectoryPreference.let { it.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ -> onHideFromUsersDirectoryClick() @@ -617,7 +617,7 @@ class VectorSettingsGeneralFragment : } } - // Tchap: Displayname cannot change + // TCHAP Displayname cannot change // /** // * Update the displayname. // */ 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 a054c39fbb..63588b1efb 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 @@ -50,7 +50,7 @@ class VectorSettingsRootFragment : override fun bindPref() { tintIcons() - // Tchap: Manage new FAQ entry + // TCHAP Manage new FAQ entry findPreference(VectorPreferences.SETTINGS_HELP_PREFERENCE_KEY)!! .onPreferenceClickListener = Preference.OnPreferenceClickListener { if (firstThrottler.canHandle() is FirstThrottler.CanHandlerResult.Yes) { @@ -59,7 +59,7 @@ class VectorSettingsRootFragment : false } - // Tchap: Manage labs entry. + // TCHAP Manage labs entry. val myUserDisplayName = session.getUserOrDefault(session.myUserId).toMatrixItem().getBestName() findPreference(VectorPreferences.SETTINGS_LABS_PREFERENCE_KEY)!! .isVisible = vectorFeatures.tchapIsLabsVisible(TchapUtils.getDomainFromDisplayName(myUserDisplayName)) diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 58921e05a1..8ec8fbf983 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -228,12 +228,12 @@ class VectorSettingsSecurityPrivacyFragment : BootstrapBottomSheet.show(parentFragmentManager, SetupMode.NORMAL) true } - // Tchap: remove "Manage backup" button because Secure backup is not activated + // TCHAP remove "Manage backup" button because Secure backup is not activated manageBackupPref.isVisible = false } else { // just hide all, you can't setup from here // you should synchronize to get gossips - // Tchap: here, the section is hidden on Element. + // TCHAP here, the section is hidden on Element. // In Tchap, we want to show it. secureBackupCategory.isVisible = true secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup) @@ -243,7 +243,7 @@ class VectorSettingsSecurityPrivacyFragment : } true } - // Tchap: remove "Manage backup" button because Secure backup is not activated + // TCHAP remove "Manage backup" button because Secure backup is not activated manageBackupPref.isVisible = false } } else { @@ -313,7 +313,7 @@ class VectorSettingsSecurityPrivacyFragment : ) } - // Tchap: don't modify ignored users icon + // TCHAP don't modify ignored users icon // ignoredUsersPreference.icon = activity?.let { // ThemeUtils.tintDrawable( // it, diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt index 7d0da34afd..1866fd351d 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt @@ -17,7 +17,7 @@ package im.vector.app.features.settings object VectorSettingsUrls { - // Tchap: Redirect to Tchap FAQ + // TCHAP Redirect to Tchap FAQ const val HELP = "https://www.tchap.gouv.fr/faq" const val COPYRIGHT = "https://element.io/copyright" const val TAC = "https://www.tchap.gouv.fr/tac.html" diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt index aade371d43..b53f23fb66 100644 --- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt @@ -50,11 +50,11 @@ class CrossSigningSettingsController @Inject constructor( titleIconResourceId(R.drawable.ic_shield_trusted) title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_complete).toEpoxyCharSequence()) } - // Tchap: don't display "Reset cross-signing" button + // TCHAP don't display "Reset cross-signing" button // genericButtonItem { // id("Reset") // text(host.stringProvider.getString(R.string.reset_cross_signing)) -// textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // Tchap +// textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // TCHAP // buttonClickAction { // host.interactionListener?.didTapInitializeCrossSigning() // } @@ -69,7 +69,7 @@ class CrossSigningSettingsController @Inject constructor( genericButtonItem { id("Reset") text(host.stringProvider.getString(R.string.reset_cross_signing)) - textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // Tchap + textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // TCHAP buttonClickAction { host.interactionListener?.didTapInitializeCrossSigning() } @@ -78,13 +78,13 @@ class CrossSigningSettingsController @Inject constructor( data.xSigningIsEnableInAccount -> { genericItem { id("enable") - titleIconResourceId(R.drawable.ic_tchap_cancel) // Tchap icon + titleIconResourceId(R.drawable.ic_tchap_cancel) // TCHAP icon title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_not_trusted).toEpoxyCharSequence()) } genericButtonItem { id("Reset") text(host.stringProvider.getString(R.string.initialize_cross_signing)) - textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // Tchap + textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // TCHAP buttonClickAction { host.interactionListener?.didTapInitializeCrossSigning() } diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt index 9de903a3c6..e697be25ad 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt @@ -88,7 +88,7 @@ abstract class DeviceItem : VectorEpoxyModel(R.layout.item_de holder.trustIcon.renderDeviceShield(shield) - // Tchap: Show the shield only in this view on Tchap + // TCHAP Show the shield only in this view on Tchap holder.trustIcon.visibility = View.VISIBLE } else { holder.trustIcon.renderDeviceShield(null) diff --git a/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt b/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt index 40d6b8a1c4..9e6e702d14 100644 --- a/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt +++ b/vector/src/main/java/im/vector/app/features/settings/legals/ElementLegals.kt @@ -30,10 +30,10 @@ class ElementLegals @Inject constructor( */ fun getData(): List { return listOf( - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // ServerPolicy(stringProvider.getString(R.string.settings_copyright), VectorSettingsUrls.COPYRIGHT), ServerPolicy(stringProvider.getString(R.string.settings_app_term_conditions), VectorSettingsUrls.TAC) - // Tchap: Hidden in Tchap + // TCHAP Hidden in Tchap // ServerPolicy(stringProvider.getString(R.string.settings_privacy_policy), VectorSettingsUrls.PRIVACY_POLICY) ) } diff --git a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsController.kt b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsController.kt index b6c88bf7a2..84388885c3 100644 --- a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsController.kt @@ -46,7 +46,7 @@ class LegalsController @Inject constructor( override fun buildModels(data: LegalsState) { buildAppSection() - // Tchap: Hide these sections until there is nothing to display (no specific HS / IS policies) + // TCHAP Hide these sections until there is nothing to display (no specific HS / IS policies) // buildHomeserverSection(data) // buildIdentityServerSection(data) buildThirdPartyNotices() diff --git a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt index 9d4fb3a26e..fa9e0b9863 100644 --- a/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/legals/LegalsFragment.kt @@ -99,7 +99,7 @@ class LegalsFragment : activity?.displayInWebView(url) } url == VectorSettingsUrls.TAC -> { - // Tchap: the Term And Conditions url is detected as a permalink (same prefix), which make the application fail to open it from + // TCHAP the Term And Conditions url is detected as a permalink (same prefix), which make the application fail to open it from // ChromeCustomTab, so we open it here directly in a WebView val intent = VectorWebViewActivity.getIntent(requireActivity(), url, resources.getString(R.string.settings_app_term_conditions)) activity?.startActivity(intent) diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt index 5d126eda09..72f102fcde 100644 --- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt @@ -269,7 +269,7 @@ class VectorSettingsNotificationFragment : emails.forEach { (emailPid, isEnabled) -> val pref = VectorSwitchPreference(requireContext()) pref.title = resources.getString(R.string.settings_notification_emails_enable_for_email, emailPid.email) - // Tchap: Add notification email description + // TCHAP Add notification email description pref.summary = resources.getString(R.string.tchap_settings_notification_emails_summary) pref.isChecked = isEnabled pref.setTransactionalSwitchChangeListener(lifecycleScope) { isChecked -> diff --git a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt index f613036af2..e0691890a6 100755 --- a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt +++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt @@ -63,7 +63,7 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute if (newState == SyncState.NoNetwork) { val isAirplaneModeOn = context.isAirplaneModeOn() - // Tchap: Add service status URL + // TCHAP Add service status URL val statusLink = context.getString(R.string.tchap_no_connection_service_status) val spannable = SpannableString("${context.getString(R.string.no_connectivity_to_the_server_indicator)} $statusLink") spannable.setSpan(StyleSpan(Typeface.BOLD), spannable.length - statusLink.length, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt index 63d41c4a78..592b7ec7b3 100644 --- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt @@ -89,7 +89,7 @@ class UserListViewModel @AssistedInject constructor( } init { - // Tchap: Force user consent to true, we don't want to display the consent banner + // TCHAP Force user consent to true, we don't want to display the consent banner if (!session.identityService().getUserConsent()) { session.identityService().setUserConsent(true) } diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt index f9beb02e56..687930841e 100644 --- a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt @@ -112,7 +112,7 @@ class ServerBackupStatusViewModel @AssistedInject constructor( private val keyBackupFlow = MutableSharedFlow(0) init { - // Tchap: if key backup is not supported, do nothing + // TCHAP if key backup is not supported, do nothing if (vectorFeatures.tchapIsKeyBackupEnabled()) { init() } diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt index c198631ebf..4d8bff8f55 100644 --- a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt @@ -74,7 +74,7 @@ class SignoutCheckViewModel @AssistedInject constructor( companion object : MavericksViewModelFactory by hiltMavericksViewModelFactory() init { - // Tchap: init when key backup is supported + // TCHAP init when key backup is supported if (isKeyBackupSupported()) { init() } diff --git a/vector/src/test/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactoryTest.kt b/vector/src/test/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactoryTest.kt index 748a1f9f01..f88d7e5748 100644 --- a/vector/src/test/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactoryTest.kt +++ b/vector/src/test/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactoryTest.kt @@ -27,7 +27,7 @@ class JitsiJWTFactoryTest { private val moshi = Moshi.Builder().build() private val stringToString = Types.newParameterizedType(Map::class.java, String::class.java, String::class.java) private val stringToAny = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java) -// Tchap: Disable Jitsi Tests +// TCHAP Disable Jitsi Tests // private lateinit var factory: JitsiJWTFactory // // @Before diff --git a/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt b/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt index ce89812c65..5dbbb4dc4c 100644 --- a/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt +++ b/vector/src/test/java/im/vector/app/features/command/CommandParserTest.kt @@ -75,7 +75,7 @@ class CommandParserTest { private fun test(message: String, expectedResult: ParsedCommand) { val commandParser = CommandParser(fakeVectorPreferences.instance) val result = commandParser.parseSlashCommand(message, null, false) - // Tchap: some commands are not allowed in Tchap, in this case the resulting command will be ParsedCommand.ErrorNotATchapCommand + // TCHAP some commands are not allowed in Tchap, in this case the resulting command will be ParsedCommand.ErrorNotATchapCommand result shouldBeIn arrayOf(expectedResult, ParsedCommand.ErrorNotATchapCommand) } } diff --git a/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt b/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt index 294858d57b..47df32c39c 100644 --- a/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt +++ b/vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt @@ -68,7 +68,7 @@ internal class DefaultNavigatorTest { navigator.switchToSpace(FakeContext().instance, spaceId, Navigator.PostSwitchSpaceAction.None) - // Tchap: Spaces are disabled + // TCHAP Spaces are disabled verify(exactly = 0) { spaceStateHandler.setCurrentSpace(spaceId) } // spaceStateHandler.verifySetCurrentSpace(spaceId) } diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt index 4727148754..89e57f19aa 100644 --- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt +++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt @@ -151,7 +151,7 @@ class OnboardingViewModelTest { .finish() } - // Tchap unit test + // TCHAP unit test @Test fun `given usecase screen enabled, when handling sign up splash action, then emits Tchap sign up`() = runTest { val test = viewModel.test() @@ -191,7 +191,7 @@ class OnboardingViewModelTest { .finish() } - // Tchap unit test + // TCHAP unit test @Test fun `given combined login enabled, when handling sign in splash action, then emits Tchap sign in`() = runTest { val test = viewModel.test() @@ -520,7 +520,7 @@ class OnboardingViewModelTest { { copy(isLoading = true) }, { copy(isLoading = false) } ) - // Tchap: display error instead of server selection + // TCHAP display error instead of server selection .assertEvent { it is OnboardingViewEvents.Failure && it.throwable is Failure.NetworkConnection } // .assertEvents(OnboardingViewEvents.EditServerSelection) .finish() @@ -541,7 +541,7 @@ class OnboardingViewModelTest { { copy(isLoading = true) }, { copy(isLoading = false) } ) - // Tchap: display error instead of server selection + // TCHAP display error instead of server selection .assertEvent { it is OnboardingViewEvents.Failure && it.throwable is Failure.NetworkConnection } // .assertEvents(OnboardingViewEvents.EditServerSelection) .finish() @@ -957,7 +957,7 @@ class OnboardingViewModelTest { @Test fun `given can successfully start password reset, when resetting password, then emits confirmation email sent`() = runTest { - // Tchap: add get platform step + // TCHAP add get platform step viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignIn)) val test = viewModel.test() fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL) @@ -983,7 +983,7 @@ class OnboardingViewModelTest { @Test fun `given existing reset state, when resending reset password email, then triggers reset password and emits nothing`() = runTest { - // Tchap: add get platform step + // TCHAP add get platform step viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignIn, resetState = ResetState(AN_EMAIL, A_PASSWORD))) val test = viewModel.test() fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL) @@ -1040,7 +1040,7 @@ class OnboardingViewModelTest { { copy(isLoading = true) }, { copy(isLoading = false, resetState = ResetState()) } ) - .assertEvents(OnboardingViewEvents.OpenResetPasswordComplete) // Tchap: display a new screen + .assertEvents(OnboardingViewEvents.OpenResetPasswordComplete) // TCHAP display a new screen .finish() } diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt index 9e7c5854a9..a28f42a8dd 100644 --- a/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt +++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt @@ -37,7 +37,7 @@ class FakeStringProvider { } } - // Tchap: returns the given string for any resource + // TCHAP returns the given string for any resource fun givenResult(result: String) { every { instance.getString(any()) } returns result