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

test for null back from refusal to load quarantined game

Browse source
This commit is contained in:
Eric House 2020-04-20 12:19:04 -07:00
parent 54efffa635
commit fe9eb9ae7c
3 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
View file

@ -32,7 +32,8 @@ public class Assert {
assertTrue(! val);
}
public static void assertTrue(boolean val) {
public static void assertTrue( boolean val )
{
if (! val) {
Log.e( TAG, "firing assert!" );
DbgUtils.printStack( TAG );

90
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
View file

@ -386,6 +386,16 @@ public class GameUtils {
return loadMakeGame( context, gi, util, tp, stream, lock.getRowid() );
}
private static CurGameInfo giFromStream( Context context, byte[] stream )
{
CurGameInfo gi = null;
if ( null != stream ) {
gi = new CurGameInfo( context );
XwJNI.gi_from_stream( gi, stream );
}
return gi;
}
private static GamePtr loadMakeGame( Context context, CurGameInfo gi,
UtilCtxt util, TransportProcs tp,
byte[] stream, long rowid )
@ -832,22 +842,28 @@ public class GameUtils {
public static String[] dictNames( Context context, GameLock lock )
{
String[] result = null;
byte[] stream = savedGame( context, lock );
CurGameInfo gi = new CurGameInfo( context );
XwJNI.gi_from_stream( gi, stream );
return gi.dictNames();
CurGameInfo gi = giFromStream( context, stream );
if ( null != gi ) {
result = gi.dictNames();
}
return result;
}
public static String[] dictNames( Context context, long rowid,
int[] missingLang )
{
String[] result = null;
byte[] stream = savedGame( context, rowid );
CurGameInfo gi = new CurGameInfo( context );
XwJNI.gi_from_stream( gi, stream );
if ( null != missingLang ) {
missingLang[0] = gi.dictLang;
CurGameInfo gi = giFromStream( context, stream );
if ( null != gi ) {
if ( null != missingLang ) {
missingLang[0] = gi.dictLang;
}
result = gi.dictNames();
}
return gi.dictNames();
return result;
}
public static String[] dictNames( Context context, long rowid )
@ -863,7 +879,7 @@ public class GameUtils {
public static boolean gameDictsHere( Context context, GameLock lock )
{
String[] gameDicts = dictNames( context, lock );
return gameDictsHere( context, null, gameDicts );
return null != gameDicts && gameDictsHere( context, null, gameDicts );
}
// Return true if all dicts present. Return list of those that
@ -873,7 +889,8 @@ public class GameUtils {
int[] missingLang )
{
String[] gameDicts = dictNames( context, rowid, missingLang );
return gameDictsHere( context, missingNames, gameDicts );
return null != gameDicts
&& gameDictsHere( context, missingNames, gameDicts );
}
public static boolean gameDictsHere( Context context,
@ -1089,34 +1106,37 @@ public class GameUtils {
boolean success;
try ( GameLock lock = GameLock.lock( rowid, 300 ) ) {
success = null != lock;
if ( success ) {
byte[] stream = savedGame( context, lock );
CurGameInfo gi = new CurGameInfo( context );
XwJNI.gi_from_stream( gi, stream );
// first time required so dictNames() will work
gi.replaceDicts( context, newDict );
String[] dictNames = gi.dictNames();
DictUtils.DictPairs pairs = DictUtils.openDicts( context,
dictNames );
try ( GamePtr gamePtr =
XwJNI.initFromStream( rowid, stream, gi, dictNames,
pairs.m_bytes, pairs.m_paths,
gi.langName( context ), null,
null, CommonPrefs.get( context ), null ) ) {
// second time required as game_makeFromStream can overwrite
gi.replaceDicts( context, newDict );
saveGame( context, gamePtr, gi, lock, false );
summarize( context, lock, gamePtr, gi );
}
} else {
if ( !success ) {
DbgUtils.toastNoLock( TAG, context, rowid,
"replaceDicts(): rowid %d",
rowid );
} else {
byte[] stream = savedGame( context, lock );
CurGameInfo gi = giFromStream( context, stream );
success = null != gi;
if ( !success ) {
Log.e( TAG, "replaceDicts(): unable to load rowid %d", rowid );
} else {
// first time required so dictNames() will work
gi.replaceDicts( context, newDict );
String[] dictNames = gi.dictNames();
DictUtils.DictPairs pairs = DictUtils.openDicts( context,
dictNames );
try ( GamePtr gamePtr =
XwJNI.initFromStream( rowid, stream, gi, dictNames,
pairs.m_bytes, pairs.m_paths,
gi.langName( context ), null,
null, CommonPrefs.get( context ), null ) ) {
// second time required as game_makeFromStream can overwrite
gi.replaceDicts( context, newDict );
saveGame( context, gamePtr, gi, lock, false );
summarize( context, lock, gamePtr, gi );
}
}
}
}
return success;

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
View file

@ -168,6 +168,7 @@ public class XwJNI {
public static void gi_from_stream( CurGameInfo gi, byte[] stream )
{
Assert.assertNotNull( stream );
gi_from_stream( getJNI().m_ptrGlobals, gi, stream ); // called here
}