replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / resource-encapsulation / examples / android / RESampleClientApp / app / src / main / java / org / iotivity / service / sample / client / ResourceClientActivity.java

diff --git a/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java b/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
index f25cfb2..2b878b7 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
+++ b/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
@@ -63,6 +63,7 @@ public class ResourceClientActivity extends Activity
     private static final int MSG_ID_ATTRIBUTE_RECEIVED  = 1;
     private static final int MSG_ID_PRINT_LOG           = 2;
 
+    private static final String RESOURCE_TYPE = "oic.r.temperature.sensor";
     private static final String ATTR_KEY_TEMPERATURE = "Temperature";
 
     private TextView mLogView;
@@ -111,7 +112,7 @@ public class ResourceClientActivity extends Activity
 
     private OnCacheUpdatedListener mOnCacheUpdatedListener = new OnCacheUpdatedListener() {
         @Override
-        public void onCacheUpdated(RcsResourceAttributes attrs) {
+        public void onCacheUpdated(RcsResourceAttributes attrs, int eCode) {
             Log.i(LOG_TAG, "onCacheUpdated");
 
             mHandler.obtainMessage(MSG_ID_ATTRIBUTE_RECEIVED, attrs)
@@ -128,6 +129,10 @@ public class ResourceClientActivity extends Activity
             }
 
             mResourceObj.startMonitoring(mOnStateChangedListener);
+
+            if (mResourceObj.isMonitoring()) {
+                printLog("Monitoring started successfully");
+            }
         }
     };
 
@@ -135,8 +140,13 @@ public class ResourceClientActivity extends Activity
         @Override
         public void execute() throws RcsException {
             if (mResourceObj.isMonitoring()) {
+
                 mResourceObj.stopMonitoring();
-                printLog("Stopped Resource Monitoring");
+
+                if (!mResourceObj.isMonitoring()) {
+                    printLog("Monitoring stopped successfully");
+                }
+
             } else {
                 printLog("Monitoring not started");
             }
@@ -168,6 +178,11 @@ public class ResourceClientActivity extends Activity
             }
 
             mResourceObj.startCaching(mOnCacheUpdatedListener);
+
+            if (mResourceObj.isCaching()) {
+                printLog("Caching started successfully");
+            }
+
         }
     };
 
@@ -197,8 +212,21 @@ public class ResourceClientActivity extends Activity
     private Item mStopCaching = new Item("9. Stop Caching") {
         @Override
         public void execute() throws RcsException {
-            mResourceObj.stopCaching();
+            if (mResourceObj.isCaching()) {
+
+                mResourceObj.stopCaching();
+
+                if (!mResourceObj.isCaching()) {
+                    printLog("Caching stopped successfully");
+                } else {
+                    printLog("Stopping caching unsuccessful");
+                }
+
+            } else {
+                printLog("Caching not started");
+            }
         }
+
     };
 
     @Override
@@ -219,10 +247,8 @@ public class ResourceClientActivity extends Activity
     protected void onDestroy() {
         super.onDestroy();
 
-        if (mDiscoveryTask != null)
-            mDiscoveryTask.cancel();
-        if (mResourceObj != null)
-            mResourceObj.destroy();
+        if (mDiscoveryTask != null) mDiscoveryTask.cancel();
+        if (mResourceObj != null) mResourceObj.destroy();
     }
 
     private void initMenuList() {
@@ -262,7 +288,7 @@ public class ResourceClientActivity extends Activity
         if (mDiscoveryTask == null) {
             try {
                 mDiscoveryTask = RcsDiscoveryManager.getInstance()
-                        .discoverResource(RcsAddress.multicast(),
+                        .discoverResourceByType(RcsAddress.multicast(), RESOURCE_TYPE,
                                 mOnResourceDiscoveredListener);
                 mDiscoveryBtn.setText(R.string.cancel_discovery);
 
@@ -414,8 +440,7 @@ public class ResourceClientActivity extends Activity
             super.handleMessage(msg);
 
             ResourceClientActivity activity = mActivityRef.get();
-            if (activity == null)
-                return;
+            if (activity == null) return;
 
             switch (msg.what) {
                 case MSG_ID_RESOURCE_DISCOVERED: