Commit 1fe404be authored by Larry Sachs's avatar Larry Sachs Committed by George Nash

Updates for recent OCEndpointUtil.java additions.

Change-Id: I0871778dcae9cf4aa0b1e1e63d9ab5e73c5a5411
Signed-off-by: Larry Sachs's avatarLarry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29440Tested-by: default avatarIoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
parent ab8b3481
...@@ -3,10 +3,10 @@ package org.iotivity.onboardingtool; ...@@ -3,10 +3,10 @@ package org.iotivity.onboardingtool;
import android.util.Log; import android.util.Log;
import org.iotivity.OCEndpoint; import org.iotivity.OCEndpoint;
import org.iotivity.OCMain; import org.iotivity.OCEndpointUtil;
import org.iotivity.OCObtDiscoveryHandler; import org.iotivity.OCObtDiscoveryHandler;
import org.iotivity.OCUuidUtil;
import org.iotivity.OCUuid; import org.iotivity.OCUuid;
import org.iotivity.OCUuidUtil;
public class OwnedDeviceHandler implements OCObtDiscoveryHandler { public class OwnedDeviceHandler implements OCObtDiscoveryHandler {
...@@ -24,7 +24,7 @@ public class OwnedDeviceHandler implements OCObtDiscoveryHandler { ...@@ -24,7 +24,7 @@ public class OwnedDeviceHandler implements OCObtDiscoveryHandler {
Log.d(TAG, "discovered owned device: " + deviceId + " at:"); Log.d(TAG, "discovered owned device: " + deviceId + " at:");
while (endpoints != null) { while (endpoints != null) {
String[] endpointStr = new String[1]; String[] endpointStr = new String[1];
OCMain.endpointToString(endpoints, endpointStr); OCEndpointUtil.toString(endpoints, endpointStr);
Log.d(TAG, endpointStr[0]); Log.d(TAG, endpointStr[0]);
endpoints = endpoints.getNext(); endpoints = endpoints.getNext();
} }
......
...@@ -3,10 +3,10 @@ package org.iotivity.onboardingtool; ...@@ -3,10 +3,10 @@ package org.iotivity.onboardingtool;
import android.util.Log; import android.util.Log;
import org.iotivity.OCEndpoint; import org.iotivity.OCEndpoint;
import org.iotivity.OCMain; import org.iotivity.OCEndpointUtil;
import org.iotivity.OCObtDiscoveryHandler; import org.iotivity.OCObtDiscoveryHandler;
import org.iotivity.OCUuidUtil;
import org.iotivity.OCUuid; import org.iotivity.OCUuid;
import org.iotivity.OCUuidUtil;
public class UnownedDeviceHandler implements OCObtDiscoveryHandler { public class UnownedDeviceHandler implements OCObtDiscoveryHandler {
...@@ -24,7 +24,7 @@ public class UnownedDeviceHandler implements OCObtDiscoveryHandler { ...@@ -24,7 +24,7 @@ public class UnownedDeviceHandler implements OCObtDiscoveryHandler {
Log.d(TAG, "discovered unowned device: " + deviceId + " at:"); Log.d(TAG, "discovered unowned device: " + deviceId + " at:");
while (endpoints != null) { while (endpoints != null) {
String[] endpointStr = new String[1]; String[] endpointStr = new String[1];
OCMain.endpointToString(endpoints, endpointStr); OCEndpointUtil.toString(endpoints, endpointStr);
Log.d(TAG, endpointStr[0]); Log.d(TAG, endpointStr[0]);
endpoints = endpoints.getNext(); endpoints = endpoints.getNext();
} }
......
...@@ -3,6 +3,7 @@ package org.iotivity.simpleclient; ...@@ -3,6 +3,7 @@ package org.iotivity.simpleclient;
import org.iotivity.OCDiscoveryFlags; import org.iotivity.OCDiscoveryFlags;
import org.iotivity.OCDiscoveryHandler; import org.iotivity.OCDiscoveryHandler;
import org.iotivity.OCEndpoint; import org.iotivity.OCEndpoint;
import org.iotivity.OCEndpointUtil;
import org.iotivity.OCInterfaceMask; import org.iotivity.OCInterfaceMask;
import org.iotivity.OCMain; import org.iotivity.OCMain;
import org.iotivity.OCQos; import org.iotivity.OCQos;
...@@ -108,7 +109,7 @@ public class MyDiscoveryHandler implements OCDiscoveryHandler { ...@@ -108,7 +109,7 @@ public class MyDiscoveryHandler implements OCDiscoveryHandler {
OCEndpoint ep = endpoint; OCEndpoint ep = endpoint;
while (ep != null) { while (ep != null) {
String[] endpointStr = new String[1]; String[] endpointStr = new String[1];
OCMain.endpointToString(ep, endpointStr); OCEndpointUtil.toString(ep, endpointStr);
activity.msg("\t\tendpoint: " + endpointStr[0]); activity.msg("\t\tendpoint: " + endpointStr[0]);
activity.msg("\t\t\tendpoint.device " + ep.getDevice()); activity.msg("\t\t\tendpoint.device " + ep.getDevice());
activity.msg("\t\t\tendpoint.flags " + ep.getFlags()); activity.msg("\t\t\tendpoint.flags " + ep.getFlags());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment