From e046d17bf2d4e314343fb3a6dc552c83afe0cdba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 26 Jun 2020 14:30:49 +0200 Subject: [PATCH] Remove colored part, as user think they are links. --- .../crypto/recover/BootstrapMigrateBackupFragment.kt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt index 3e8f1c383e..710cee035c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt @@ -24,7 +24,6 @@ import android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE import android.text.InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD import android.view.View import android.view.inputmethod.EditorInfo -import androidx.core.text.toSpannable import androidx.core.view.isVisible import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState @@ -36,8 +35,6 @@ import im.vector.riotx.R import im.vector.riotx.core.extensions.hideKeyboard import im.vector.riotx.core.extensions.showPassword import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText import im.vector.riotx.core.utils.startImportTextFromFileIntent import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText @@ -45,9 +42,7 @@ import kotlinx.android.synthetic.main.fragment_bootstrap_migrate_backup.* import java.util.concurrent.TimeUnit import javax.inject.Inject -class BootstrapMigrateBackupFragment @Inject constructor( - private val colorProvider: ColorProvider -) : VectorBaseFragment() { +class BootstrapMigrateBackupFragment @Inject constructor() : VectorBaseFragment() { override fun getLayoutResId() = R.layout.fragment_bootstrap_migrate_backup @@ -117,8 +112,6 @@ class BootstrapMigrateBackupFragment @Inject constructor( val recKey = getString(R.string.bootstrap_migration_backup_recovery_key) bootstrapDescriptionText.text = getString(R.string.enter_account_password, recKey) - .toSpannable() - .colorizeMatchingText(recKey, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) bootstrapMigrateEditText.hint = recKey @@ -142,8 +135,6 @@ class BootstrapMigrateBackupFragment @Inject constructor( val recKey = getString(R.string.bootstrap_migration_use_recovery_key) bootstrapMigrateForgotPassphrase.text = getString(R.string.bootstrap_migration_with_passphrase_helper_with_link, recKey) - .toSpannable() - .colorizeMatchingText(recKey, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) bootstrapMigrateUseFile.isVisible = false }