Skip to content
Snippets Groups Projects
Commit 80140f47 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

sip: use • instead of * to mask password

Change-Id: If1ed0d1cdbd3b8cc523b68666afc812c09d0ef65
parent 66de288f
No related branches found
No related tags found
No related merge requests found
...@@ -149,7 +149,7 @@ class AdvancedAccountFragment : BasePreferenceFragment<AdvancedAccountPresenter> ...@@ -149,7 +149,7 @@ class AdvancedAccountFragment : BasePreferenceFragment<AdvancedAccountPresenter>
} }
is PasswordPreference -> { is PasswordPreference -> {
presenter.passwordPreferenceChanged(key, newValue) presenter.passwordPreferenceChanged(key, newValue)
preference.setSummary(if (TextUtils.isEmpty(newValue.toString())) "" else "******") preference.setSummary(if (TextUtils.isEmpty(newValue.toString())) "" else "••••••")
} }
else -> { else -> {
presenter.preferenceChanged(key, newValue) presenter.preferenceChanged(key, newValue)
......
...@@ -50,18 +50,12 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>() ...@@ -50,18 +50,12 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
false false
} }
private val changeBasicPreferenceListener = Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any -> private val changeBasicPreferenceListener = Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any ->
Log.i(TAG, "Changing preference " + preference.key + " to value:" + newValue) Log.i(TAG, "Changing preference ${preference.key} type ${preference.javaClass.simpleName} to value:$newValue")
val key = fromString(preference.key) ?: return@OnPreferenceChangeListener false val key = fromString(preference.key) ?: return@OnPreferenceChangeListener false
if (preference is TwoStatePreference) { if (preference is TwoStatePreference) {
presenter.twoStatePreferenceChanged(key, newValue) presenter.twoStatePreferenceChanged(key, newValue)
} else if (preference is PasswordPreference) { } else if (preference is PasswordPreference) {
val tmp = StringBuilder() preference.setSummary((newValue as CharSequence).map { "•" }.joinToString(""))
var i = 0
while (i < (newValue as String).length) {
tmp.append("*")
++i
}
preference.setSummary(tmp.toString())
presenter.passwordPreferenceChanged(key, newValue) presenter.passwordPreferenceChanged(key, newValue)
} else if (key === ConfigKey.ACCOUNT_USERNAME) { } else if (key === ConfigKey.ACCOUNT_USERNAME) {
presenter.userNameChanged(key, newValue) presenter.userNameChanged(key, newValue)
...@@ -173,11 +167,7 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>() ...@@ -173,11 +167,7 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
val value = details[confKey] val value = details[confKey]
(pref as EditTextPreference).text = value (pref as EditTextPreference).text = value
if (pref is PasswordPreference) { if (pref is PasswordPreference) {
val tmp = StringBuilder() pref.setSummary(value.map { "•" }.joinToString(""))
for (i in value.indices) {
tmp.append("*")
}
pref.setSummary(tmp.toString())
} else { } else {
pref.setSummary(value) pref.setSummary(value)
} }
...@@ -222,12 +212,8 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>() ...@@ -222,12 +212,8 @@ class GeneralAccountFragment : BasePreferenceFragment<GeneralAccountPresenter>()
companion object { companion object {
val TAG = GeneralAccountFragment::class.simpleName!! val TAG = GeneralAccountFragment::class.simpleName!!
private const val DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG" private const val DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG"
fun newInstance(accountId: String): GeneralAccountFragment { fun newInstance(accountId: String) = GeneralAccountFragment().apply {
val bundle = Bundle() arguments = Bundle().apply { putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId) }
bundle.putString(AccountEditionFragment.ACCOUNT_ID_KEY, accountId)
val generalAccountFragment = GeneralAccountFragment()
generalAccountFragment.arguments = bundle
return generalAccountFragment
} }
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment