Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move ProgressDialog into NewGameActivity where it belongs.

Browse source
This commit is contained in:
Eric House 2012-01-26 06:23:46 -08:00
parent da9f206f86
commit 9f2ec43617
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTConnection.java
View file

@ -25,7 +25,6 @@ import android.bluetooth.BluetoothServerSocket;
import android.bluetooth.BluetoothSocket;
import android.bluetooth.BluetoothDevice;
import android.app.ProgressDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -80,7 +79,6 @@ public class BTConnection extends BroadcastReceiver {
byte[] m_msg;
String m_recipient;
Handler m_handler;
ProgressDialog m_progress;
int m_gameID;
public BTQueueElem( BTCmd cmd ) { m_cmd = cmd; }
@ -94,10 +92,6 @@ public class BTConnection extends BroadcastReceiver {
Handler handler ) {
m_cmd = cmd; m_recipient = dev; m_gameID = gameID; m_handler = handler;
}
public BTQueueElem( BTCmd cmd, ProgressDialog progress,
Handler handler ) {
m_cmd = cmd; m_progress = progress; m_handler = handler;
}
}
private static LinkedBlockingQueue<BTQueueElem> s_queue;
@ -279,14 +273,7 @@ public class BTConnection extends BroadcastReceiver {
public static void rescan( Context context, Handler handler )
{
// This is really gross!!! But only the foreground thread can
// show/close a dialog so we have to pass it to the caller in
// the handler when done. Maybe the caller should put it up
// before calling us????
String msg = context.getString( R.string.scan_progress );
ProgressDialog progress = ProgressDialog.show( context, msg,
null, true, true );
s_queue.add( new BTQueueElem( BTCmd.SCAN, progress, handler ) );
s_queue.add( new BTQueueElem( BTCmd.SCAN, handler ) );
}
public static String[] listPairedWithXwords()
@ -482,8 +469,7 @@ public class BTConnection extends BroadcastReceiver {
private static void doScan( BTQueueElem elem )
{
sendPings( null );
elem.m_handler.obtainMessage( SCAN_DONE, elem.m_progress )
.sendToTarget();
elem.m_handler.obtainMessage( SCAN_DONE ).sendToTarget();
}
private static void addAddr( BluetoothDevice dev )

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
View file

@ -53,6 +53,7 @@ public class NewGameActivity extends XWActivity
private boolean m_showsOn;
private Handler m_handler = null;
private ProgressDialog m_progress;
@Override
protected void onCreate(Bundle savedInstanceState)
@ -115,6 +116,10 @@ public class NewGameActivity extends XWActivity
new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg,
int whichButton ) {
String msg = getString( R.string.scan_progress );
m_progress =
ProgressDialog.show( NewGameActivity.this, msg,
null, true, true );
BTConnection.rescan( NewGameActivity.this,
getHandler() );
dlg.dismiss();
@ -292,7 +297,10 @@ public class NewGameActivity extends XWActivity
case BTConnection.CONNECT_FAILED:
break;
case BTConnection.SCAN_DONE:
((ProgressDialog)msg.obj).cancel();
if ( null != m_progress ) {
m_progress.cancel();
m_progress = null;
}
showDialog( PICK_BTDEV_DLG );
break;
}