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

fix (by inspection) three Play store crashes

Browse source 
One race condition between BT threads; two edge cases around dialog
fragments, where I've left DEBUG build asserts in place.
This commit is contained in:
Eric House 2017-05-24 21:27:18 -07:00
parent 935932f440
commit d584c30a43
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
View file

@ -489,6 +489,8 @@ public class BTService extends XWService {
Log.w( TAG, "trying again..." );
logIOE( ioe);
continue;
} catch ( NullPointerException npe ) {
continue; // m_serverSocket probably null
}
}

19
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
View file

@ -122,18 +122,21 @@ public class DBAlert extends XWDialogFragment {
new Handler().post( new Runnable() {
@Override
public void run() {
MainActivity activity = (MainActivity)getActivity();
if ( null != activity ) {
DBAlert newMe = newInstance( getDlgID(), mParams );
activity.show( newMe );
dismiss(); // kill myself...
} else {
Log.d( TAG, "null activity..." );
try {
MainActivity activity = (MainActivity)getActivity();
if ( null != activity ) {
DBAlert newMe = newInstance( getDlgID(), mParams );
activity.show( newMe );
dismiss(); // kill myself...
} else {
Log.d( TAG, "null activity..." );
}
} catch ( IllegalStateException ex ) {
Assert.assertFalse( BuildConfig.DEBUG );
}
}
} );
}
return dialog;
}
}

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
View file

@ -341,7 +341,7 @@ public class GameConfigDelegate extends DelegateBase
break;
}
Assert.assertNotNull( dialog );
Assert.assertTrue( dialog != null || !BuildConfig.DEBUG );
return dialog;
} // makeDialog