diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-03-27 10:42:34 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-03-27 10:42:34 +0200 |
| commit | e6a2fe124bd1c3c2dc70c4182e4ec4094df95677 (patch) | |
| tree | 8d13090063b52189a2b3a252adbc4d182c33a151 /same-android/src/main/java/com/orbekk | |
| parent | a40161ac665ce982518d8ceea6f6bc6fede10651 (diff) | |
Change same-android to work with new Same version.
Diffstat (limited to 'same-android/src/main/java/com/orbekk')
| -rw-r--r-- | same-android/src/main/java/com/orbekk/same/android/SameService.java | 11 |
1 files changed, 5 insertions, 6 deletions
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.", |