Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-06 20:45:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

show an error Toast when db file export fails

Browse source 
Right now I seem to be writing it someplace I'm not supposed to
This commit is contained in:
Eric House 2022-06-06 20:21:50 -07:00
parent 3dea7bd205
commit 58680980e2
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
View file

@ -1851,14 +1851,14 @@ public class DBUtils {
} }
} }
public static void loadDB( Context context ) public static boolean loadDB( Context context )
{ {
copyGameDB( context, false ); return copyGameDB( context, false );
} }
public static void saveDB( Context context ) public static boolean saveDB( Context context )
{ {
copyGameDB( context, true ); return copyGameDB( context, true );
} }
public static boolean copyFileStream( FileOutputStream fos, public static boolean copyFileStream( FileOutputStream fos,
@ -2443,8 +2443,9 @@ public class DBUtils {
} }
} }
private static void copyGameDB( Context context, boolean toSDCard ) private static boolean copyGameDB( Context context, boolean toSDCard )
{ {
boolean success = false;
String name = DBHelper.getDBName(); String name = DBHelper.getDBName();
File gamesDB = context.getDatabasePath( name ); File gamesDB = context.getDatabasePath( name );
@ -2465,10 +2466,12 @@ public class DBUtils {
new FileOutputStream( toSDCard? sdcardDB : gamesDB ); new FileOutputStream( toSDCard? sdcardDB : gamesDB );
copyFileStream( dest, src ); copyFileStream( dest, src );
invalGroupsCache(); invalGroupsCache();
success = true;
} }
} catch( java.io.FileNotFoundException fnfe ) { } catch( java.io.FileNotFoundException fnfe ) {
Log.ex( TAG, fnfe ); Log.ex( TAG, fnfe );
} }
return success;
} }
// Copy my .apk to the Downloads directory, from which a user could more // Copy my .apk to the Downloads directory, from which a user could more

5
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -1529,8 +1529,9 @@ public class GamesListDelegate extends ListDelegateBase
storeGroupPositions( null ); storeGroupPositions( null );
mkListAdapter(); mkListAdapter();
} else if ( R.id.games_menu_storedb == id ) { } else if ( R.id.games_menu_storedb == id ) {
DBUtils.saveDB( m_activity ); int msgID = DBUtils.saveDB( m_activity )
showToast( R.string.db_store_done ); ? R.string.db_store_done : R.string.db_store_failed;
showToast( msgID );
} }
break; break;

3
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -2307,7 +2307,8 @@
<string name="pref_item_update_summary">Get intermediate builds</string> <string name="pref_item_update_summary">Get intermediate builds</string>
<string name="checking_title">Checking</string> <string name="checking_title">Checking</string>
<string name="checking_for_fmt">Checking for wordlists in %1$s…</string> <string name="checking_for_fmt">Checking for wordlists in %1$s…</string>
<string name="db_store_done">SD card write complete.</string> <string name="db_store_done">SD card write complete</string>
<string name="db_store_failed">SD card write failed</string>
<string name="confirm_drop_mqtt">Are you sure you want to drop this <string name="confirm_drop_mqtt">Are you sure you want to drop this
game’s ability to communicate via the internet?</string> game’s ability to communicate via the internet?</string>
<string name="confirm_drop_relay_bt">Bluetooth only works for nearby <string name="confirm_drop_relay_bt">Bluetooth only works for nearby