From 08a8bc41890b0ce1a3fd19813d82e68051199a76 Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 24 Jun 2022 12:34:46 -0700 Subject: [PATCH] add non-again tip for archive backup --- .../main/java/org/eehouse/android/xw4/DlgDelegate.java | 3 ++- .../java/org/eehouse/android/xw4/GamesListDelegate.java | 9 ++++++++- xwords4/android/app/src/main/res/values/common_rsrc.xml | 1 + xwords4/android/app/src/main/res/values/tmpstrings.xml | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java index e88b14161..18d7bc3c4 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java @@ -57,9 +57,10 @@ public class DlgDelegate { LAUNCH_THEME_CONFIG, SEND_LOGS, OPEN_BYOD_DICT, - CLEAR_INT_STATS, // debug only + BACKUP_LOADDB, BACKUP_OVERWRITE, BACKUP_RETRY, + CLEAR_INT_STATS, // debug only // BoardDelegate UNDO_LAST_ACTION, diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java index 1558ab478..4991693d8 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java @@ -1474,6 +1474,10 @@ public class GamesListDelegate extends ListDelegateBase openWithChecks( rowid, summary ); break; + case BACKUP_LOADDB: + startFileChooser( null ); + break; + case BACKUP_OVERWRITE: ArrayList whats = (ArrayList)params[0]; Uri uri = Uri.parse((String)params[1]); @@ -1920,7 +1924,10 @@ public class GamesListDelegate extends ListDelegateBase showDialogFragment( DlgID.BACKUP_LOADSTORE ); break; case R.id.games_menu_loaddb: - startFileChooser( null ); + makeNotAgainBuilder( R.string.not_again_loaddb, + R.string.key_notagain_loaddb, + Action.BACKUP_LOADDB ) + .show(); break; case R.id.games_menu_writegit: diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml index 08ada7f02..571747939 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -131,6 +131,7 @@ key_notagain_arrow key_notagain_turnchanged key_notagain_newfrom + key_notagain_loaddb key_notagain_trading key_notagain_hidenewgamebuttons key_na_lookup diff --git a/xwords4/android/app/src/main/res/values/tmpstrings.xml b/xwords4/android/app/src/main/res/values/tmpstrings.xml index 8e942c64f..29354ebce 100644 --- a/xwords4/android/app/src/main/res/values/tmpstrings.xml +++ b/xwords4/android/app/src/main/res/values/tmpstrings.xml @@ -27,6 +27,10 @@ All games and other data to identify your device. + Import settings or game data from a + file you previously saved here, or copied from another + device. + The file ā€œ%1$sā€ does not contain CrossWords backup data.