Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

put groupless games into "recovered" group

Browse source 
At least one device was mysteriously losing games. They were winding up
with a group ID for a non-existant group. Now on startup I look for such
games and assign them to a new "recovered games" group. We'll see how
common this is before deciding whether it's a good enough
solution. Another perhaps better solution would be to display all games,
ordered by groups, rather than displaying all known groups and their
games.
This commit is contained in:
Eric House 2020-09-25 17:59:47 -07:00
parent f4e4dfacb6
commit d8d894da46
4 changed files with 103 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@ -1674,43 +1675,57 @@ public class DBUtils {
}
public static long getGroup( Context context, String name )
{
long result;
initDB( context );
synchronized( s_dbHelper ) {
result = getGroupImpl( name );
}
return result;
}
private static long getGroupImpl( String name )
{
long result = GROUPID_UNSPEC;
String[] columns = { ROW_ID };
String selection = DBHelper.GROUPNAME + " = ?";
String[] selArgs = { name };
initDB( context );
synchronized( s_dbHelper ) {
Cursor cursor = s_db.query( TABLE_NAMES.GROUPS.toString(), columns,
selection, selArgs,
null, // groupBy
null, // having
null // orderby
);
if ( cursor.moveToNext() ) {
result = cursor.getLong( cursor.getColumnIndex( ROW_ID ) );
}
cursor.close();
Cursor cursor = s_db.query( TABLE_NAMES.GROUPS.toString(), columns,
selection, selArgs,
null, // groupBy
null, // having
null // orderby
);
if ( cursor.moveToNext() ) {
result = cursor.getLong( cursor.getColumnIndex( ROW_ID ) );
}
Log.d( TAG, "getGroup(%s) => %d", name, result );
cursor.close();
Log.d( TAG, "getGroupImpl(%s) => %d", name, result );
return result;
}
private static long addGroupImpl( String name )
{
ContentValues values = new ContentValues();
values.put( DBHelper.GROUPNAME, name );
values.put( DBHelper.EXPANDED, 1 );
long rowid = insert( TABLE_NAMES.GROUPS, values );
invalGroupsCache();
return rowid;
}
public static long addGroup( Context context, String name )
{
long rowid = GROUPID_UNSPEC;
if ( null != name && 0 < name.length() ) {
if ( null == getGroups( context ).get( name ) ) {
ContentValues values = new ContentValues();
values.put( DBHelper.GROUPNAME, name );
values.put( DBHelper.EXPANDED, 1 );
// initDB( context ); <- getGroups will have called this
synchronized( s_dbHelper ) {
rowid = insert( TABLE_NAMES.GROUPS, values );
rowid = addGroupImpl( name );
}
invalGroupsCache();
}
}
return rowid;
@ -1878,7 +1893,7 @@ public class DBUtils {
// debugged), this can be removed.
ContentValues values = new ContentValues();
values.putNull( DBHelper.CHAT_HISTORY );
updateRowImpl( s_db, TABLE_NAMES.SUM, rowid, values );
updateRowImpl( TABLE_NAMES.SUM, rowid, values );
}
}
@ -2548,6 +2563,37 @@ public class DBUtils {
// updateRow( context, DBHelper.TABLE_NAMES.SUM, rowid, values );
// }
private static void showHiddenGames( Context context, SQLiteDatabase db )
{
Log.d( TAG, "showHiddenGames()" );
String query = "select " + ROW_ID + " from summaries WHERE NOT groupid"
+ " IN (SELECT " + ROW_ID + " FROM groups);";
List<String> ids = null;
Cursor cursor = db.rawQuery( query, null );
if ( 0 < cursor.getCount() ) {
ids = new ArrayList<>();
int indx = cursor.getColumnIndex( ROW_ID );
while ( cursor.moveToNext() ) {
long rowid = cursor.getLong( indx );
ids.add( String.format("%d", rowid ) );
}
}
cursor.close();
if ( null != ids ) {
String name = LocUtils.getString( context, R.string.recovered_group );
long groupid = getGroupImpl( name );
if ( GROUPID_UNSPEC == groupid ) {
groupid = addGroupImpl( name );
}
query = String.format( "UPDATE summaries SET groupid = %d"
+ " WHERE rowid IN (%s);", groupid,
TextUtils.join(",", ids ) );
db.execSQL( query );
}
}
private static void initDB( Context context )
{
synchronized( DBUtils.class ) {
@ -2557,15 +2603,32 @@ public class DBUtils {
// force any upgrade
s_dbHelper.getWritableDatabase().close();
s_db = s_dbHelper.getWritableDatabase();
// Workaround for bug somewhere. Run this once on startup
// before anything else uses the db.
showHiddenGames( context, s_db );
}
}
}
private static int updateRowImpl( SQLiteDatabase db, TABLE_NAMES table,
static void hideGames( Context context, long rowid )
{
if ( BuildConfig.NON_RELEASE ) {
int nonID = 500 + (Utils.nextRandomInt() % 1000);
String query = String.format( "UPDATE summaries set GROUPID = %d"
+ " WHERE rowid = %d", nonID, rowid );
initDB( context );
synchronized( s_dbHelper ) {
s_db.execSQL( query );
}
}
}
private static int updateRowImpl( TABLE_NAMES table,
long rowid, ContentValues values )
{
String selection = String.format( ROW_ID_FMT, rowid );
return DBHelper.update( db, table, values, selection );
return DBHelper.update( s_db, table, values, selection );
}
@ -2574,7 +2637,7 @@ public class DBUtils {
{
initDB( context );
synchronized( s_dbHelper ) {
int result = updateRowImpl( s_db, table, rowid, values );
int result = updateRowImpl( table, rowid, values );
if ( 0 == result ) {
Log.w( TAG, "updateRow failed" );
}

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

@ -1654,6 +1654,9 @@ public class GamesListDelegate extends ListDelegateBase
Utils.setItemVisible( menu, R.id.games_game_delete, enable );
Utils.setItemVisible( menu, R.id.games_game_reset, enable );
Utils.setItemVisible( menu, R.id.games_game_hide,
enable && BuildConfig.NON_RELEASE );
// multiple games can be regrouped/reset.
Utils.setItemVisible( menu, R.id.games_game_move,
0 < nGamesSelected );
@ -1995,6 +1998,10 @@ public class GamesListDelegate extends ListDelegateBase
boolean dropSels = false;
switch( itemID ) {
case R.id.games_game_hide:
DBUtils.hideGames( m_activity, selRowIDs[0] );
break;
case R.id.games_game_delete:
String msg = getQuantityString( R.plurals.confirm_seldeletes_fmt,
selRowIDs.length, selRowIDs.length );

5
xwords4/android/app/src/main/res/menu/games_list_game_menu.xml
View file

@ -34,11 +34,14 @@
<item android:id="@+id/games_game_deselect"
android:title="@string/list_item_deselect"
/>
<!-- Debug only -->
<!-- below here: Debug only -->
<item android:id="@+id/games_game_invites"
android:title="@string/board_menu_game_showInvites"
/>
<item android:id="@+id/games_game_markbad"
android:title="@string/list_item_markbad"
/>
<item android:id="@+id/games_game_hide"
android:title="Lose"
/>
</menu>

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

@ -2010,6 +2010,11 @@
<item quantity="one">One group selected</item>
<item quantity="other">%1$d groups selected</item>
</plurals>
<!-- Name of group created to house games lost due to some old bug
I just found. I expect users to move them elsewhere. -->
<string name="recovered_group">Recovered games</string>
<string name="summary_thumbsize">Thumbnail size</string>
<string name="thumb_off">Disabled</string>
<!-- Text of alert shown when user accepts an invitation, e.g. in