From e6a2fe124bd1c3c2dc70c4182e4ec4094df95677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 27 Mar 2012 10:42:34 +0200 Subject: Change same-android to work with new Same version. --- .../src/main/java/com/orbekk/same/android/SameService.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'same-android') diff --git a/same-android/src/main/java/com/orbekk/same/android/SameService.java b/same-android/src/main/java/com/orbekk/same/android/SameService.java index f2af359..004f5e9 100644 --- a/same-android/src/main/java/com/orbekk/same/android/SameService.java +++ b/same-android/src/main/java/com/orbekk/same/android/SameService.java @@ -222,11 +222,10 @@ public class SameService extends Service { Properties properties = new Properties(); String localIp = new Networking(this) .getWlanAddress().getHostAddress(); - String localMaster = "http://" + localIp + ":" + SERVICE_PORT + - "/MasterService.json"; + String baseUrl = "http://" + localIp + ":" + SERVICE_PORT + "/"; properties.setProperty("port", ""+SERVICE_PORT); properties.setProperty("localIp", localIp); - properties.setProperty("masterUrl", localMaster); + properties.setProperty("baseUrl", baseUrl); properties.setProperty("enableDiscovery", "true"); properties.setProperty("discoveryPort", ""+DISCOVERY_PORT); properties.setProperty("networkName", "AndroidNetwork"); @@ -236,12 +235,12 @@ public class SameService extends Service { /** Create a public network. */ private void create() { - sameController.getClient().joinNetwork( - configuration.get("masterUrl")); + sameController.createNetwork(configuration.get("networkName")); try { + // SameController should take care of this. sameController.getDirectory().registerNetwork( configuration.get("networkName"), - configuration.get("masterUrl")); + sameController.getMaster().getUrl()); } catch (Exception e) { Toast.makeText(this, "Unable to register network. " + "Use manual address to join.", -- cgit v1.2.3