From d73481ba9b768a3cef135914b06232dbb84caf30 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 8 Jun 2022 09:59:36 -0700 Subject: [PATCH] don't offer backup/restore earlier than KitKat I'm using ContentResolver now, and it shows up in KitKat --- .../main/java/org/eehouse/android/xw4/DBUtils.java | 13 ------------- .../org/eehouse/android/xw4/GamesListDelegate.java | 14 ++++++++------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java index c04b37d71..0837881b1 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java @@ -2040,19 +2040,6 @@ public class DBUtils { } } - public static boolean gameDBExists( Context context ) - { - String varName = getVariantDBName(); - boolean exists = new File( Environment.getExternalStorageDirectory(), - varName ).exists(); - if ( !exists ) { - // try the old one - exists = new File( Environment.getExternalStorageDirectory(), - DBHelper.getDBName() ).exists(); - } - return exists; - } - public static void addToStudyList( Context context, String word, String isoCode ) { 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 5b42f648a..6762dc7ba 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 @@ -542,8 +542,6 @@ public class GamesListDelegate extends ListDelegateBase } // class GameListAdapter private static final int[] DEBUG_ITEMS = { - // R.id.games_menu_loaddb, - R.id.games_menu_storedb, R.id.games_menu_writegit, R.id.games_submenu_logs, }; @@ -1672,14 +1670,18 @@ public class GamesListDelegate extends ListDelegateBase final boolean showDbg = BuildConfig.NON_RELEASE || XWPrefs.getDebugEnabled( m_activity ); showItemsIf( DEBUG_ITEMS, menu, nothingSelected && showDbg ); - Utils.setItemVisible( menu, R.id.games_menu_loaddb, - nothingSelected && - DBUtils.gameDBExists( m_activity ) ); - showItemsIf( NOSEL_ITEMS, menu, nothingSelected ); showItemsIf( ONEGAME_ITEMS, menu, 1 == nGamesSelected ); showItemsIf( ONEGROUP_ITEMS, menu, 1 == nGroupsSelected ); + final boolean showDataItems = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT + && nothingSelected; + for ( int item : new int[] { R.id.games_menu_storedb, + R.id.games_menu_loaddb } ) { + Utils.setItemVisible( menu, item, showDataItems ); + } + boolean enable = showDbg && nothingSelected; Utils.setItemVisible( menu, R.id.games_menu_checkupdates, enable );