From: Jaehong Jo <jaehong.jo@samsung.com>
Date: Wed, 10 Jun 2015 02:35:46 +0000 (+0900)
Subject: Modify android sample app
X-Git-Tag: 1.2.0+RC1~1580
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5453db4c0354909f07fdcf407003a8b3494f974a;p=platform%2Fupstream%2Fiotivity.git

Modify android sample app

Modify the address to be automatically entered for testing

Change-Id: Ieaecd7e26571d1e767ef70318ec027d1c827c904
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
---

diff --git a/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml b/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml
index f75b6be..116cd8f 100644
--- a/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml
+++ b/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">CA Android Sample</string>
     <string name="find">Find</string>
     <string name="sendresponse">Send Response</string>
@@ -10,13 +11,17 @@
     <string name="request_to_all">Request to All</string>
     <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>
     <string name="get_network_info">Network Info</string>
     <string name="receive">Receive</string>
     <string name="received">Received Message</string>
+    <string name="remote_address">"Remote Address: "</string>
     <string name="action_settings">Settings</string>
     <string name="payload_data_client">PayloadData</string>
     <string name="payload_data_server">PayloadData</string>
+
 </resources>
\ No newline at end of file
diff --git a/resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/MainActivity.java b/resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/MainActivity.java
index 5cdef44..249acf9 100644
--- a/resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/MainActivity.java
+++ b/resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/service/MainActivity.java
@@ -778,5 +778,14 @@ public class MainActivity extends Activity {
         String callbackData = subject + receivedData;
         DLog.v(TAG, callbackData);
 
+        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));
+            }
+            sb.append(getString(R.string.uri));
+            mReqData_ed.setText(sb.toString());
+        }
     }
 }