kopia lustrzana https://github.com/ryukoposting/Signal-Android
Gracefully handle and log when a radio list does not have a default selection.
rodzic
3cbf0933ff
commit
b5cc570363
|
@ -11,6 +11,7 @@ import androidx.annotation.CallSuper
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.google.android.material.switchmaterial.SwitchMaterial
|
import com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
|
import org.signal.core.util.logging.Log
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
import org.thoughtcrime.securesms.util.CommunicationActions
|
import org.thoughtcrime.securesms.util.CommunicationActions
|
||||||
import org.thoughtcrime.securesms.util.MappingAdapter
|
import org.thoughtcrime.securesms.util.MappingAdapter
|
||||||
|
@ -97,8 +98,13 @@ class RadioListPreferenceViewHolder(itemView: View) : PreferenceViewHolder<Radio
|
||||||
override fun bind(model: RadioListPreference) {
|
override fun bind(model: RadioListPreference) {
|
||||||
super.bind(model)
|
super.bind(model)
|
||||||
|
|
||||||
summaryView.visibility = View.VISIBLE
|
if (model.selected >= 0) {
|
||||||
summaryView.text = model.listItems[model.selected]
|
summaryView.visibility = View.VISIBLE
|
||||||
|
summaryView.text = model.listItems[model.selected]
|
||||||
|
} else {
|
||||||
|
summaryView.visibility = View.GONE
|
||||||
|
Log.w(TAG, "Detected a radio list without a default selection: ${model.dialogTitle}")
|
||||||
|
}
|
||||||
|
|
||||||
itemView.setOnClickListener {
|
itemView.setOnClickListener {
|
||||||
var selection = -1
|
var selection = -1
|
||||||
|
@ -128,6 +134,10 @@ class RadioListPreferenceViewHolder(itemView: View) : PreferenceViewHolder<Radio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val TAG = Log.tag(RadioListPreference::class.java)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MultiSelectListPreferenceViewHolder(itemView: View) : PreferenceViewHolder<MultiSelectListPreference>(itemView) {
|
class MultiSelectListPreferenceViewHolder(itemView: View) : PreferenceViewHolder<MultiSelectListPreference>(itemView) {
|
||||||
|
|
Ładowanie…
Reference in New Issue