Remove some code warnings
This commit is contained in:
parent
3a06f556f3
commit
b178bce693
2 changed files with 9 additions and 9 deletions
|
|
@ -105,7 +105,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
}
|
}
|
||||||
.setNegativeButton(R.string.settings_backup_apk_dialog_disable) { dialog, _ ->
|
.setNegativeButton(R.string.settings_backup_apk_dialog_disable) { dialog, _ ->
|
||||||
apkBackup.isChecked = enable
|
apkBackup.isChecked = false
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
}
|
}
|
||||||
.show()
|
.show()
|
||||||
|
|
@ -130,14 +130,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
|
||||||
viewModel.lastBackupTime.observe(viewLifecycleOwner, { time ->
|
viewModel.lastBackupTime.observe(viewLifecycleOwner) { time ->
|
||||||
setAppBackupStatusSummary(time)
|
setAppBackupStatusSummary(time)
|
||||||
})
|
}
|
||||||
|
|
||||||
val backupFiles: Preference = findPreference("backup_files")!!
|
val backupFiles: Preference = findPreference("backup_files")!!
|
||||||
viewModel.filesSummary.observe(viewLifecycleOwner, { summary ->
|
viewModel.filesSummary.observe(viewLifecycleOwner) { summary ->
|
||||||
backupFiles.summary = summary
|
backupFiles.summary = summary
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onStart() {
|
override fun onStart() {
|
||||||
|
|
@ -160,10 +160,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
if (resources.getBoolean(R.bool.show_restore_in_settings)) {
|
if (resources.getBoolean(R.bool.show_restore_in_settings)) {
|
||||||
menuRestore?.isVisible = true
|
menuRestore?.isVisible = true
|
||||||
}
|
}
|
||||||
viewModel.backupPossible.observe(viewLifecycleOwner, { possible ->
|
viewModel.backupPossible.observe(viewLifecycleOwner) { possible ->
|
||||||
menuBackupNow?.isEnabled = possible
|
menuBackupNow?.isEnabled = possible
|
||||||
menuRestore?.isEnabled = possible
|
menuRestore?.isEnabled = possible
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
|
||||||
|
|
|
||||||
|
|
@ -197,9 +197,9 @@ internal class SettingsViewModel(
|
||||||
@UiThread
|
@UiThread
|
||||||
fun loadFilesSummary() = viewModelScope.launch {
|
fun loadFilesSummary() = viewModelScope.launch {
|
||||||
val uriSummary = storageBackup.getUriSummaryString()
|
val uriSummary = storageBackup.getUriSummaryString()
|
||||||
_filesSummary.value = if (uriSummary.isEmpty()) {
|
_filesSummary.value = uriSummary.ifEmpty {
|
||||||
app.getString(R.string.settings_backup_files_summary)
|
app.getString(R.string.settings_backup_files_summary)
|
||||||
} else uriSummary
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue