From b409d805cc6f669c994383ac8c7aac88f17b5b4c Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Mon, 30 Jun 2025 22:50:19 +0700 Subject: [PATCH] [android] Skip error aler dialog if nothing to backup Signed-off-by: Konstantin Pastbin --- .../settings/BackupSettingsFragment.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java index 7e578f443..a544db49b 100644 --- a/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java @@ -292,18 +292,25 @@ public class BackupSettingsFragment @Override public void onBackupFailed(LocalBackupManager.ErrorCode errorCode) { - String errorMessage = switch (errorCode) + String errorMessage; + if (errorCode == LocalBackupManager.ErrorCode.EMPTY_CATEGORY) { - case EMPTY_CATEGORY -> requireContext().getString(R.string.pref_backup_now_summary_empty_lists); - default -> requireContext().getString(R.string.pref_backup_now_summary_failed); - }; - - Logger.e(TAG, "Manual backup was failed with code: " + errorCode); + errorMessage = requireContext().getString(R.string.pref_backup_now_summary_empty_lists); + Logger.i(TAG, "Nothing to backup"); + } + else + { + errorMessage = requireContext().getString(R.string.pref_backup_now_summary_failed); + Logger.e(TAG, "Manual backup has failed: " + errorCode); + } backupNowOption.setEnabled(true); backupNowOption.setSummary(errorMessage); - showBackupErrorAlertDialog(requireContext().getString(R.string.dialog_report_error_with_logs)); + if (errorCode != LocalBackupManager.ErrorCode.EMPTY_CATEGORY) + { + showBackupErrorAlertDialog(requireContext().getString(R.string.dialog_report_error_with_logs)); + } } });