summaryrefslogtreecommitdiff
path: root/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-06 20:56:20 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-06 20:56:20 +0100
commit8d19516ef4a2983f343883c29a48eacd942040ec (patch)
tree0600cae4b3953af9bca6f9266edc69474e6e4276 /same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
parenta803c9d86341355f3ea9bf823abbbd07cb64283e (diff)
Fix same-android.
– Use new Configuration class. – Enter MasterService url manually.
Diffstat (limited to 'same-android/src/main/java/com/orbekk/HelloAndroidActivity.java')
-rw-r--r--same-android/src/main/java/com/orbekk/HelloAndroidActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java b/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
index e27f941..090d719 100644
--- a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
+++ b/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
@@ -31,7 +31,7 @@ public class HelloAndroidActivity extends Activity {
intent.setAction("join");
// InetAddress address = new Broadcaster(this).getBroadcastAddress();
EditText t = (EditText)findViewById(R.id.editText1);
- intent.putExtra("ip", t.getText().toString());
+ intent.putExtra("masterUrl", t.getText().toString());
startService(intent);
}
@@ -61,7 +61,7 @@ public class HelloAndroidActivity extends Activity {
setContentView(R.layout.main);
showIpAddress();
- showBroadcastAddress();
+ // showBroadcastAddress();
// ClientApp client = new ClientApp();
// SameInterface client_ = client.getClient(10015, "ClientNetwork",