mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-02-01 19:57:11 +01:00
cleanup from review of changes
This commit is contained in:
parent
6caff930e7
commit
a1c92b6957
8 changed files with 8 additions and 42 deletions
|
@ -38,6 +38,7 @@
|
||||||
work anyway.)</li>
|
work anyway.)</li>
|
||||||
<li>Don't open a closed group when moving games to it</li>
|
<li>Don't open a closed group when moving games to it</li>
|
||||||
<li>Fix occasional crash</li>
|
<li>Fix occasional crash</li>
|
||||||
|
<li>Switch from ant to gradle (dev. detail)</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>(The full changelog
|
<p>(The full changelog
|
||||||
|
|
|
@ -83,15 +83,8 @@ public class BoardDelegate extends DelegateBase
|
||||||
NFCUtils.NFCActor {
|
NFCUtils.NFCActor {
|
||||||
private static final String TAG = BoardDelegate.class.getSimpleName();
|
private static final String TAG = BoardDelegate.class.getSimpleName();
|
||||||
|
|
||||||
public static final String INTENT_KEY_CHAT = "chat";
|
|
||||||
|
|
||||||
private static final int SCREEN_ON_TIME = 10 * 60 * 1000; // 10 mins
|
private static final int SCREEN_ON_TIME = 10 * 60 * 1000; // 10 mins
|
||||||
|
|
||||||
private static final String DLG_TITLE = "DLG_TITLE";
|
|
||||||
private static final String DLG_TITLESTR = "DLG_TITLESTR";
|
|
||||||
private static final String DLG_BYTES = "DLG_BYTES";
|
|
||||||
private static final String ROOM = "ROOM";
|
|
||||||
private static final String PWDNAME = "PWDNAME";
|
|
||||||
private static final String SAVE_MYSIS = TAG + "/MYSIS";
|
private static final String SAVE_MYSIS = TAG + "/MYSIS";
|
||||||
|
|
||||||
private Activity m_activity;
|
private Activity m_activity;
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class DBAlert extends XWDialogFragment {
|
||||||
if ( null != obj && !(obj instanceof Serializable) ) {
|
if ( null != obj && !(obj instanceof Serializable) ) {
|
||||||
Log.d( TAG, "OOPS: %s not Serializable",
|
Log.d( TAG, "OOPS: %s not Serializable",
|
||||||
obj.getClass().getName() );
|
obj.getClass().getName() );
|
||||||
// Assert.fail();
|
Assert.assertFalse( BuildConfig.DEBUG );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,6 +100,7 @@ public class DelegateBase implements DlgClickNotify,
|
||||||
protected void onCreateContextMenu( ContextMenu menu, View view,
|
protected void onCreateContextMenu( ContextMenu menu, View view,
|
||||||
ContextMenuInfo menuInfo ) {}
|
ContextMenuInfo menuInfo ) {}
|
||||||
protected boolean onContextItemSelected( MenuItem item ) { return false; }
|
protected boolean onContextItemSelected( MenuItem item ) { return false; }
|
||||||
|
protected void onStop() {}
|
||||||
protected void onDestroy() {}
|
protected void onDestroy() {}
|
||||||
protected void onWindowFocusChanged( boolean hasFocus ) {}
|
protected void onWindowFocusChanged( boolean hasFocus ) {}
|
||||||
protected boolean handleBackPressed() { return false; }
|
protected boolean handleBackPressed() { return false; }
|
||||||
|
@ -156,16 +157,6 @@ public class DelegateBase implements DlgClickNotify,
|
||||||
XWService.setListener( null );
|
XWService.setListener( null );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void onStop()
|
|
||||||
{
|
|
||||||
// Alerts disappear on their own if not in dualpane mode
|
|
||||||
if ( false
|
|
||||||
&& m_activity instanceof MainActivity
|
|
||||||
&& ((MainActivity)m_activity).inDPMode() ) {
|
|
||||||
DlgDelegate.closeAlerts( m_activity, this );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected DelegateBase curThis()
|
protected DelegateBase curThis()
|
||||||
{
|
{
|
||||||
DelegateBase result = null;
|
DelegateBase result = null;
|
||||||
|
@ -433,6 +424,7 @@ public class DelegateBase implements DlgClickNotify,
|
||||||
{
|
{
|
||||||
DlgID dlgID = alert.getDlgID();
|
DlgID dlgID = alert.getDlgID();
|
||||||
Log.d( TAG, "makeDialog(): not handling %s", dlgID.toString() );
|
Log.d( TAG, "makeDialog(): not handling %s", dlgID.toString() );
|
||||||
|
Assert.assertFalse( BuildConfig.DEBUG );
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -312,7 +312,7 @@ public class DictBrowseDelegate extends DelegateBase
|
||||||
finish();
|
finish();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Assert.assertTrue( !BuildConfig.DEBUG );
|
Assert.assertFalse( BuildConfig.DEBUG );
|
||||||
}
|
}
|
||||||
return handled;
|
return handled;
|
||||||
}
|
}
|
||||||
|
|
|
@ -929,20 +929,6 @@ public class GamesListDelegate extends ListDelegateBase
|
||||||
.setEnabled( 0 <= m_mySIS.groupSelItem );
|
.setEnabled( 0 <= m_mySIS.groupSelItem );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void prepareDialog( DlgID dlgID, Dialog dialog )
|
|
||||||
{
|
|
||||||
Assert.fail();
|
|
||||||
/*
|
|
||||||
AlertDialog ad = (AlertDialog)dialog;
|
|
||||||
switch( dlgID ) {
|
|
||||||
case CHANGE_GROUP:
|
|
||||||
ad.getButton( AlertDialog.BUTTON_POSITIVE ).setEnabled( false );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init( Bundle savedInstanceState )
|
protected void init( Bundle savedInstanceState )
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
/* -*- compile-command: "find-and-gradle.sh installXw4Debug"; -*- */
|
||||||
/*
|
/*
|
||||||
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
|
* Copyright 2017 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
* rights reserved.
|
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License as
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
@ -21,16 +20,11 @@
|
||||||
package org.eehouse.android.xw4;
|
package org.eehouse.android.xw4;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Intent;
|
|
||||||
|
|
||||||
public class HostActivity extends XWActivity {
|
public class HostActivity extends XWActivity {
|
||||||
private HostDelegate m_dlgt;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate( Bundle sis ) {
|
public void onCreate( Bundle sis ) {
|
||||||
m_dlgt = new HostDelegate( this, sis );
|
super.onCreate( sis, new HostDelegate( this, sis ) );
|
||||||
super.onCreate( sis, m_dlgt );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,7 @@ public class SMSInviteDelegate extends InviteDelegate {
|
||||||
if ( Activity.RESULT_CANCELED != resultCode && data != null ) {
|
if ( Activity.RESULT_CANCELED != resultCode && data != null ) {
|
||||||
switch ( requestCode ) {
|
switch ( requestCode ) {
|
||||||
case GET_CONTACT:
|
case GET_CONTACT:
|
||||||
post ( new Runnable() {
|
post( new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
addPhoneNumbers( data );
|
addPhoneNumbers( data );
|
||||||
|
|
Loading…
Add table
Reference in a new issue