update android sample app

I have added some log for port number
since there is no way to know it.

Change-Id: I306d0d94ae1523d9de948465ec303d503111ff2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1846
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
index 97d37e9..ec177c3 100755 (executable)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
@@ -702,8 +702,14 @@ public class MainActivity extends Activity {
         if (subject.equals(getString(R.string.remote_address))) {
             StringBuilder sb = new StringBuilder();
             sb.append(getString(R.string.coap_prefix)).append(receivedData);
-            if (receivedData.contains(".")) { // IP
-                sb.append(getString(R.string.port_num));
+            mReqData_ed.setText(sb.toString());
+            mNotification_ed.setText(sb.toString());
+        } else if (subject.equals(getString(R.string.remote_port))) {
+            StringBuilder sb = new StringBuilder();
+            String uri = mReqData_ed.getText().toString();
+            if (null != receivedData && uri.contains("."))
+            {
+                sb.append(uri).append(":").append(receivedData);
             }
             sb.append(getString(R.string.uri));
             mReqData_ed.setText(sb.toString());

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
index 5dc1424..9f89c26 100755 (executable)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
@@ -813,6 +813,7 @@ void request_handler(const CAEndpoint_t* object, const CARequestInfo_t* requestI
 
     LOGI("##########received request from remote device #############");
     LOGI("Remote Address: %s", g_remoteAddress);
+    LOGI("Remote Port: %d", object->port);
     LOGI("Uri: %s", requestInfo->info.resourceUri);
     LOGI("Data: %s", requestInfo->info.payload);
     LOGI("Token: %s", requestInfo->info.token);
@@ -857,6 +858,10 @@ void request_handler(const CAEndpoint_t* object, const CARequestInfo_t* requestI
         free(cloneRemoteAddress);
         free(g_remoteAddress);
 
+        char portInfo[PORT_LENGTH] = { 0, };
+        sprintf(portInfo, "%d", object->port);
+        callback("Remote Port: ", portInfo);
+
         //clone g_clientEndpoint
         g_clientEndpoint = (CAEndpoint_t *) malloc(sizeof(CAEndpoint_t));
         if (NULL == g_clientEndpoint)
@@ -995,6 +1000,7 @@ void response_handler(const CAEndpoint_t* object, const CAResponseInfo_t* respon
     LOGI("##########Received response from remote device #############");
     LOGI("Uri: %s", responseInfo->info.resourceUri);
     LOGI("Remote Address: %s", g_remoteAddress);
+    LOGI("Remote Port: %d", object->port);
     LOGI("response result: %d", responseInfo->result);
     LOGI("Data: %s", responseInfo->info.payload);
     LOGI("Token: %s", responseInfo->info.token);
@@ -1038,6 +1044,10 @@ void response_handler(const CAEndpoint_t* object, const CAResponseInfo_t* respon
         free(cloneRemoteAddress);
         free(g_remoteAddress);
 
+        char portInfo[PORT_LENGTH] = { 0, };
+        sprintf(portInfo, "%d", object->port);
+        callback("Remote Port: ", portInfo);
+
         if (NULL != responseInfo->info.payload && responseInfo->info.payloadSize)
         {
             len = responseInfo->info.payloadSize;

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/strings.xml b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/strings.xml
index d365f1e..1dcde2c 100755 (executable)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/strings.xml
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/strings.xml
@@ -10,7 +10,6 @@
     <string name="response">Response</string>
     <string name="uri">/a/light</string>
     <string name="coap_prefix">coap://</string>
-    <string name="port_num">:6298</string>
     <string name="notification"></string>
     <string name="req_data"></string>
     <string name="resp_data">resourceUri/response</string>
@@ -18,5 +17,6 @@
     <string name="receive">Receive</string>
     <string name="received">Received Message</string>
     <string name="remote_address">"Remote Address: "</string>
+    <string name="remote_port">"Remote Port: "</string>
     <string name="action_settings">Settings</string>
 </resources>
\ No newline at end of file