diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java index cba61d08d..a8f4fe089 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java @@ -372,11 +372,8 @@ public class GamesList extends XWExpandableListActivity NetUtils.informOfDeaths( this ); - Intent intent = getIntent(); - startFirstHasDict( intent ); - startNewNetGame( intent ); - startHasGameID( intent ); - startHasRowID( intent ); + tryStartsFromIntent( getIntent() ); + askDefaultNameIf(); } // onCreate @@ -390,10 +387,7 @@ public class GamesList extends XWExpandableListActivity Assert.assertNotNull( intent ); invalRelayIDs( intent.getStringArrayExtra( RELAYIDS_EXTRA ) ); invalRowID( intent.getLongExtra( ROWID_EXTRA, -1 ) ); - startFirstHasDict( intent ); - startNewNetGame( intent ); - startHasGameID( intent ); - startHasRowID( intent ); + tryStartsFromIntent( intent ); } @Override @@ -1109,6 +1103,14 @@ public class GamesList extends XWExpandableListActivity launchGame( rowid, true ); } + private void tryStartsFromIntent( Intent intent ) + { + startFirstHasDict( intent ); + startNewNetGame( intent ); + startHasGameID( intent ); + startHasRowID( intent ); + } + public static void onGameDictDownload( Context context, Intent intent ) { intent.setClass( context, GamesList.class );