From fce0caae29edb89e8784b945559862c6b58eef94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 24 Apr 2012 14:46:08 +0200 Subject: Use same-android with protobuf services. --- .../java/com/orbekk/same/android/SameControllerActivity.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java') diff --git a/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java index 2fd0d92..6e8d613 100644 --- a/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java +++ b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java @@ -88,24 +88,17 @@ public class SameControllerActivity extends Activity { } public void joinNetworkUrl(View unused) { - String masterUrl = ""; Intent intent = new Intent(this, SameService.class); intent.setAction("join"); EditText t = (EditText)findViewById(R.id.master_service_url); - masterUrl = t.getText().toString(); - if (!masterUrl.startsWith("http://")) { - masterUrl = "http://" + masterUrl; - } - if (!masterUrl.endsWith("/MasterService.json")) { - masterUrl += "/MasterService.json"; - } + String masterUrl = t.getText().toString(); joinNetwork(masterUrl); } private void joinNetwork(String masterUrl) { logger.info("joinNetwork({})", masterUrl); Message message = Message.obtain(null, SameService.JOIN_NETWORK); - message.getData().putString("masterUrl", masterUrl); + message.getData().putString("masterLocation", masterUrl); try { sameService.send(message); } catch (RemoteException e) { -- cgit v1.2.3