From 312c5a47279c891341c26005b079c5d4115d3087 Mon Sep 17 00:00:00 2001 From: Joseph Morrow Date: Fri, 17 Jul 2015 16:37:37 -0700 Subject: [PATCH] Change Android sample app light resource URIs to match linux sample apps. This will fix an issue between Linux SimpleClient app and Android SimpleServer app where the server application was not responding to client application. Change-Id: I8a34539415df3adfd5a1d3c7912dedd2be2afce2 Signed-off-by: Joseph Morrow Reviewed-on: https://gerrit.iotivity.org/gerrit/1726 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- .../java/org/iotivity/base/examples/simpleclient/StringConstants.java | 4 ++-- .../java/org/iotivity/base/examples/simpleserver/StringConstants.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/simpleclient/StringConstants.java b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/simpleclient/StringConstants.java index af163e1..54336f8 100644 --- a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/simpleclient/StringConstants.java +++ b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/simpleclient/StringConstants.java @@ -6,8 +6,8 @@ package org.iotivity.base.examples.simpleclient; * the newly-supported type there. */ public interface StringConstants { - public static final String RESOURCE_URI0 = "/light0"; - public static final String RESOURCE_URI1 = "/light1"; + public static final String RESOURCE_URI0 = "/a/light"; + public static final String RESOURCE_URI1 = "/a/light2"; public static final String OIC_CLIENT_JSON_DB_FILE = "oic_svr_db_client.json"; public static final String CREATED_URI = "createduri"; public static final String STATE = "state"; diff --git a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/simpleserver/StringConstants.java b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/simpleserver/StringConstants.java index f4836fa..46b5c2d 100644 --- a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/simpleserver/StringConstants.java +++ b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/simpleserver/StringConstants.java @@ -8,8 +8,8 @@ import org.iotivity.base.OcPlatform; * the newly-supported type there. */ public interface StringConstants { - public static final String RESOURCE_URI0 = "/light0"; - public static final String RESOURCE_URI1 = "/light1"; + public static final String RESOURCE_URI0 = "/a/light"; + public static final String RESOURCE_URI1 = "/a/light2"; public static final String RESOURCE_TYPENAME = "core.light"; public static final String OIC_SERVER_JSON_DB_FILE = "oic_svr_db_server.json"; public static final String RESOURCE_INTERFACE = OcPlatform.DEFAULT_INTERFACE; //resource interface -- 2.7.4