diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-28 16:34:57 +0100 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-28 16:34:57 +0100 |
| commit | bf8e87bec12e6ec53ec2150d7a6f6d0e493c79ce (patch) | |
| tree | 35f334042ce8db5158b1f72ca0fe55233ce5780f /same-android/src/main/java/com/orbekk/same/SameControllerActivity.java | |
| parent | 9635b25d879052210dc3cae314efad512c373c0a (diff) | |
Fix concurrency problems.
– GameView should only draw on canvas from UI thread.
– ClientInterfaceBridge should not delete state after disconnect
(Because an update may be still waiting.)
– Send a Bundle in JOIN_NETWORK request to SameService.
Diffstat (limited to 'same-android/src/main/java/com/orbekk/same/SameControllerActivity.java')
| -rw-r--r-- | same-android/src/main/java/com/orbekk/same/SameControllerActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java index 59ec6e2..2fb0d25 100644 --- a/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java +++ b/same-android/src/main/java/com/orbekk/same/SameControllerActivity.java @@ -106,8 +106,8 @@ public class SameControllerActivity extends Activity { private void joinNetwork(String masterUrl) { logger.info("joinNetwork({})", masterUrl); - Message message = Message.obtain(null, SameService.JOIN_NETWORK, - masterUrl); + Message message = Message.obtain(null, SameService.JOIN_NETWORK); + message.getData().putString("masterUrl", masterUrl); try { sameService.send(message); } catch (RemoteException e) { |