From 357936b13d8c3255ba5f4927a720c3ddd1532273 Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Thu, 10 Sep 2015 17:49:06 +0530 Subject: [PATCH] [Things-Manager] Updated Things Manager Sample Applications - Updated TMSampleApp and con-server app as per new Java SDK Change-Id: Ic699461a1c0e31fff01366ba41bc758836b60da9 Signed-off-by: Jay Sharma Reviewed-on: https://gerrit.iotivity.org/gerrit/2426 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../Sample/src/com/tm/sample/ActionListener.java | 18 +- .../com/tm/sample/ConfigurationApiActivity.java | 269 +++++++++-------- .../src/com/tm/sample/ConfigurationListener.java | 7 +- .../src/com/tm/sample/DiagnosticListener.java | 51 ---- .../Sample/src/com/tm/sample/GroupApiActivity.java | 7 +- .../Sample/src/com/tm/sample/GroupClient.java | 109 +++---- .../Sample/src/com/tm/sample/MainActivity.java | 18 +- .../example/con_server/ConfigurationResource.java | 45 +-- .../example/con_server/ConfigurationServer.java | 336 ++++++++++++--------- .../com/example/con_server/FactorySetResource.java | 53 ++-- .../src/com/example/con_server/MainActivity.java | 14 +- ...sticsResource.java => MaintenanceResource.java} | 103 ++++--- 12 files changed, 527 insertions(+), 503 deletions(-) delete mode 100644 service/things-manager/sampleapp/android/Sample/src/com/tm/sample/DiagnosticListener.java rename service/things-manager/sampleapp/android/con-server/src/com/example/con_server/{DiagnosticsResource.java => MaintenanceResource.java} (64%) diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ActionListener.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ActionListener.java index e8de3c4..0296985 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ActionListener.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ActionListener.java @@ -27,7 +27,7 @@ import org.iotivity.base.OcRepresentation; import org.iotivity.service.tm.Action; import org.iotivity.service.tm.ActionSet; import org.iotivity.service.tm.Capability; -import org.iotivity.service.tm.IActionListener; +import org.iotivity.service.tm.GroupManager.*; import android.os.Message; import android.util.Log; @@ -38,8 +38,9 @@ import android.util.Log; */ public class ActionListener implements IActionListener { - private final String LOG_TAG = "[TMSample] " + this.getClass() - .getSimpleName(); + private final String LOG_TAG = "[TMSample] " + + this.getClass() + .getSimpleName(); private static Message msg; private String logMessage; private GroupApiActivity groupApiActivityObj = null; @@ -51,15 +52,14 @@ public class ActionListener implements IActionListener { groupApiActivityObj = GroupApiActivity.getGroupApiActivityObj(); logMessage = "API Result : SUCCESS" + "\n"; - logMessage = logMessage - + "Recieved Callback for called API (OnPostCallback)" + "\n"; + logMessage += "Recieved Callback for called API (OnPostCallback)" + + "\n"; // sending message to handler of GroupApiActivity to Update the UI GroupApiActivity.setMessageLog(logMessage); msg = Message.obtain(); msg.what = 1; groupApiActivityObj.getHandler().sendMessage(msg); - } @Override @@ -103,7 +103,6 @@ public class ActionListener implements IActionListener { msg = Message.obtain(); msg.what = 1; groupApiActivityObj.getHandler().sendMessage(msg); - } @Override @@ -113,15 +112,12 @@ public class ActionListener implements IActionListener { groupApiActivityObj = GroupApiActivity.getGroupApiActivityObj(); logMessage = "API Result : SUCCESS" + "\n"; - logMessage = logMessage - + "Recieved Callback for called API (onPutResponseCallback)" + logMessage += "Recieved Callback for called API (onPutResponseCallback)" + "\n"; GroupApiActivity.setMessageLog(logMessage); // sending message to handler of GroupApiActivity to Update the UI msg = Message.obtain(); msg.what = 1; groupApiActivityObj.getHandler().sendMessage(msg); - } - } diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java index ca6b781..472f0ed 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java @@ -31,11 +31,14 @@ import org.iotivity.base.OcPlatform; import org.iotivity.base.OcRepresentation; import org.iotivity.base.OcResource; import org.iotivity.base.OcResourceHandle; -import org.iotivity.service.tm.IConfigurationListener; -import org.iotivity.service.tm.IDiagnosticsListener; -import org.iotivity.service.tm.IFindCandidateResourceListener; +import org.iotivity.service.tm.GroupSynchronization; import org.iotivity.service.tm.OCStackResult; -import org.iotivity.service.tm.ThingsManager; +import org.iotivity.service.tm.GroupManager; +import org.iotivity.service.tm.ThingsMaintenance; +import org.iotivity.service.tm.GroupManager.*; +import org.iotivity.service.tm.ThingsConfiguration; +import org.iotivity.service.tm.ThingsConfiguration.*; +import org.iotivity.service.tm.ThingsMaintenance.*; import android.app.Activity; import android.app.Dialog; @@ -71,13 +74,13 @@ public class ConfigurationApiActivity extends Activity { private final String CONFIGURATION_COLLECTION_RESOURCE_URI = "/core/configuration/resourceset"; private final String CONFIGURATION_COLLECTION_RESOURCE_TYPE = "core.configuration.resourceset"; - private final String DIAGNOSTIC_COLLECTION_RESOURCE_URI = "/core/diagnostics/resourceset"; - private final String DIAGNOSTIC_COLLECTION_RESOURCE_TYPE = "core.diagnostics.resourceset"; + private final String MAINTENANCE_COLLECTION_RESOURCE_URI = "/core/maintenance/resourceset"; + private final String MAINTENANCE_COLLECTION_RESOURCE_TYPE = "core.maintenance.resourceset"; private final String FACTORYSET_COLLECTION_RESOURCE_URI = "/core/factoryset/resourceset"; private final String FACTORYSET_COLLECTION_RESOURCE_TYPE = "core.factoryset.resourceset"; private final String CONFIGURATION_RESOURCE_URI = "/oic/con"; - private final String DIAGNOSTIC_RESOURCE_URI = "/oic/diag"; + private final String MAINTENANCE_RESOURCE_URI = "/oic/mnt"; private final String FACTORYSET_RESOURCE_URI = "/factorySet"; private ListView list; @@ -90,13 +93,16 @@ public class ConfigurationApiActivity extends Activity { private static Handler mHandler; private static Message msg; - private ThingsManager thingsManager = null; + private GroupManager groupManager = null; + private GroupSynchronization groupSyn = null; + private ThingsConfiguration thingsConfiguration = null; + private ThingsMaintenance thingsMaintenance = null; private Map resourceList = null; private Map collectionList = null; public boolean configurationResourceFlag = false; public boolean factorySetResourceFlag = false; - public boolean diagnosticsResourceFlag = false; + public boolean maintenanceResourceFlag = false; public static Context mcontext; public String region = ""; @@ -108,7 +114,10 @@ public class ConfigurationApiActivity extends Activity { setContentView(R.layout.configapis); mcontext = this; - thingsManager = new ThingsManager(); + groupManager = new GroupManager(); + groupSyn = new GroupSynchronization(); + thingsConfiguration = ThingsConfiguration.getInstance(); + thingsMaintenance = ThingsMaintenance.getInstance(); // set the listeners setResourceListener(); @@ -166,7 +175,7 @@ public class ConfigurationApiActivity extends Activity { displayToastMessage("Configuration collection resource does not exist!"); } else { Vector resourceTypes = new Vector(); - resourceTypes.add("oic.con"); + resourceTypes.add("oic.wk.con"); findCandidateResources(resourceTypes); logMessage = ""; @@ -174,7 +183,7 @@ public class ConfigurationApiActivity extends Activity { messageCount++; resourceTypes.clear(); - resourceTypes.add("oic.diag"); + resourceTypes.add("oic.wk.mnt"); findCandidateResources(resourceTypes); messageCount++; @@ -211,8 +220,8 @@ public class ConfigurationApiActivity extends Activity { try { createResourceCollection(CONFIGURATION_COLLECTION_RESOURCE_URI, CONFIGURATION_COLLECTION_RESOURCE_TYPE); - createResourceCollection(DIAGNOSTIC_COLLECTION_RESOURCE_URI, - DIAGNOSTIC_COLLECTION_RESOURCE_TYPE); + createResourceCollection(MAINTENANCE_COLLECTION_RESOURCE_URI, + MAINTENANCE_COLLECTION_RESOURCE_TYPE); createResourceCollection(FACTORYSET_COLLECTION_RESOURCE_URI, FACTORYSET_COLLECTION_RESOURCE_TYPE); } catch (OcException e) { @@ -292,12 +301,13 @@ public class ConfigurationApiActivity extends Activity { } private void setResourceListener() { - thingsManager + groupManager .setFindCandidateResourceListener(new IFindCandidateResourceListener() { @Override - synchronized public void onResourceCallback( + public void onResourceFoundCallback( Vector resources) { + // TODO Auto-generated method stub Log.i(LOG_TAG, "onResourceCallback: enter"); for (int i = 0; i < resources.size(); i++) { OcResource resource = resources.get(i); @@ -308,17 +318,14 @@ public class ConfigurationApiActivity extends Activity { Log.i(LOG_TAG, "Resource URI:" + uri); Log.i(LOG_TAG, "Resource HOST: " + host); Log.i(LOG_TAG, "Resource types: "); - logMessage = logMessage + "Resource URI : " + uri - + "\n"; - logMessage = logMessage + "Resource Host : " + host - + "\n"; + logMessage += "Resource URI : " + uri + "\n"; + logMessage += "Resource Host : " + host + "\n"; List resourcetypes = resource .getResourceTypes(); for (int j = 0; j < resourcetypes.size(); j++) { Log.i(LOG_TAG, resourcetypes.get(j)); - logMessage = logMessage + "ResourceType " - + (j + 1) + " : " + logMessage += "ResourceType " + (j + 1) + " : " + resourcetypes.get(j) + "\n"; } @@ -327,9 +334,8 @@ public class ConfigurationApiActivity extends Activity { .getResourceInterfaces(); for (int j = 0; j < interfacetypes.size(); j++) { Log.i(LOG_TAG, interfacetypes.get(j)); - logMessage = logMessage + "interfacetype " - + (j + 1) + " : " - + interfacetypes.get(j) + "\n"; + logMessage += "interfacetype " + (j + 1) + + " : " + interfacetypes.get(j) + "\n"; } try { @@ -353,95 +359,105 @@ public class ConfigurationApiActivity extends Activity { } private void setConfigurationListener() { - thingsManager.setConfigurationListener(new IConfigurationListener() { - @Override - public void onBootStrapCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - Log.i(LOG_TAG, "onBootStrapCallback: enter"); - } - - @Override - public void onUpdateConfigurationsCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - Log.i(LOG_TAG, "onUpdateConfigurationsCallback: enter"); - Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); - if (rep.hasAttribute("loc")) { - logMessage = logMessage + "Location : " - + rep.getValueString("loc") + "\n"; - } - if (rep.hasAttribute("st")) { - logMessage = logMessage + "System Time : " - + rep.getValueString("loc") + "\n"; - } - if (rep.hasAttribute("c")) { - logMessage = logMessage + "Currency : " - + rep.getValueString("c") + "\n"; - } - if (rep.hasAttribute("r")) { - logMessage = logMessage + "Region : " - + rep.getValueString("r") + "\n"; - } + thingsConfiguration + .setConfigurationListener(new IConfigurationListener() { + @Override + public void onBootStrapCallback( + Vector headerOptions, + OcRepresentation rep, int errorValue) { + Log.i(LOG_TAG, "onBootStrapCallback: enter"); + } - } + @Override + public void onUpdateConfigurationsCallback( + Vector headerOptions, + OcRepresentation rep, int errorValue) { + Log.i(LOG_TAG, "onUpdateConfigurationsCallback: enter"); + Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); + if (rep.hasAttribute("n")) { + logMessage += "Device Name : " + + rep.getValueString("n") + "\n"; + } + if (rep.hasAttribute("loc")) { + logMessage += "Location : " + + rep.getValueString("loc") + "\n"; + } + if (rep.hasAttribute("locn")) { + logMessage += "Location Name : " + + rep.getValueString("locn") + "\n"; + } + if (rep.hasAttribute("r")) { + logMessage += "Region : " + rep.getValueString("r") + + "\n"; + } + if (rep.hasAttribute("c")) { + logMessage += "Currency : " + + rep.getValueString("c") + "\n"; + } + } - @Override - public void onGetConfigurationsCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - Log.i(LOG_TAG, "onGetConfigurationsCallback: enter"); - Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); - logMessage = logMessage + "Resource URI : " + rep.getUri() - + "\n"; - - if (rep.hasAttribute("loc")) { - logMessage = logMessage + "Location : " - + rep.getValueString("loc") + "\n"; - } - if (rep.hasAttribute("st")) { - logMessage = logMessage + "System Time : " - + rep.getValueString("st") + "\n"; - } - if (rep.hasAttribute("c")) { - logMessage = logMessage + "Currency : " - + rep.getValueString("c") + "\n"; - } - if (rep.hasAttribute("r")) { - logMessage = logMessage + "Region : " - + rep.getValueString("r") + "\n"; - } + @Override + public void onGetConfigurationsCallback( + Vector headerOptions, + OcRepresentation rep, int errorValue) { + Log.i(LOG_TAG, "onGetConfigurationsCallback: enter"); + Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); + logMessage += "Resource URI : " + rep.getUri() + "\n"; + + if (rep.hasAttribute("n")) { + logMessage += "Device Name : " + + rep.getValueString("n") + "\n"; + } + if (rep.hasAttribute("loc")) { + logMessage += "Location : " + + rep.getValueString("loc") + "\n"; + } + if (rep.hasAttribute("locn")) { + logMessage += "Location Name : " + + rep.getValueString("locn") + "\n"; + } + if (rep.hasAttribute("r")) { + logMessage += "Region : " + rep.getValueString("r") + + "\n"; + } + if (rep.hasAttribute("c")) { + logMessage += "Currency : " + + rep.getValueString("c") + "\n"; + } - msg = Message.obtain(); - msg.what = 0; - mHandler.sendMessage(msg); - } - }); + msg = Message.obtain(); + msg.what = 0; + mHandler.sendMessage(msg); + } + }); } private void setDiagnosticsListener() { - thingsManager.setDiagnosticsListener(new IDiagnosticsListener() { + thingsMaintenance + .setThingsMaintenanceListener(new IThingsMaintenanceListener() { - @Override - public void onRebootCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - Log.i(LOG_TAG, "onRebootCallback: enter"); - } + @Override + public void onRebootCallback( + Vector headerOptions, + OcRepresentation rep, int errorValue) { + // TODO Auto-generated method stu + } - @Override - public void onFactoryResetCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - Log.i(LOG_TAG, "onFactoryResetCallback: enter"); - } - }); + @Override + public void onFactoryResetCallback( + Vector headerOptions, + OcRepresentation rep, int errorValue) { + // TODO Auto-generated method stub + + } + }); } /** * This method find the resources available in network. */ private void findCandidateResources(Vector resourceTypes) { - OCStackResult result = thingsManager.findCandidateResources( + OCStackResult result = groupManager.findCandidateResources( resourceTypes, 5); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "Error while calling findCandidateResources"); @@ -450,8 +466,7 @@ public class ConfigurationApiActivity extends Activity { displayToastMessage(toastmessage); } if (messageCount == 1) - logMessage = logMessage + "API RESULT : " + result.toString() - + "\n"; + logMessage += "API RESULT : " + result.toString() + "\n"; } /** @@ -479,7 +494,7 @@ public class ConfigurationApiActivity extends Activity { OCStackResult result = OCStackResult.OC_STACK_ERROR; try { - result = thingsManager.getConfigurations( + result = thingsConfiguration.getConfigurations( configurationCollection.resource, configs); } catch (OcException e) { e.printStackTrace(); @@ -517,7 +532,7 @@ public class ConfigurationApiActivity extends Activity { OCStackResult result = OCStackResult.OC_STACK_ERROR; try { - result = thingsManager.updateConfigurations( + result = thingsConfiguration.updateConfigurations( configurationCollection.resource, configurations); } catch (OcException e) { e.printStackTrace(); @@ -529,7 +544,7 @@ public class ConfigurationApiActivity extends Activity { displayToastMessage(toastmessage); } logMessage = "API RESULT : " + result.toString() + "\n"; - logMessage = logMessage + "Updating region to " + region; + logMessage += "Updating region to " + region; msg = Message.obtain(); msg.what = 0; mHandler.sendMessage(msg); @@ -541,14 +556,14 @@ public class ConfigurationApiActivity extends Activity { */ private void factoryReset() { ResourceInformation diagnosticsCollection = collectionList - .get(DIAGNOSTIC_COLLECTION_RESOURCE_URI); + .get(MAINTENANCE_COLLECTION_RESOURCE_URI); if (null == diagnosticsCollection || null == diagnosticsCollection.resource) { displayToastMessage("Diagnostic collection does not exist!"); return; } - if (false == diagnosticsResourceFlag) { + if (false == maintenanceResourceFlag) { displayToastMessage("Diagnostic resource does not exist!"); return; } @@ -556,7 +571,8 @@ public class ConfigurationApiActivity extends Activity { OCStackResult result = OCStackResult.values()[30]; try { - result = thingsManager.factoryReset(diagnosticsCollection.resource); + result = thingsMaintenance + .factoryReset(diagnosticsCollection.resource); } catch (OcException e) { e.printStackTrace(); } @@ -579,20 +595,20 @@ public class ConfigurationApiActivity extends Activity { */ private void reboot() { ResourceInformation diagnosticsCollection = collectionList - .get(DIAGNOSTIC_COLLECTION_RESOURCE_URI); + .get(MAINTENANCE_COLLECTION_RESOURCE_URI); if (null == diagnosticsCollection || null == diagnosticsCollection.resource) { displayToastMessage("Diagnostic collection does not exist!"); return; } - if (false == diagnosticsResourceFlag) { + if (false == maintenanceResourceFlag) { displayToastMessage("Diagnostic resource does not exist!"); return; } OCStackResult result = OCStackResult.OC_STACK_ERROR; try { - result = thingsManager.reboot(diagnosticsCollection.resource); + result = thingsMaintenance.reboot(diagnosticsCollection.resource); } catch (OcException e) { e.printStackTrace(); } @@ -613,7 +629,7 @@ public class ConfigurationApiActivity extends Activity { * Response will be in JSON format (key-value pair). */ private String getListOfSupportedConfigurationUnits() { - return thingsManager.getListOfSupportedConfigurationUnits(); + return thingsConfiguration.getListOfSupportedConfigurationUnits(); } private void displayToastMessage(String message) { @@ -674,14 +690,14 @@ public class ConfigurationApiActivity extends Activity { OcResourceHandle handle; handle = resourceInfoCollection.resourceHandle; resourceInfo.resourceHandle = handle; - resourceInfo.resourceHandle = thingsManager.bindResourceToGroup( + resourceInfo.resourceHandle = groupManager.bindResourceToGroup( resource, handle); resourceList.put(uri + host, resourceInfo); configurationResourceFlag = true; - } else if (uri.equalsIgnoreCase("/oic/diag")) { + } else if (uri.equalsIgnoreCase("/oic/mnt")) { ResourceInformation diagnosticResource = collectionList - .get(DIAGNOSTIC_COLLECTION_RESOURCE_URI); + .get(MAINTENANCE_COLLECTION_RESOURCE_URI); if (null == diagnosticResource || null == diagnosticResource.resourceHandle) { Log.e(LOG_TAG, "Invalid Configuration collection!"); @@ -690,15 +706,15 @@ public class ConfigurationApiActivity extends Activity { ResourceInformation resourceInfoCollection; resourceInfoCollection = collectionList - .get(DIAGNOSTIC_COLLECTION_RESOURCE_URI); + .get(MAINTENANCE_COLLECTION_RESOURCE_URI); OcResourceHandle handle; handle = resourceInfoCollection.resourceHandle; resourceInfo.resourceHandle = handle; - resourceInfo.resourceHandle = thingsManager.bindResourceToGroup( + resourceInfo.resourceHandle = groupManager.bindResourceToGroup( resource, handle); resourceList.put(uri + host, resourceInfo); - diagnosticsResourceFlag = true; + maintenanceResourceFlag = true; } else if (uri.equalsIgnoreCase("/factorySet")) { ResourceInformation factorysetResource = collectionList .get(FACTORYSET_COLLECTION_RESOURCE_URI); @@ -714,7 +730,7 @@ public class ConfigurationApiActivity extends Activity { OcResourceHandle handle; handle = resourceInfoCollection.resourceHandle; resourceInfo.resourceHandle = handle; - resourceInfo.resourceHandle = thingsManager.bindResourceToGroup( + resourceInfo.resourceHandle = groupManager.bindResourceToGroup( resource, handle); resourceList.put(uri + host, resourceInfo); @@ -740,14 +756,14 @@ public class ConfigurationApiActivity extends Activity { OcResourceHandle resourceHandle = null; // Crate group - OCStackResult result = thingsManager.createGroup(typename); + OCStackResult result = groupSyn.createGroup(typename); if ((OCStackResult.OC_STACK_OK != result)) { Log.e(LOG_TAG, "createGroup returned error: " + result.name()); return; } else { Log.e(LOG_TAG, "createGroup returned: " + result.name()); } - groupList = thingsManager.getGroupList(); + groupList = groupSyn.getGroupList(); if (groupList.containsKey(typename)) { resourceHandle = groupList.get(typename); } else { @@ -785,9 +801,9 @@ public class ConfigurationApiActivity extends Activity { } } else if (resource.resource.getUri().equalsIgnoreCase( - DIAGNOSTIC_RESOURCE_URI)) { + MAINTENANCE_RESOURCE_URI)) { ResourceInformation diagnosticResource = collectionList - .get(DIAGNOSTIC_COLLECTION_RESOURCE_URI); + .get(MAINTENANCE_COLLECTION_RESOURCE_URI); if (null != diagnosticResource && null != diagnosticResource.resourceHandle) { OcPlatform @@ -805,16 +821,15 @@ public class ConfigurationApiActivity extends Activity { .unregisterResource(resource.resourceHandle); Log.i(LOG_TAG, "unregistered resource" + CONFIGURATION_COLLECTION_RESOURCE_URI); - } } } } // delete all the groups - thingsManager.deleteGroup(CONFIGURATION_COLLECTION_RESOURCE_TYPE); - thingsManager.deleteGroup(DIAGNOSTIC_COLLECTION_RESOURCE_TYPE); - thingsManager.deleteGroup(FACTORYSET_COLLECTION_RESOURCE_TYPE); + groupSyn.deleteGroup(CONFIGURATION_COLLECTION_RESOURCE_TYPE); + groupSyn.deleteGroup(MAINTENANCE_COLLECTION_RESOURCE_TYPE); + groupSyn.deleteGroup(FACTORYSET_COLLECTION_RESOURCE_TYPE); } catch (OcException e) { Log.e(LOG_TAG, "OcException occured! " + e.toString()); } diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationListener.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationListener.java index d5e502e..6cdee08 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationListener.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationListener.java @@ -23,7 +23,8 @@ import java.util.Vector; import org.iotivity.base.OcHeaderOption; import org.iotivity.base.OcRepresentation; -import org.iotivity.service.tm.IConfigurationListener; +import org.iotivity.service.tm.ThingsConfiguration; +import org.iotivity.service.tm.ThingsConfiguration.*; import android.util.Log; @@ -32,7 +33,8 @@ import android.util.Log; */ public class ConfigurationListener implements IConfigurationListener { - private final String LOG_TAG = "[TMSample] " + this.getClass().getSimpleName(); + private final String LOG_TAG = "[TMSample] " + + this.getClass().getSimpleName(); @Override public void onBootStrapCallback(Vector headerOptions, @@ -55,5 +57,4 @@ public class ConfigurationListener implements IConfigurationListener { Log.i(LOG_TAG, "Got Callback : onGetConfigurationsCallback"); } - } diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/DiagnosticListener.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/DiagnosticListener.java deleted file mode 100644 index 9905015..0000000 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/DiagnosticListener.java +++ /dev/null @@ -1,51 +0,0 @@ -/****************************************************************** - * - * Copyright 2015 Samsung Electronics All Rights Reserved. - * - * - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ -package com.tm.sample; - -import java.util.Vector; - -import org.iotivity.base.OcHeaderOption; -import org.iotivity.base.OcRepresentation; -import org.iotivity.service.tm.IDiagnosticsListener; - -import android.util.Log; - -/** - * For receiving Diagnostic APIs callback : BootStrap,Reboot & FactoryReset - */ -public class DiagnosticListener implements IDiagnosticsListener { - - private final String LOG_TAG = "[TMSample] " + this.getClass().getSimpleName(); - - @Override - public void onRebootCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - Log.i(LOG_TAG, "Got Callback : onRebootCallback"); - - } - - @Override - public void onFactoryResetCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - Log.i(LOG_TAG, "Got Callback : onFactoryResetCallback"); - - } - -} diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupApiActivity.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupApiActivity.java index 3ab7793..a67e31e 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupApiActivity.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupApiActivity.java @@ -63,9 +63,10 @@ public class GroupApiActivity extends Activity { // For Scheduled ActionSet public static Context mcontext; public static Calendar scheduleTime; - - private final String LOG_TAG = "[TMSample] " + this.getClass() - .getSimpleName();; + + private final String LOG_TAG = "[TMSample] " + + this.getClass() + .getSimpleName(); ; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java index 0bc6d72..c2b9cf0 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java @@ -35,10 +35,11 @@ import org.iotivity.base.OcResourceHandle; import org.iotivity.service.tm.Action; import org.iotivity.service.tm.ActionSet; import org.iotivity.service.tm.Capability; -import org.iotivity.service.tm.IFindCandidateResourceListener; -import org.iotivity.service.tm.IFindGroupListener; +import org.iotivity.service.tm.GroupSynchronization; +import org.iotivity.service.tm.GroupSynchronization.*; import org.iotivity.service.tm.OCStackResult; -import org.iotivity.service.tm.ThingsManager; +import org.iotivity.service.tm.GroupManager; +import org.iotivity.service.tm.GroupManager.*; import org.iotivity.service.tm.Time.ActionSetType; import android.os.Message; @@ -50,21 +51,22 @@ import android.util.Log; */ public class GroupClient { - private static final String LOG_TAG = "[TMSample] GroupClient"; - private static Message msg; - public String logMessage; + private static final String LOG_TAG = "[TMSample] GroupClient"; + private static Message msg; + public String logMessage; - private final String groupResourceType = "b.collection"; + private final String groupResourceType = "b.collection"; - private final ThingsManager thingsManagerObj; - private final ActionListener actionListener; - private final ObserveListener observeListener; - private OcResource groupResource; - private OcResourceHandle groupResourceHandle; - private OcResourceHandle foundLightHandle; - private static GroupApiActivity groupApiActivityObj = null; - public static Vector lights = new Vector(); - public static Vector bookmarks = new Vector(); + private final GroupManager groupManagerObj; + private final GroupSynchronization groupSynObj; + private final ActionListener actionListener; + private final ObserveListener observeListener; + private OcResource groupResource; + private OcResourceHandle groupResourceHandle; + private OcResourceHandle foundLightHandle; + private static GroupApiActivity groupApiActivityObj = null; + public static Vector lights = new Vector(); + public static Vector bookmarks = new Vector(); /** * Listener for receiving observe notifications. @@ -108,8 +110,8 @@ public class GroupClient { groupApiActivityObj.getHandler().sendMessage(msg); logMessage = "onGroupFind" + "\n"; - logMessage = logMessage + "URI : " + uri + "\n"; - logMessage = logMessage + "Host :" + hostAddress; + logMessage += "URI : " + uri + "\n"; + logMessage += "Host :" + hostAddress; GroupApiActivity.setMessageLog(logMessage); msg = Message.obtain(); msg.what = 1; @@ -129,8 +131,10 @@ public class GroupClient { */ private class FindCadidateResourceListener implements IFindCandidateResourceListener { + @Override - public void onResourceCallback(Vector resources) { + public void onResourceFoundCallback(Vector resources) { + // TODO Auto-generated method stub Log.i(LOG_TAG, "onResourceCallback invoked"); if (resources != null) { @@ -141,8 +145,8 @@ public class GroupClient { String hostAddress = ocResource.getHost(); logMessage = "API RESULT : " + "OC_STACK_OK" + "\n"; - logMessage = logMessage + "URI: " + resourceURI + "\n"; - logMessage = logMessage + "Host:" + hostAddress; + logMessage += "URI: " + resourceURI + "\n"; + logMessage += "Host:" + hostAddress; GroupApiActivity.setMessageLog(logMessage); msg = Message.obtain(); msg.what = 1; @@ -155,16 +159,15 @@ public class GroupClient { logMessage = "API RESULT : " + "OC_STACK_OK" + "\n"; - logMessage = logMessage + "URI: " + resourceURI - + "\n"; - logMessage = logMessage + "Host:" + hostAddress; + logMessage += "URI: " + resourceURI + "\n"; + logMessage += "Host:" + hostAddress; GroupApiActivity.setMessageLog(logMessage); msg = Message.obtain(); msg.what = 1; groupApiActivityObj.getHandler().sendMessage( msg); try { - foundLightHandle = thingsManagerObj + foundLightHandle = groupManagerObj .bindResourceToGroup(ocResource, groupResourceHandle); @@ -182,9 +185,8 @@ public class GroupClient { if (groupApiActivityObj != null) { logMessage = "API RESULT : " + "OC_STACK_OK" + "\n"; - logMessage = logMessage + "URI: " + resourceURI - + "\n"; - logMessage = logMessage + "Host:" + hostAddress; + logMessage += "URI: " + resourceURI + "\n"; + logMessage += "Host:" + hostAddress; GroupApiActivity.setMessageLog(logMessage); msg = Message.obtain(); msg.what = 1; @@ -197,6 +199,7 @@ public class GroupClient { } } } + } }; @@ -204,16 +207,17 @@ public class GroupClient { private final FindGroupListener findGroupListener; public GroupClient() { - thingsManagerObj = new ThingsManager(); + groupManagerObj = new GroupManager(); + groupSynObj = GroupSynchronization.getInstance(); findGroupListener = new FindGroupListener(); actionListener = new ActionListener(); observeListener = new ObserveListener(); findCandidateResourceListener = new FindCadidateResourceListener(); - thingsManagerObj.setGroupListener(findGroupListener); - thingsManagerObj + groupSynObj.setGroupListener(findGroupListener); + groupManagerObj .setFindCandidateResourceListener(findCandidateResourceListener); - thingsManagerObj.setActionListener(actionListener); + groupManagerObj.setActionListener(actionListener); groupApiActivityObj = GroupApiActivity.getGroupApiActivityObj(); } @@ -226,7 +230,8 @@ public class GroupClient { Map groupList = new HashMap(); // creating group of type b.collection - OCStackResult result = thingsManagerObj.createGroup(groupResourceType); + // OcPlatform.registerResource(ocResource); + OCStackResult result = groupSynObj.createGroup(groupResourceType); if ((OCStackResult.OC_STACK_OK != result)) { Log.e(LOG_TAG, "createGroup returned error: " + result.name()); return; @@ -235,7 +240,7 @@ public class GroupClient { } // getting the Created group Handle - groupList = thingsManagerObj.getGroupList(); + groupList = groupSynObj.getGroupList(); if (groupList.containsKey(groupResourceType)) { groupResourceHandle = groupList.get(groupResourceType); } else { @@ -252,7 +257,7 @@ public class GroupClient { Vector resourceTypes = new Vector(); resourceTypes.add(groupResourceType); - OCStackResult result = thingsManagerObj.findGroup(resourceTypes); + OCStackResult result = groupSynObj.findGroup(resourceTypes); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "findGroup returned error: " + result.name()); return; @@ -276,8 +281,7 @@ public class GroupClient { Vector types = new Vector(); types.add("core.light"); - OCStackResult result = thingsManagerObj - .findCandidateResources(types, 5); + OCStackResult result = groupManagerObj.findCandidateResources(types, 5); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "findCandidateResources returned error: " + result.name()); @@ -292,8 +296,7 @@ public class GroupClient { Vector types = new Vector(); types.add("core.bookmark"); - OCStackResult result = thingsManagerObj - .findCandidateResources(types, 5); + OCStackResult result = groupManagerObj.findCandidateResources(types, 5); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "findCandidateResources returned error: " + result.name()); @@ -329,7 +332,7 @@ public class GroupClient { } try { - OCStackResult result = thingsManagerObj.addActionSet(groupResource, + OCStackResult result = groupManagerObj.addActionSet(groupResource, actionSet); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "addActionSet returned error: " + result.name()); @@ -370,7 +373,7 @@ public class GroupClient { } try { - OCStackResult result = thingsManagerObj.addActionSet(groupResource, + OCStackResult result = groupManagerObj.addActionSet(groupResource, actionSet); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "addActionSet returned error: " + result.name()); @@ -419,7 +422,7 @@ public class GroupClient { } try { - OCStackResult result = thingsManagerObj.addActionSet(groupResource, + OCStackResult result = groupManagerObj.addActionSet(groupResource, actionSet); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "addActionSet returned error: " + result.name()); @@ -463,7 +466,7 @@ public class GroupClient { } try { - OCStackResult result = thingsManagerObj.addActionSet(groupResource, + OCStackResult result = groupManagerObj.addActionSet(groupResource, actionSet); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, "addActionSet returned error: " + result.name()); @@ -606,7 +609,7 @@ public class GroupClient { Log.i(LOG_TAG, "getting the action set of bulb on action"); try { - OCStackResult result = thingsManagerObj.getActionSet(groupResource, + OCStackResult result = groupManagerObj.getActionSet(groupResource, "AllBulbOn"); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, @@ -625,7 +628,7 @@ public class GroupClient { Log.i(LOG_TAG, "getting the action set of bulb off action"); try { - OCStackResult result = thingsManagerObj.getActionSet(groupResource, + OCStackResult result = groupManagerObj.getActionSet(groupResource, "AllBulbOff"); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, @@ -644,7 +647,7 @@ public class GroupClient { Log.i(LOG_TAG, "deleting the action set of bulb on action"); try { - OCStackResult result = thingsManagerObj.deleteActionSet( + OCStackResult result = groupManagerObj.deleteActionSet( groupResource, "AllBulbOn"); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, @@ -663,7 +666,7 @@ public class GroupClient { Log.i(LOG_TAG, "deleting the action set of bulb off action"); try { - OCStackResult result = thingsManagerObj.deleteActionSet( + OCStackResult result = groupManagerObj.deleteActionSet( groupResource, "AllBulbOff"); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, @@ -694,9 +697,9 @@ public class GroupClient { * groups. */ public void leaveGroup() { - thingsManagerObj.setGroupListener(null); - thingsManagerObj.setFindCandidateResourceListener(null); - thingsManagerObj.setActionListener(null); + groupSynObj.setGroupListener(null); + groupManagerObj.setFindCandidateResourceListener(null); + groupManagerObj.setActionListener(null); if (null != foundLightHandle) { try { @@ -710,7 +713,7 @@ public class GroupClient { } if (null != groupResourceHandle) { - thingsManagerObj.deleteGroup(groupResourceType); + groupSynObj.deleteGroup(groupResourceType); } else { Log.i(LOG_TAG, "groupResourceHandle is NULL"); } @@ -718,7 +721,7 @@ public class GroupClient { private void executeActionSet(String actonSetName, long delay) { try { - OCStackResult result = thingsManagerObj.executeActionSet( + OCStackResult result = groupManagerObj.executeActionSet( groupResource, actonSetName, delay); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, @@ -732,7 +735,7 @@ public class GroupClient { private void cancelActionSet(String actionSetName) { try { - OCStackResult result = thingsManagerObj.cancelActionSet( + OCStackResult result = groupManagerObj.cancelActionSet( groupResource, actionSetName); if (OCStackResult.OC_STACK_OK != result) { Log.e(LOG_TAG, diff --git a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/MainActivity.java b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/MainActivity.java index 3ea6935..71f5df0 100644 --- a/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/MainActivity.java +++ b/service/things-manager/sampleapp/android/Sample/src/com/tm/sample/MainActivity.java @@ -26,7 +26,8 @@ import org.iotivity.base.OcPlatform; import org.iotivity.base.PlatformConfig; import org.iotivity.base.QualityOfService; import org.iotivity.base.ServiceType; -import org.iotivity.service.tm.ThingsManager; +import org.iotivity.service.tm.GroupManager; +import org.iotivity.service.tm.GroupManager.*; import android.app.Activity; import android.app.AlertDialog; @@ -54,9 +55,10 @@ public class MainActivity extends Activity { private ArrayAdapter apis; private ArrayList apisList; private ListView list; - private final String LOG_TAG = "[TMSample] " + this.getClass() - .getSimpleName(); - public ThingsManager thingsManagerObj = new ThingsManager(); + private final String LOG_TAG = "[TMSample] " + + this.getClass() + .getSimpleName(); + public GroupManager groupManagerObj = new GroupManager(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -130,13 +132,15 @@ public class MainActivity extends Activity { dialog = dialogBuilder.create(); dialog.show(); - Log.i(LOG_TAG, "WiFi is not enabled/connected! Please connect the WiFi and start application again..."); + Log.i(LOG_TAG, + "WiFi is not enabled/connected! Please connect the WiFi and start application again..."); return; } // If wifi is connected calling the configure method for configuring the // OcPlatform - platformConfigObj = new PlatformConfig(getApplicationContext(),ServiceType.IN_PROC, - ModeType.CLIENT_SERVER, "0.0.0.0", 0, QualityOfService.LOW); + platformConfigObj = new PlatformConfig(getApplicationContext(), + ServiceType.IN_PROC, ModeType.CLIENT_SERVER, "0.0.0.0", 0, + QualityOfService.LOW); Log.i(LOG_TAG, "Before Calling Configure of ocPlatform"); OcPlatform.Configure(platformConfigObj); diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationResource.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationResource.java index 69a1f41..65ff74a 100644 --- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationResource.java +++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationResource.java @@ -37,8 +37,9 @@ public class ConfigurationResource { .getSimpleName(); // Configuration resource members protected String configurationUri; + protected String deviceName; protected String location; - protected String systemTime; + protected String locationName; protected String currency; protected String region; protected Vector configurationTypes = new Vector(); @@ -50,8 +51,9 @@ public class ConfigurationResource { public ConfigurationResource() { Log.i(LOG_TAG, "ConfigurationResource: enter"); + deviceName = ConfigurationDefaultValues.defaultDeviceName; location = ConfigurationDefaultValues.defaultLocation; - systemTime = ConfigurationDefaultValues.defaultSystemTime; + locationName = ConfigurationDefaultValues.defaultLocationName; currency = ConfigurationDefaultValues.defaultCurrency; region = ConfigurationDefaultValues.defaultRegion; @@ -60,10 +62,12 @@ public class ConfigurationResource { .add(ConfigurationDefaultValues.ConResourceTypePrefix); configurationInterfaces.add(OcPlatform.DEFAULT_INTERFACE); + configurationRep.setValueString("n", deviceName); configurationRep.setValueString("loc", location); - configurationRep.setValueString("st", systemTime); + configurationRep.setValueString("locn", locationName); configurationRep.setValueString("c", currency); configurationRep.setValueString("r", region); + configurationRep.setUri(configurationUri); configurationRep.setResourceTypes(configurationTypes); configurationRep.setResourceInterfaces(configurationInterfaces); @@ -88,25 +92,29 @@ public class ConfigurationResource { public void setConfigurationRepresentation(OcRepresentation rep) { Log.i(LOG_TAG, "setConfigurationRepresentation: enter"); - String loc; - String st; - String cur; - String reg; - loc = rep.getValueString("loc"); - st = rep.getValueString("st"); - cur = rep.getValueString("c"); - reg = rep.getValueString("r"); + String dName = rep.getValueString("n"); + String loc = rep.getValueString("loc"); + String locn = rep.getValueString("locn"); + String cur = rep.getValueString("c"); + String reg = rep.getValueString("r"); + + if (!(dName.equalsIgnoreCase(""))) { + deviceName = dName; + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(deviceName): " + + deviceName); + } if (!(loc.equalsIgnoreCase(""))) { location = loc; Log.i(LOG_TAG, "setConfigurationRepresentation: New value(location): " + location); } - if (!(st.equalsIgnoreCase(""))) { - systemTime = st; + if (!(locn.equalsIgnoreCase(""))) { + locationName = locn; Log.i(LOG_TAG, - "setConfigurationRepresentation: New value(system time): " - + systemTime); + "setConfigurationRepresentation: New value(locationName): " + + locationName); } if (!(cur.equalsIgnoreCase(""))) { currency = cur; @@ -126,8 +134,9 @@ public class ConfigurationResource { public OcRepresentation getConfigurationRepresentation() { + configurationRep.setValueString("n", deviceName); configurationRep.setValueString("loc", location); - configurationRep.setValueString("st", systemTime); + configurationRep.setValueString("locn", locationName); configurationRep.setValueString("c", currency); configurationRep.setValueString("r", region); return configurationRep; @@ -140,12 +149,12 @@ public class ConfigurationResource { // For resetting the default values to configuration Resource public void factoryReset() { + deviceName = ConfigurationDefaultValues.defaultDeviceName; location = ConfigurationDefaultValues.defaultLocation; - systemTime = ConfigurationDefaultValues.defaultSystemTime; + locationName = ConfigurationDefaultValues.defaultLocationName; currency = ConfigurationDefaultValues.defaultCurrency; region = ConfigurationDefaultValues.defaultRegion; Log.i(LOG_TAG, "ConfiguartionResource: factoryReset done"); - } // Deleting all the resources, that we have created using createResources() diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java index 671da02..7cbb4ff 100644 --- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java +++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java @@ -31,59 +31,62 @@ import org.iotivity.base.OcResourceRequest; import org.iotivity.base.OcResourceResponse; import org.iotivity.base.RequestHandlerFlag; import org.iotivity.base.RequestType; -import org.iotivity.service.tm.IConfigurationListener; -import org.iotivity.service.tm.IDiagnosticsListener; import org.iotivity.service.tm.OCStackResult; -import org.iotivity.service.tm.ThingsManager; +import org.iotivity.service.tm.GroupManager; +import org.iotivity.service.tm.ThingsConfiguration; +import org.iotivity.service.tm.ThingsConfiguration.*; +import org.iotivity.service.tm.ThingsMaintenance; +import org.iotivity.service.tm.ThingsMaintenance.*; import android.os.Message; import android.util.Log; /* - * For Creating the Resources [configurtion, Diagnostic & FactoryRest] & + * For Creating the Resources [configuration, Maintenance & FactoryRest] & * for Handling of the Client's Request */ -public class ConfigurationServer implements IDiagnosticsListener, - IConfigurationListener, OcPlatform.EntityHandler { - private final String LOG_TAG = "[CON-SERVER]" - + this.getClass() - .getSimpleName(); - private ThingsManager thingsmanager = null; - private ConfigurationResource conResource = null; - private DiagnosticsResource diagResource = null; - private FactorySetResource factorySetResource = null; +public class ConfigurationServer { + private final String LOG_TAG = "[CON-SERVER]" + + this.getClass() + .getSimpleName(); + private GroupManager groupmanager = null; + private ThingsConfiguration thingsconfig = null; + private ThingsMaintenance thingsmnt = null; + private ConfigurationResource conResource = null; + private MaintenanceResource mntResource = null; + private FactorySetResource factorySetResource = null; + + private final ThingsConfigurationListener thingConfigurationListener; + private final ThingsMaintenanceListener thingsMaintenanceListener; + private final RequestHandler requestHandler; // constructor public ConfigurationServer() { - thingsmanager = new ThingsManager(); - thingsmanager.setDiagnosticsListener(this); - thingsmanager.setConfigurationListener(this); - } + groupmanager = new GroupManager(); + thingsconfig = ThingsConfiguration.getInstance(); + thingsmnt = ThingsMaintenance.getInstance(); + thingConfigurationListener = new ThingsConfigurationListener(); + thingsMaintenanceListener = new ThingsMaintenanceListener(); + requestHandler = new RequestHandler(); - public void DoBootStrap() { - Log.i(LOG_TAG, "DoBootStrap: enter"); + thingsconfig.setConfigurationListener(thingConfigurationListener); + thingsmnt.setThingsMaintenanceListener(thingsMaintenanceListener); - OCStackResult result = thingsmanager.doBootstrap(); - if (OCStackResult.OC_STACK_ERROR == result) { - Log.e(LOG_TAG, "doBootStrap returned error: " - + OCStackResult.OC_STACK_ERROR.name()); - } - Log.i(LOG_TAG, "DoBootStrap: exit"); } - // Creating resources : configuration, diagnostics, factoryReset + // Creating resources : configuration, maintenance, factoryReset public void CreateConfigurationResource() { Log.i(LOG_TAG, "CreateConfigurationResource: enter"); try { conResource = new ConfigurationResource(); - conResource.createResource(this); + conResource.createResource(requestHandler); - diagResource = new DiagnosticsResource(); - diagResource.createResource(this); + mntResource = new MaintenanceResource(); + mntResource.createResource(requestHandler); factorySetResource = new FactorySetResource(); - factorySetResource.createResource(this); + factorySetResource.createResource(requestHandler); } catch (OcException e) { Log.e(LOG_TAG, "OcException occured: " + e.toString()); } @@ -97,123 +100,167 @@ public class ConfigurationServer implements IDiagnosticsListener, MainActivity mainActivityObj = MainActivity.getMainActivityObject(); MainActivity.setmessage(message); mainActivityObj.getmHandler().sendMessage(msg); + } + + public void DoBootStrap() { + Log.i(LOG_TAG, "DoBootStrap: enter"); + + OCStackResult result = thingsconfig.doBootstrap(); + if (OCStackResult.OC_STACK_ERROR == result) { + Log.e(LOG_TAG, "doBootStrap returned error: " + + OCStackResult.OC_STACK_ERROR.name()); + } + Log.i(LOG_TAG, "DoBootStrap: exit"); + } + + private class ThingsConfigurationListener implements IConfigurationListener { + + @Override + public void onBootStrapCallback(Vector headerOptions, + OcRepresentation rep, int errorValue) { + + String message; + Log.i(LOG_TAG, "onBootStrapCallback"); + + // setting the default values received from bootstrap Server + ConfigurationDefaultValues.defaultDeviceName = rep + .getValueString("n"); + ConfigurationDefaultValues.defaultLocation = rep + .getValueString("loc"); + ConfigurationDefaultValues.defaultLocationName = rep + .getValueString("locn"); + ConfigurationDefaultValues.defaultCurrency = rep + .getValueString("c"); + ConfigurationDefaultValues.defaultRegion = rep.getValueString("r"); + + // forming the message to display on UI + message = "URI : " + rep.getUri() + "\n"; + message += "Device Name : " + + ConfigurationDefaultValues.defaultDeviceName + "\n"; + message += "Location : " + + ConfigurationDefaultValues.defaultLocation + "\n"; + message += "Location Name : " + + ConfigurationDefaultValues.defaultLocationName + "\n"; + message += "Currency : " + + ConfigurationDefaultValues.defaultCurrency + "\n"; + message += "Region : " + ConfigurationDefaultValues.defaultRegion + + "\n"; + + Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); + Log.i(LOG_TAG, "Region: " + + ConfigurationDefaultValues.defaultRegion); + Log.i(LOG_TAG, "Device Name: " + + ConfigurationDefaultValues.defaultDeviceName); + Log.i(LOG_TAG, "Location: " + + ConfigurationDefaultValues.defaultLocation); + Log.i(LOG_TAG, "Location Name: " + + ConfigurationDefaultValues.defaultLocationName); + Log.i(LOG_TAG, "Currency: " + + ConfigurationDefaultValues.defaultCurrency); + + // showing the formed message on the UI + Message msg = Message.obtain(); + msg.what = 0; + MainActivity mainActivityObj = MainActivity.getMainActivityObject(); + MainActivity.setmessage(message); + mainActivityObj.getmHandler().sendMessage(msg); + // TODO Auto-generated method stub + } + + @Override + public void onUpdateConfigurationsCallback( + Vector headerOptions, OcRepresentation rep, + int errorValue) { + Log.i(LOG_TAG, "onUpdateConfigurationsCallback"); + } + @Override + public void onGetConfigurationsCallback( + Vector headerOptions, OcRepresentation rep, + int errorValue) { + Log.i(LOG_TAG, "onGetConfigurationsCallback"); + } + } + + private class ThingsMaintenanceListener implements + IThingsMaintenanceListener { + + // Callback Function for Reboot + @Override + public void onRebootCallback(Vector headerOptions, + OcRepresentation rep, int errorValue) { + Log.i(LOG_TAG, "onRebootCallback"); + } + + // Callback Function for FactoryReset + @Override + public void onFactoryResetCallback( + Vector headerOptions, OcRepresentation rep, + int errorValue) { + Log.i(LOG_TAG, "onFactoryResetCallback"); + } } // For deleting all the resources public void deleteResources() { if (null != conResource) conResource.deleteResource(); - if (null != diagResource) - diagResource.deleteResource(); + if (null != mntResource) + mntResource.deleteResource(); if (null != factorySetResource) factorySetResource.deleteResource(); } - // Callback Function for doBootStrap - @Override - public void onBootStrapCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - String message; - Log.i(LOG_TAG, "onBootStrapCallback"); - - // setting the default values received from bootstrap Server - - ConfigurationDefaultValues.defaultRegion = rep.getValueString("r"); - ConfigurationDefaultValues.defaultSystemTime = rep.getValueString("st"); - ConfigurationDefaultValues.defaultCurrency = rep.getValueString("c"); - ConfigurationDefaultValues.defaultLocation = rep.getValueString("loc"); - - // forming the message to display on UI - message = "URI : " + rep.getUri() + "\n"; - message = message + "Region : " - + ConfigurationDefaultValues.defaultRegion + "\n"; - message = message + "System Time : " - + ConfigurationDefaultValues.defaultSystemTime + "\n"; - message = message + "Currency : " - + ConfigurationDefaultValues.defaultCurrency + "\n"; - message = message + "Location : " - + ConfigurationDefaultValues.defaultLocation + "\n"; - - Log.i(LOG_TAG, "Resource URI: " + rep.getUri()); - Log.i(LOG_TAG, "Region: " + ConfigurationDefaultValues.defaultRegion); - Log.i(LOG_TAG, "System Time: " - + ConfigurationDefaultValues.defaultSystemTime); - Log.i(LOG_TAG, "Currency: " - + ConfigurationDefaultValues.defaultCurrency); - Log.i(LOG_TAG, "Location: " - + ConfigurationDefaultValues.defaultLocation); - - // showing the formed message on the UI - Message msg = Message.obtain(); - msg.what = 0; - MainActivity mainActivityObj = MainActivity.getMainActivityObject(); - MainActivity.setmessage(message); - mainActivityObj.getmHandler().sendMessage(msg); - } + private class RequestHandler implements OcPlatform.EntityHandler { - // Callback Function for Reboot - @Override - public void onRebootCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - Log.i(LOG_TAG, "onRebootCallback"); - } + @Override + public EntityHandlerResult handleEntity(OcResourceRequest request) { + Log.i(LOG_TAG, "handleEntity: enter"); - // Callback Function for FactoryReset - @Override - public void onFactoryResetCallback(Vector headerOptions, - OcRepresentation rep, int errorValue) { - Log.i(LOG_TAG, "onFactoryResetCallback"); - } - - // For Handling the Client's Request - @Override - public EntityHandlerResult handleEntity(OcResourceRequest request) { - Log.i(LOG_TAG, "handleEntity: enter"); - - EntityHandlerResult result = EntityHandlerResult.ERROR; - if (null == request) { - Log.e(LOG_TAG, "handleEntity: Invalid OcResourceRequest!"); - return result; - } - - RequestType requestType = request.getRequestType(); - EnumSet requestHandlerFlag = request - .getRequestHandlerFlagSet(); - Log.i(LOG_TAG, "prepareResponseForResource: request type: " - + requestType.name()); - Log.i(LOG_TAG, "prepareResponseForResource: request for resource: " - + request.getResourceUri()); - - if (requestHandlerFlag.contains(RequestHandlerFlag.REQUEST)) { - if (RequestType.GET == requestType) { - sendResponse(request); - } else if (RequestType.PUT == requestType) { - OcRepresentation rep = request.getResourceRepresentation(); - if (null == rep) { - Log.e(LOG_TAG, - "handleEntity: Invalid resource representation!"); - return result; - } + EntityHandlerResult result = EntityHandlerResult.ERROR; + if (null == request) { + Log.e(LOG_TAG, "handleEntity: Invalid OcResourceRequest!"); + return result; + } - if (request.getResourceUri().equalsIgnoreCase( - conResource.getUri())) { - conResource.setConfigurationRepresentation(rep); - } else if (request.getResourceUri().equalsIgnoreCase( - diagResource.getUri())) { + RequestType requestType = request.getRequestType(); + EnumSet requestHandlerFlag = request + .getRequestHandlerFlagSet(); + Log.i(LOG_TAG, "prepareResponseForResource: request type: " + + requestType.name()); + Log.i(LOG_TAG, "prepareResponseForResource: request for resource: " + + request.getResourceUri()); + + if (requestHandlerFlag.contains(RequestHandlerFlag.REQUEST)) { + if (RequestType.GET == requestType) { + sendResponse(request); + } else if (RequestType.PUT == requestType) { + OcRepresentation rep = request.getResourceRepresentation(); + if (null == rep) { + Log.e(LOG_TAG, + "handleEntity: Invalid resource representation!"); + return result; + } - String factorySetAtt = rep.getValueString("fr"); - if (factorySetAtt.equalsIgnoreCase("true")) { - conResource.factoryReset(); + if (request.getResourceUri().equalsIgnoreCase( + conResource.getUri())) { + conResource.setConfigurationRepresentation(rep); + } else if (request.getResourceUri().equalsIgnoreCase( + mntResource.getUri())) { + + String factorySetAtt = rep.getValueString("fr"); + if (factorySetAtt.equalsIgnoreCase("true")) { + conResource.factoryReset(); + } + mntResource.setDiagnosticsRepresentation(rep); } - diagResource.setDiagnosticsRepresentation(rep); + sendResponse(request); } - sendResponse(request); } - } - Log.i(LOG_TAG, "handleEntity: exit"); - return result; + Log.i(LOG_TAG, "handleEntity: exit"); + return result; + } } // For sending response to the client @@ -229,8 +276,8 @@ public class ConfigurationServer implements IDiagnosticsListener, if (request.getResourceUri().equalsIgnoreCase(conResource.getUri())) { rep = conResource.getConfigurationRepresentation(); } else if (request.getResourceUri().equalsIgnoreCase( - diagResource.getUri())) { - rep = diagResource.getDiagnosticsRepresentation(); + mntResource.getUri())) { + rep = mntResource.getDiagnosticsRepresentation(); } response.setResourceRepresentation(rep, OcPlatform.DEFAULT_INTERFACE); response.setErrorCode(200); @@ -242,38 +289,25 @@ public class ConfigurationServer implements IDiagnosticsListener, } Log.i(LOG_TAG, "sendResponse: exit"); } - - @Override - public void onUpdateConfigurationsCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - // TODO Auto-generated method stub - - } - - @Override - public void onGetConfigurationsCallback( - Vector headerOptions, OcRepresentation rep, - int errorValue) { - // TODO Auto-generated method stub - - } } // Default values for Resources class ConfigurationDefaultValues { // configuration Resource default values + + public static String defaultDeviceName = new String(); public static String defaultLocation = new String(); - public static String defaultRegion = new String(); - public static String defaultSystemTime = new String(); + public static String defaultLocationName = new String(); public static String defaultCurrency = new String(); + public static String defaultRegion = new String(); + public static String ConURIPrefix = "/oic/con"; - public static String ConResourceTypePrefix = "oic.con"; + public static String ConResourceTypePrefix = "oic.wk.con"; // Diagnostics Resource default values - public static String diagURIPrefix = "/oic/diag"; - public static String diagResourceTypePrefix = "oic.diag"; + public static String diagURIPrefix = "/oic/mnt"; + public static String diagResourceTypePrefix = "oic.wk.mnt"; public static String diagnosticsValue = "false"; public static String defaultFactoryReset = "false"; public static String defaultReboot = "false"; diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/FactorySetResource.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/FactorySetResource.java index df47cf0..79b555b 100644 --- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/FactorySetResource.java +++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/FactorySetResource.java @@ -70,41 +70,50 @@ public class FactorySetResource extends ConfigurationResource { public void setFactorySetRepresentation(OcRepresentation rep) { Log.i(LOG_TAG, "setFactorySetRepresentation: enter"); - String loc; - String st; - String cur; - String reg; - loc = rep.getValueString("loc"); - st = rep.getValueString("st"); - cur = rep.getValueString("c"); - reg = rep.getValueString("r"); - if (null != loc) { + String dName = rep.getValueString("n"); + String loc = rep.getValueString("loc"); + String locn = rep.getValueString("locn"); + String cur = rep.getValueString("c"); + String reg = rep.getValueString("r"); + + if (!(dName.equalsIgnoreCase(""))) { + deviceName = dName; + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(deviceName): " + + deviceName); + } + if (!(loc.equalsIgnoreCase(""))) { location = loc; - Log.i(LOG_TAG, "setConfigurationRepresentation: New value: " - + location); + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(location): " + + location); } - if (null != st) { - // systemTime = st; - Log.i(LOG_TAG, "setConfigurationRepresentation: New value: " - + systemTime); + if (!(locn.equalsIgnoreCase(""))) { + locationName = locn; + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(locationName): " + + locationName); } - if (null != cur) { + if (!(cur.equalsIgnoreCase(""))) { currency = cur; - Log.i(LOG_TAG, "setConfigurationRepresentation: New value: " - + currency); + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(currency): " + + currency); } - if (null != reg) { + if (!(reg.equalsIgnoreCase(""))) { region = reg; - Log.i(LOG_TAG, "setConfigurationRepresentation: New value: " - + region); + Log.i(LOG_TAG, + "setConfigurationRepresentation: New value(region): " + + region); } Log.i(LOG_TAG, "setFactorySetRepresentation: exit"); } OcRepresentation getFactorySetRepresentation() { + configurationRep.setValueString("n", deviceName); configurationRep.setValueString("loc", location); - configurationRep.setValueString("st", systemTime); + configurationRep.setValueString("locn", locationName); configurationRep.setValueString("c", currency); configurationRep.setValueString("r", region); return configurationRep; diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java index 1acdc3b..ff9ed05 100644 --- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java +++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java @@ -46,7 +46,9 @@ import android.widget.EditText; */ public class MainActivity extends Activity { - private final String LOG_TAG = "[CON-SERVER]" + this.getClass().getSimpleName(); + private final String LOG_TAG = "[CON-SERVER]" + + this.getClass() + .getSimpleName(); private Handler mHandler; private static MainActivity mainActivityObj; private ConfigurationServer conServerObj; @@ -125,14 +127,16 @@ public class MainActivity extends Activity { AlertDialog dialog = dialogBuilder.create(); dialog.show(); - Log.i(LOG_TAG, "WiFi is not enabled/connected! Please connect the WiFi and start application again..."); + Log.i(LOG_TAG, + "WiFi is not enabled/connected! Please connect the WiFi and start application again..."); return; } // If wifi is connected calling the configure method for configuring the // ocPlatform - PlatformConfig cfg = new PlatformConfig(getApplicationContext(),ServiceType.IN_PROC, - ModeType.CLIENT_SERVER, "0.0.0.0", 0, QualityOfService.LOW); + PlatformConfig cfg = new PlatformConfig(getApplicationContext(), + ServiceType.IN_PROC, ModeType.CLIENT_SERVER, "0.0.0.0", 0, + QualityOfService.LOW); OcPlatform.Configure(cfg); Log.i(LOG_TAG, "Configuration done Successfully"); } @@ -164,7 +168,7 @@ public class MainActivity extends Activity { dialog.setProgress(0); dialog.setMax(100); dialog.show(); - Log.i(LOG_TAG, "Rebooting.. Please wait ..."); + // Log.i(LOG_TAG, "Rebooting.. Please wait ..."); Thread thread = new Thread() { @Override public void run() { diff --git a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/DiagnosticsResource.java b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MaintenanceResource.java similarity index 64% rename from service/things-manager/sampleapp/android/con-server/src/com/example/con_server/DiagnosticsResource.java rename to service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MaintenanceResource.java index 2d1826b..b32d620 100644 --- a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/DiagnosticsResource.java +++ b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MaintenanceResource.java @@ -31,44 +31,44 @@ import org.iotivity.base.ResourceProperty; import android.util.Log; //For creating/deleting the Diagnostics Resource -public class DiagnosticsResource { - private final String LOG_TAG = "[CON-SERVER]" - + this.getClass() - .getSimpleName(); - // diagnostics members - private String diagnosticsUri; - private String factoryReset; - private String reboot; - private String startCollection; - private Vector diagnosticsTypes = new Vector(); - private Vector diagnosticsInterfaces = new Vector(); - private OcResourceHandle diagnosticsHandle; - private OcRepresentation diagnosticsRep = new OcRepresentation(); +public class MaintenanceResource { + private final String LOG_TAG = "[CON-SERVER]" + + this.getClass() + .getSimpleName(); + // maintenance members + private String m_maintenanceUri; + private String m_factoryReset; + private String m_reboot; + private String m_startCollection; + private Vector m_maintenanceTypes = new Vector(); + private Vector m_maintenanceInterfaces = new Vector(); + private OcResourceHandle m_maintenanceHandle = null; + private OcRepresentation m_maintenanceRep = new OcRepresentation(); // constructor - public DiagnosticsResource() { - Log.i(LOG_TAG, "DiagnosticsCollection: enter"); - - factoryReset = ConfigurationDefaultValues.defaultFactoryReset; - reboot = ConfigurationDefaultValues.defaultReboot; - startCollection = ConfigurationDefaultValues.defaultStartCollection; - - diagnosticsUri = ConfigurationDefaultValues.diagURIPrefix; - diagnosticsTypes.add(ConfigurationDefaultValues.diagResourceTypePrefix); - diagnosticsInterfaces.add(OcPlatform.DEFAULT_INTERFACE); - diagnosticsRep.setValueString("fr", factoryReset); - diagnosticsRep.setValueString("rb", reboot); - diagnosticsRep.setValueString("ssc", startCollection); - diagnosticsRep.setUri(diagnosticsUri); - diagnosticsRep.setResourceTypes(diagnosticsTypes); - diagnosticsRep.setResourceInterfaces(diagnosticsInterfaces); - + public MaintenanceResource() { + Log.i(LOG_TAG, "MaintenanceResource: enter"); + + m_factoryReset = ConfigurationDefaultValues.defaultFactoryReset; + m_reboot = ConfigurationDefaultValues.defaultReboot; + m_startCollection = ConfigurationDefaultValues.defaultStartCollection; + + m_maintenanceUri = ConfigurationDefaultValues.diagURIPrefix; + m_maintenanceTypes + .add(ConfigurationDefaultValues.diagResourceTypePrefix); + m_maintenanceInterfaces.add(OcPlatform.DEFAULT_INTERFACE); + m_maintenanceRep.setValueString("fr", m_factoryReset); + m_maintenanceRep.setValueString("rb", m_reboot); + m_maintenanceRep.setValueString("ssc", m_startCollection); + m_maintenanceRep.setUri(m_maintenanceUri); + m_maintenanceRep.setResourceTypes(m_maintenanceTypes); + m_maintenanceRep.setResourceInterfaces(m_maintenanceInterfaces); } // for creating Diagnostic Resource public void createResource(OcPlatform.EntityHandler listener) throws OcException { - Log.i(LOG_TAG, "createResource(Diagnostics): enter"); + Log.i(LOG_TAG, "createResource(Maintenance): enter"); EnumSet propertySet = EnumSet.of( ResourceProperty.DISCOVERABLE, ResourceProperty.OBSERVABLE); if (null == listener) { @@ -77,10 +77,10 @@ public class DiagnosticsResource { } // Register diagnostic resource - diagnosticsHandle = OcPlatform.registerResource(diagnosticsUri, - diagnosticsTypes.get(0), diagnosticsInterfaces.get(0), + m_maintenanceHandle = OcPlatform.registerResource(m_maintenanceUri, + m_maintenanceTypes.get(0), m_maintenanceInterfaces.get(0), listener, propertySet); - if (null == diagnosticsHandle) { + if (null == m_maintenanceHandle) { Log.e(LOG_TAG, "registerResource failed!"); return; } @@ -94,7 +94,7 @@ public class DiagnosticsResource { // Sleep value can be changed as per the developer // convenience. Thread.sleep(1000); - if (reboot.equalsIgnoreCase("true")) { + if (m_reboot.equalsIgnoreCase("true")) { Log.i(LOG_TAG, "Reboot will be soon..."); MainActivity mainActivityObj = MainActivity .getMainActivityObject(); @@ -119,10 +119,10 @@ public class DiagnosticsResource { + e.toString()); continue; } - reboot = ConfigurationDefaultValues.defaultReboot; + m_reboot = ConfigurationDefaultValues.defaultReboot; } - if (factoryReset.equalsIgnoreCase("true")) { - factoryReset = ConfigurationDefaultValues.defaultFactoryReset; + if (m_factoryReset.equalsIgnoreCase("true")) { + m_factoryReset = ConfigurationDefaultValues.defaultFactoryReset; factoryReset(); } } @@ -144,51 +144,50 @@ public class DiagnosticsResource { String ssc = rep.getValueString("ssc"); if (!(fr.equalsIgnoreCase(""))) { - factoryReset = fr; + m_factoryReset = fr; Log.i(LOG_TAG, "setConfigurationRepresentation: New value(FactoryReset): " + fr); } if (!(rb.equalsIgnoreCase(""))) { - reboot = rb; + m_reboot = rb; Log.i(LOG_TAG, "setDiagnosticsRepresentation: new value:(reboot) " + rb); } if (!(ssc.equalsIgnoreCase(""))) { - startCollection = ssc; + m_startCollection = ssc; Log.i(LOG_TAG, "setDiagnosticsRepresentation: new value:(startcollection) " + ssc); } - Log.i(LOG_TAG, "setDiagnosticsRepresentation: exit"); } OcRepresentation getDiagnosticsRepresentation() { - diagnosticsRep.setValueString("fr", factoryReset); - diagnosticsRep.setValueString("rb", reboot); - diagnosticsRep.setValueString("ssc", startCollection); - return diagnosticsRep; + m_maintenanceRep.setValueString("fr", m_factoryReset); + m_maintenanceRep.setValueString("rb", m_reboot); + m_maintenanceRep.setValueString("ssc", m_startCollection); + return m_maintenanceRep; } public String getUri() { - return diagnosticsUri; + return m_maintenanceUri; } // For Resetting diagnostics Resource attributes to their default values public void factoryReset() { - factoryReset = ConfigurationDefaultValues.defaultFactoryReset; - reboot = ConfigurationDefaultValues.defaultReboot; - startCollection = ConfigurationDefaultValues.defaultStartCollection; + m_factoryReset = ConfigurationDefaultValues.defaultFactoryReset; + m_reboot = ConfigurationDefaultValues.defaultReboot; + m_startCollection = ConfigurationDefaultValues.defaultStartCollection; } // For Deleting diagnostic resource public void deleteResource() { try { - if (null != diagnosticsHandle) { + if (null != m_maintenanceHandle) { // Unregister the collection resource - OcPlatform.unregisterResource(diagnosticsHandle); + OcPlatform.unregisterResource(m_maintenanceHandle); } } catch (OcException e) { Log.e(LOG_TAG, "OcException occured! " + e.toString()); -- 2.7.4