From b178bce69360630618a2d492784f6dba9003e9c9 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 11 Nov 2022 17:32:19 -0300 Subject: [PATCH] Remove some code warnings --- .../seedvault/settings/SettingsFragment.kt | 14 +++++++------- .../seedvault/settings/SettingsViewModel.kt | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt index ff26c3a8..227e84d4 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt @@ -105,7 +105,7 @@ class SettingsFragment : PreferenceFragmentCompat() { dialog.dismiss() } .setNegativeButton(R.string.settings_backup_apk_dialog_disable) { dialog, _ -> - apkBackup.isChecked = enable + apkBackup.isChecked = false dialog.dismiss() } .show() @@ -130,14 +130,14 @@ class SettingsFragment : PreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - viewModel.lastBackupTime.observe(viewLifecycleOwner, { time -> + viewModel.lastBackupTime.observe(viewLifecycleOwner) { time -> setAppBackupStatusSummary(time) - }) + } val backupFiles: Preference = findPreference("backup_files")!! - viewModel.filesSummary.observe(viewLifecycleOwner, { summary -> + viewModel.filesSummary.observe(viewLifecycleOwner) { summary -> backupFiles.summary = summary - }) + } } override fun onStart() { @@ -160,10 +160,10 @@ class SettingsFragment : PreferenceFragmentCompat() { if (resources.getBoolean(R.bool.show_restore_in_settings)) { menuRestore?.isVisible = true } - viewModel.backupPossible.observe(viewLifecycleOwner, { possible -> + viewModel.backupPossible.observe(viewLifecycleOwner) { possible -> menuBackupNow?.isEnabled = possible menuRestore?.isEnabled = possible - }) + } } override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt index 92b90b9b..3c190651 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt @@ -197,9 +197,9 @@ internal class SettingsViewModel( @UiThread fun loadFilesSummary() = viewModelScope.launch { val uriSummary = storageBackup.getUriSummaryString() - _filesSummary.value = if (uriSummary.isEmpty()) { + _filesSummary.value = uriSummary.ifEmpty { app.getString(R.string.settings_backup_files_summary) - } else uriSummary + } } /**