caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

lints

Browse source
This commit is contained in:
Milos Kozak 2023-09-23 22:42:11 +02:00
parent 2cc46dd62a
commit 0b07efb30f
1 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -385,7 +385,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
if (pref.getKey().contains("password") || pref.getKey().contains("pin") || pref.getKey().contains("secret") || pref.getKey().contains("token")) { if (pref.getKey().contains("password") || pref.getKey().contains("pin") || pref.getKey().contains("secret") || pref.getKey().contains("token")) {
pref.setSummary("******") pref.setSummary("******")
} else if (pref.text != null) { } else if (pref.text != null) {
pref.dialogMessage = pref.dialogMessage
pref.setSummary(pref.text) pref.setSummary(pref.text)
} }
} }
@ -404,16 +403,14 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
rh.gs(info.nightscout.core.utils.R.string.key_settings_pin) rh.gs(info.nightscout.core.utils.R.string.key_settings_pin)
) )
if (pref is Preference) { if (pref is Preference && (pref.key != null) && (hmacPasswords.contains(pref.key))) {
if ((pref.key != null) && (hmacPasswords.contains(pref.key))) { if (sp.getString(pref.key, "").startsWith("hmac:")) {
if (sp.getString(pref.key, "").startsWith("hmac:")) { pref.summary = "******"
pref.summary = "******" } else {
if (pref.key.contains("pin")) {
pref.summary = rh.gs(info.nightscout.core.ui.R.string.pin_not_set)
} else { } else {
if (pref.key.contains("pin")) { pref.summary = rh.gs(info.nightscout.core.ui.R.string.password_not_set)
pref.summary = rh.gs(info.nightscout.core.ui.R.string.pin_not_set)
} else {
pref.summary = rh.gs(info.nightscout.core.ui.R.string.password_not_set)
}
} }
} }
} }
@ -423,10 +420,8 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
private fun initSummary(p: Preference, isSinglePreference: Boolean) { private fun initSummary(p: Preference, isSinglePreference: Boolean) {
p.isIconSpaceReserved = false // remove extra spacing on left after migration to androidx p.isIconSpaceReserved = false // remove extra spacing on left after migration to androidx
// expand single plugin preference by default // expand single plugin preference by default
if (p is PreferenceScreen && isSinglePreference) { if (p is PreferenceScreen && isSinglePreference && p.size > 0 && p.getPreference(0) is PreferenceCategory)
if (p.size > 0 && p.getPreference(0) is PreferenceCategory) (p.getPreference(0) as PreferenceCategory).initialExpandedChildrenCount = Int.MAX_VALUE
(p.getPreference(0) as PreferenceCategory).initialExpandedChildrenCount = Int.MAX_VALUE
}
if (p is PreferenceGroup) { if (p is PreferenceGroup) {
for (i in 0 until p.preferenceCount) { for (i in 0 until p.preferenceCount) {
initSummary(p.getPreference(i), isSinglePreference) initSummary(p.getPreference(i), isSinglePreference)
@ -439,46 +434,54 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
// We use Preference and custom editor instead of EditTextPreference // We use Preference and custom editor instead of EditTextPreference
// to hash password while it is saved and never have to show it, even hashed // to hash password while it is saved and never have to show it, even hashed
override fun onPreferenceTreeClick(preference: Preference): Boolean { override fun onPreferenceTreeClick(preference: Preference): Boolean =
context?.let { context -> context?.let { context ->
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_master_password)) { when (preference.key) {
passwordCheck.queryPassword(context, app.aaps.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, { rh.gs(info.nightscout.core.utils.R.string.key_master_password) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password) passwordCheck.queryPassword(context, app.aaps.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, {
}) passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password)
return true })
true
}
rh.gs(info.nightscout.core.utils.R.string.key_settings_password) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_password, info.nightscout.core.utils.R.string.key_settings_password)
true
}
rh.gs(info.nightscout.core.utils.R.string.key_bolus_password) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_password, info.nightscout.core.utils.R.string.key_bolus_password)
true
}
rh.gs(info.nightscout.core.utils.R.string.key_application_password) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_password, info.nightscout.core.utils.R.string.key_application_password)
true
}
rh.gs(info.nightscout.core.utils.R.string.key_settings_pin) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_pin, info.nightscout.core.utils.R.string.key_settings_pin, pinInput = true)
true
}
rh.gs(info.nightscout.core.utils.R.string.key_bolus_pin) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_pin, info.nightscout.core.utils.R.string.key_bolus_pin, pinInput = true)
true
}
rh.gs(info.nightscout.core.utils.R.string.key_application_pin) -> {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_pin, info.nightscout.core.utils.R.string.key_application_pin, pinInput = true)
true
}
// NSClient copy settings
rh.gs(info.nightscout.plugins.R.string.key_statuslights_copy_ns) -> {
nsSettingStatus.copyStatusLightsNsSettings(context)
true
}
else -> super.onPreferenceTreeClick(preference)
} }
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_settings_password)) { } ?: super.onPreferenceTreeClick(preference)
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_password, info.nightscout.core.utils.R.string.key_settings_password)
return true
}
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_bolus_password)) {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_password, info.nightscout.core.utils.R.string.key_bolus_password)
return true
}
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_application_password)) {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_password, info.nightscout.core.utils.R.string.key_application_password)
return true
}
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_settings_pin)) {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_pin, info.nightscout.core.utils.R.string.key_settings_pin, pinInput = true)
return true
}
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_bolus_pin)) {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_pin, info.nightscout.core.utils.R.string.key_bolus_pin, pinInput = true)
return true
}
if (preference.key == rh.gs(info.nightscout.core.utils.R.string.key_application_pin)) {
passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_pin, info.nightscout.core.utils.R.string.key_application_pin, pinInput = true)
return true
}
// NSClient copy settings
if (preference.key == rh.gs(info.nightscout.plugins.R.string.key_statuslights_copy_ns)) {
nsSettingStatus.copyStatusLightsNsSettings(context)
return true
}
}
return super.onPreferenceTreeClick(preference)
}
fun setFilter(filter: String) { fun setFilter(filter: String) {
this.filter = filter this.filter = filter