Remove unnecessary code in Android CA Sample

As some CA API(FindResource/AdvertiseResource) had removed
by IPv6 change.
the code in Android Sample related to the API is removed
in this patch

Change-Id: I9a69620656c62aef5a89117cb562a441d08a349a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1413
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c b/resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c
index 2aa8c70..fb464aa 100644 (file)
--- a/resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c
+++ b/resource/csdk/connectivity/samples/android/sample_service/jni/ResourceModel.c
@@ -260,12 +260,6 @@ Java_org_iotivity_ca_service_RMInterface_RMRegisterHandler(JNIEnv *env, jobject
 }
 
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_service_RMInterface_RMFindResource(JNIEnv *env, jobject obj, jstring uri)
-{
-    LOGE("Java_org_iotivity_service_RMInterface_RMFindResource not implemented");
-}
-
-JNIEXPORT void JNICALL
 Java_org_iotivity_ca_service_RMInterface_RMSendRequest(JNIEnv *env, jobject obj, jstring uri,
                                                        jstring payload, jint selectedNetwork,
                                                        jint isSecured, jint msgType)
@@ -536,12 +530,6 @@ Java_org_iotivity_ca_service_RMInterface_RMSendResponse(JNIEnv *env, jobject obj
 }
 
 JNIEXPORT void JNICALL
-Java_org_iotivity_ca_service_RMInterface_RMAdvertiseResource(JNIEnv *env, jobject obj, jstring uri)
-{
-    LOGE("Java_org_iotivity_ca_service_RMInterface_RMAdvertiseResource not implemented");
-}
-
-JNIEXPORT void JNICALL
 Java_org_iotivity_ca_service_RMInterface_RMSendNotification(JNIEnv *env, jobject obj, jstring uri,
                                                             jstring payload, jint selectedNetwork,
                                                             jint isSecured, jint msgType,

diff --git a/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h b/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h
index db14ccb..6f60059 100644 (file)
--- a/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h
+++ b/resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h
@@ -50,14 +50,6 @@ JNIEXPORT void JNICALL Java_org_iotivity_ca_service_RMInterface_RMRegisterHandle
 
 /*
  * Class:     org_iotivity_ca_service_RMInterface
- * Method:    RMFindResource
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_iotivity_ca_service_RMInterface_RMFindResource
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_iotivity_ca_service_RMInterface
  * Method:    RMSendRequest
  * Signature: (Ljava/lang/String;Ljava/lang/String;III)V
  */
@@ -82,14 +74,6 @@ JNIEXPORT void JNICALL Java_org_iotivity_ca_service_RMInterface_RMSendResponse
 
 /*
  * Class:     org_iotivity_ca_service_RMInterface
- * Method:    RMAdvertiseResource
- * Signature: (Ljava/lang/String)V
- */
-JNIEXPORT void JNICALL Java_org_iotivity_ca_service_RMInterface_RMAdvertiseResource
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_iotivity_ca_service_RMInterface
  * Method:    RMSendNotification
  * Signature: (Ljava/lang/String;Ljava/lang/String;IIII)V
  */

diff --git a/resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml b/resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml
index 8f36a8e..05c2bf9 100644 (file)
--- a/resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml
+++ b/resource/csdk/connectivity/samples/android/sample_service/res/layout/activity_main.xml
@@ -50,43 +50,6 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/layout_find_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_mode" >
-                        
-            <TextView
-                android:id="@+id/tv_find"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="[Find Resource]"
-                />
-
-         </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/layout_find"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_find_title" >
-
-            <Button
-                android:id="@+id/btn_find_resource"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="@string/find" />
-
-            <EditText
-                android:id="@+id/et_uri"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@id/btn_find_resource"
-                android:text="@string/uri" />
-        </RelativeLayout>
-
-        <RelativeLayout
             android:id="@+id/layout_Response_Noti_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -102,24 +65,10 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/layout_request_setting_for_server"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_Response_Noti_title" >
-
-            <Button
-                android:id="@+id/btn_Request_setting_for_server"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="@string/request_setting" />
-        </RelativeLayout>
-
-        <RelativeLayout
             android:id="@+id/layout_notify"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/layout_request_setting_for_server" >
+            android:layout_below="@id/layout_Response_Noti_title" >
 
             <EditText
                 android:id="@+id/et_notification"
@@ -130,82 +79,38 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/layout_payload_server_ed"
+            android:id="@+id/layout_request_setting_for_server"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/layout_notify" >
 
-            <EditText
-                android:id="@+id/et_payload_data_for_server"
-                android:layout_width="fill_parent"
+            <Button
+                android:id="@+id/btn_Request_setting_for_server"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="@string/payload_data_server" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/layout_server_bt"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_payload_server_ed" >
+                android:layout_alignParentLeft="true"
+                android:text="@string/request_setting" />
 
             <Button
                 android:id="@+id/btn_notify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_toRightOf="@id/btn_Request_setting_for_server"
                 android:text="@string/notify" />
 
             <Button
                 android:id="@+id/btn_sendresponse"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/btn_notify"
-                android:text="@string/sendresponse" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/layout_advertise_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_server_bt" >
-
-            <TextView
-                android:id="@+id/tv_advertise"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="[Advertise Resource]"
-                />
-
-         </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/layout_advertise_resource"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_advertise_title" >
-
-            <Button
-                android:id="@+id/btn_advertise"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="@string/advertise" />
-
-            <EditText
-                android:id="@+id/et_uri_advertise"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/btn_advertise"
-                android:text="@string/uri" />
+                android:layout_toRightOf="@id/btn_notify"
+                android:text="@string/sendresponse" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/layout_request_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/layout_find" >
+            android:layout_below="@id/layout_mode" >
 
             <TextView
                 android:id="@+id/tv_request"
@@ -213,7 +118,7 @@
                 android:layout_height="wrap_content"
                 android:text="[Send Request]" />
 
-         </RelativeLayout>
+        </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/layout_request"
@@ -230,38 +135,25 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/layout_payload_client_ed"
+            android:id="@+id/layout_request_setting_for_client"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/layout_request" >
 
-            <EditText
-                android:id="@+id/et_payload_data"
-                android:layout_width="fill_parent"
+            <Button
+                android:id="@+id/btn_Request_setting_for_client"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="@string/payload_data_client" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/layout_request_setting_for_client"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/layout_payload_client_ed" >
+                android:layout_alignParentLeft="true"
+                android:text="@string/request_setting" />
 
             <Button
                 android:id="@+id/btn_Request"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_toRightOf="@id/btn_Request_setting_for_client"
                 android:text="@string/request" />
 
-            <Button
-                android:id="@+id/btn_Request_setting_for_client"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/btn_Request"
-                android:text="@string/request_setting" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -300,18 +192,18 @@
             android:layout_below="@id/layout_request_to_all" >
 
             <Button
-                android:id="@+id/btn_request_to_all"
+                android:id="@+id/btn_request_to_all_setting_for_client"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="@string/request_to_all" />
+                android:layout_alignParentLeft="true"
+                android:text="@string/request_setting" />
 
             <Button
-                android:id="@+id/btn_request_to_all_setting_for_client"
-                android:layout_width="fill_parent"
+                android:id="@+id/btn_request_to_all"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/btn_request_to_all"
-                android:text="@string/request_setting" />
+                android:layout_toRightOf="@id/btn_request_to_all_setting_for_client"
+                android:text="@string/request_to_all" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -334,17 +226,19 @@
             android:layout_below="@id/layout_handle_title" >
 
             <Button
-                android:id="@+id/btn_get_network_info"
+                android:id="@+id/btn_receive"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="@string/get_network_info" />
+                android:layout_alignParentLeft="true"
+                android:text="@string/receive" />
+
             <Button
-                android:id="@+id/btn_receive"
-                android:layout_width="fill_parent"
+                android:id="@+id/btn_get_network_info"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toLeftOf="@id/btn_get_network_info"
-                android:text="@string/receive" />
+                android:layout_toRightOf="@id/btn_receive"
+                android:text="@string/get_network_info" />
+
         </RelativeLayout>
     </RelativeLayout>
 
@@ -361,4 +255,4 @@
             android:layout_height="wrap_content" />
     </ScrollView>
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file

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 116cd8f..d365f1e 100644 (file)
--- a/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml
+++ b/resource/csdk/connectivity/samples/android/sample_service/res/values/strings.xml
@@ -2,11 +2,9 @@
 <resources>
 
     <string name="app_name">CA Android Sample</string>
-    <string name="find">Find</string>
-    <string name="sendresponse">Send Response</string>
-    <string name="notify">Send Notification</string>
-    <string name="advertise">Advertise</string>
-    <string name="request_setting">Request Setting</string>
+    <string name="sendresponse">Response</string>
+    <string name="notify">Notification</string>
+    <string name="request_setting">Setting</string>
     <string name="request">Request</string>
     <string name="request_to_all">Request to All</string>
     <string name="response">Response</string>
@@ -21,7 +19,4 @@
     <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 d3e2884..cfeec80 100644 (file)
--- 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
@@ -71,8 +71,6 @@ public class MainActivity extends Activity {
 
     private Mode mCurrentMode = Mode.UNKNOWN;
 
-    private RelativeLayout mFindResourceLayout = null;
-
     private RelativeLayout mSendNotificationLayout = null;
 
     private RelativeLayout mSendRequestLayout = null;
@@ -87,48 +85,26 @@ public class MainActivity extends Activity {
 
     private RelativeLayout mReceiveLayout = null;
 
-    private RelativeLayout mFindTitleLayout = null;
-
     private RelativeLayout mRequestTitleLayout = null;
 
     private RelativeLayout mRequestToAllTitleLayout = null;
 
     private RelativeLayout mResponseNotificationTitleLayout = null;
 
-    private RelativeLayout mAdvertiseTitleLayout = null;
-
     private RelativeLayout mHandleTitleLayout = null;
 
-    private RelativeLayout mPayLoadClientEditLayout = null;
-
-    private RelativeLayout mPayLoadServerEditLayout = null;
-
-    private RelativeLayout mAdvertiseResourceLayout = null;
-
-    private RelativeLayout mServerButtonLayout = null;
-
     private TextView mMode_tv = null;
 
     private TextView mNetwork_tv = null;
 
-    private EditText mUri_ed = null;
-
     private EditText mNotification_ed = null;
 
     private EditText mReqData_ed = null;
 
     private EditText mReqToAllData_ed = null;
 
-    private EditText mPayload_ed = null;
-
-    private EditText mAdvertise_ed = null;
-
-    private Button mFind_btn = null;
-
     private Button mNotify_btn = null;
 
-    private Button mAdvertiseResource_btn = null;
-
     private Button mReqeust_btn = null;
 
     private Button mReqeust_setting_btn = null;
@@ -190,39 +166,26 @@ public class MainActivity extends Activity {
                 findViewById(R.id.layout_request_setting_for_client);
         mSendRequestToAllSettingLayout = (RelativeLayout)
                 findViewById(R.id.layout_request_to_all_setting_for_client);
-        mFindResourceLayout = (RelativeLayout) findViewById(R.id.layout_find);
-        mFindTitleLayout = (RelativeLayout) findViewById(R.id.layout_find_title);
         mRequestTitleLayout = (RelativeLayout) findViewById(R.id.layout_request_title);
         mRequestToAllTitleLayout = (RelativeLayout) findViewById(R.id.layout_request_to_all_title);
         mHandleTitleLayout = (RelativeLayout) findViewById(R.id.layout_handle_title);
-        mPayLoadClientEditLayout = (RelativeLayout) findViewById(R.id.layout_payload_client_ed);
 
         // server
         mSendNotificationLayout = (RelativeLayout) findViewById(R.id.layout_notify);
-        mPayLoadServerEditLayout = (RelativeLayout)
-                findViewById(R.id.layout_payload_server_ed);
         mSendResponseNotiSettingLayout = (RelativeLayout)
                 findViewById(R.id.layout_request_setting_for_server);
-        mServerButtonLayout = (RelativeLayout) findViewById(R.id.layout_server_bt);
         mResponseNotificationTitleLayout = (RelativeLayout)
                 findViewById(R.id.layout_Response_Noti_title);
-        mAdvertiseTitleLayout = (RelativeLayout) findViewById(R.id.layout_advertise_title);
-        mAdvertiseResourceLayout = (RelativeLayout) findViewById(R.id.layout_advertise_resource);
 
         mMode_tv = (TextView) findViewById(R.id.tv_mode);
         mNetwork_tv = (TextView) findViewById(R.id.tv_network);
 
-        mUri_ed = (EditText) findViewById(R.id.et_uri);
         mNotification_ed = (EditText) findViewById(R.id.et_notification);
         mReqData_ed = (EditText) findViewById(R.id.et_req_data);
         mReqToAllData_ed = (EditText) findViewById(R.id.et_req_to_all_data);
-        mPayload_ed = (EditText) findViewById(R.id.et_payload_data_for_server);
-        mAdvertise_ed = (EditText) findViewById(R.id.et_uri_advertise);
 
-        mFind_btn = (Button) findViewById(R.id.btn_find_resource);
         mResponse_btn = (Button) findViewById(R.id.btn_sendresponse);
         mNotify_btn = (Button) findViewById(R.id.btn_notify);
-        mAdvertiseResource_btn = (Button) findViewById(R.id.btn_advertise);
         mReqeust_btn = (Button) findViewById(R.id.btn_Request);
         mReqeust_setting_btn = (Button) findViewById(R.id.btn_Request_setting_for_client);
         mReqeustToAll_btn = (Button) findViewById(R.id.btn_request_to_all);
@@ -232,10 +195,8 @@ public class MainActivity extends Activity {
         mGetNetworkInfo_btn = (Button) findViewById(R.id.btn_get_network_info);
         mRecv_btn = (Button) findViewById(R.id.btn_receive);
 
-        mFind_btn.setOnClickListener(mFindResourceHandler);
         mResponse_btn.setOnClickListener(mSendResponseHandler);
         mNotify_btn.setOnClickListener(mNotifyHandler);
-        mAdvertiseResource_btn.setOnClickListener(mAdvertiseResourceHandler);
         mReqeust_btn.setOnClickListener(mSendRequestHandler);
         mReqeust_setting_btn.setOnClickListener(mSendRequestSettingHandler);
         mReqeustToAll_btn.setOnClickListener(mSendRequestToAllHandler);
@@ -256,23 +217,16 @@ public class MainActivity extends Activity {
 
     private void showSelectModeView() {
 
-        mFindResourceLayout.setVisibility(View.INVISIBLE);
         mSendNotificationLayout.setVisibility(View.INVISIBLE);
         mSendRequestLayout.setVisibility(View.INVISIBLE);
         mSendRequestToAllLayout.setVisibility(View.INVISIBLE);
         mSendRequestSettingLayout.setVisibility(View.INVISIBLE);
         mSendRequestToAllSettingLayout.setVisibility(View.INVISIBLE);
         mReceiveLayout.setVisibility(View.INVISIBLE);
-        mFindTitleLayout.setVisibility(View.INVISIBLE);
         mRequestTitleLayout.setVisibility(View.INVISIBLE);
         mRequestToAllTitleLayout.setVisibility(View.INVISIBLE);
         mHandleTitleLayout.setVisibility(View.INVISIBLE);
-        mPayLoadClientEditLayout.setVisibility(View.INVISIBLE);
-        mPayLoadServerEditLayout.setVisibility(View.INVISIBLE);
-        mServerButtonLayout.setVisibility(View.INVISIBLE);
         mResponseNotificationTitleLayout.setVisibility(View.INVISIBLE);
-        mAdvertiseTitleLayout.setVisibility(View.INVISIBLE);
-        mAdvertiseResourceLayout.setVisibility(View.INVISIBLE);
         mSendResponseNotiSettingLayout.setVisibility(View.INVISIBLE);
 
         mMode_tv.setText("Select Mode (Server or Client)");
@@ -287,34 +241,24 @@ public class MainActivity extends Activity {
 
         if (mCurrentMode == Mode.SERVER) {
 
-            mFindResourceLayout.setVisibility(View.INVISIBLE);
             mSendNotificationLayout.setVisibility(View.VISIBLE);
             mSendRequestLayout.setVisibility(View.INVISIBLE);
-            mSendRequestToAllLayout.setVisibility(View.INVISIBLE);
+            mSendRequestToAllLayout.setVisibility(View.VISIBLE);
             mSendRequestSettingLayout.setVisibility(View.INVISIBLE);
-            mSendRequestToAllSettingLayout.setVisibility(View.INVISIBLE);
+            mSendRequestToAllSettingLayout.setVisibility(View.VISIBLE);
             mReceiveLayout.setVisibility(View.VISIBLE);
 
-            mFindTitleLayout.setVisibility(View.INVISIBLE);
             mRequestTitleLayout.setVisibility(View.INVISIBLE);
-            mRequestToAllTitleLayout.setVisibility(View.INVISIBLE);
+            mRequestToAllTitleLayout.setVisibility(View.VISIBLE);
             mHandleTitleLayout.setVisibility(View.VISIBLE);
-            mPayLoadClientEditLayout.setVisibility(View.INVISIBLE);
-
-            mPayLoadServerEditLayout.setVisibility(View.VISIBLE);
-            mServerButtonLayout.setVisibility(View.VISIBLE);
 
             mResponseNotificationTitleLayout.setVisibility(View.VISIBLE);
-            mAdvertiseTitleLayout.setVisibility(View.VISIBLE);
-            mAdvertiseResourceLayout.setVisibility(View.VISIBLE);
-
             mSendResponseNotiSettingLayout.setVisibility(View.VISIBLE);
 
             mNetwork_tv.setText("");
 
         } else if (mCurrentMode == Mode.CLIENT) {
 
-            mFindResourceLayout.setVisibility(View.VISIBLE);
             mSendNotificationLayout.setVisibility(View.INVISIBLE);
             mSendRequestLayout.setVisibility(View.VISIBLE);
             mSendRequestToAllLayout.setVisibility(View.VISIBLE);
@@ -322,19 +266,11 @@ public class MainActivity extends Activity {
             mSendRequestToAllSettingLayout.setVisibility(View.VISIBLE);
             mReceiveLayout.setVisibility(View.VISIBLE);
 
-            mFindTitleLayout.setVisibility(View.VISIBLE);
             mRequestTitleLayout.setVisibility(View.VISIBLE);
             mRequestToAllTitleLayout.setVisibility(View.VISIBLE);
             mHandleTitleLayout.setVisibility(View.VISIBLE);
-            mPayLoadClientEditLayout.setVisibility(View.VISIBLE);
-
-            mPayLoadServerEditLayout.setVisibility(View.INVISIBLE);
-            mServerButtonLayout.setVisibility(View.INVISIBLE);
 
             mResponseNotificationTitleLayout.setVisibility(View.INVISIBLE);
-            mAdvertiseTitleLayout.setVisibility(View.INVISIBLE);
-            mAdvertiseResourceLayout.setVisibility(View.INVISIBLE);
-
             mSendResponseNotiSettingLayout.setVisibility(View.INVISIBLE);
 
             mNetwork_tv.setText("");
@@ -409,16 +345,6 @@ public class MainActivity extends Activity {
         return super.onOptionsItemSelected(item);
     }
 
-    private OnClickListener mFindResourceHandler = new OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-
-            DLog.v(TAG, "FindResource click");
-            RM.RMSendReqestToAll(mReqToAllData_ed.getText().toString(), selectedNetwork);
-        }
-    };
-
     private OnClickListener mSendResponseHandler = new OnClickListener() {
 
         @Override
@@ -442,8 +368,7 @@ public class MainActivity extends Activity {
             DLog.v(TAG, "SendNotification click");
             if ( selectedNetwork != -1) {
                 RM.RMSendNotification(mNotification_ed.getText().toString(),
-                    mPayload_ed.getText().toString(), selectedNetwork,
-                    isSecured, msgType, responseValue);
+                    null, selectedNetwork, isSecured, msgType, responseValue);
             }
             else {
                 DLog.v(TAG, "Please Select Network Type");
@@ -451,16 +376,6 @@ public class MainActivity extends Activity {
         }
     };
 
-    private OnClickListener mAdvertiseResourceHandler = new OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-
-            DLog.v(TAG, "AdvertiseResource click");
-            RM.RMAdvertiseResource(mAdvertise_ed.getText().toString());
-        }
-    };
-
     private OnClickListener mSendRequestHandler = new OnClickListener() {
 
         @Override
@@ -468,8 +383,8 @@ public class MainActivity extends Activity {
 
             DLog.v(TAG, "SendRequest click");
             if ( selectedNetwork != -1) {
-                RM.RMSendRequest(mReqData_ed.getText().toString(), mPayload_ed
-                    .getText().toString(), selectedNetwork, isSecured, msgType);
+                RM.RMSendRequest(mReqData_ed.getText().toString(), null,
+                    selectedNetwork, isSecured, msgType);
             }
             else {
                 DLog.v(TAG, "Please Select Network Type");
@@ -610,23 +525,9 @@ public class MainActivity extends Activity {
                             isSecured = 1;
                             DLog.v(TAG, "Send secured message");
 
-                            mPayLoadClientEditLayout
-                                    .setVisibility(View.INVISIBLE);
-
-                            mPayLoadServerEditLayout
-                                    .setVisibility(View.INVISIBLE);
-
                         } else if (selectedMsgSecured == DTLS.UNSECURED.ordinal()) {
                             isSecured = 0;
                             DLog.v(TAG, "Send unsecured message");
-
-                            if (mCurrentMode == Mode.SERVER) {
-                                mPayLoadServerEditLayout
-                                        .setVisibility(View.VISIBLE);
-                            } else if (mCurrentMode == Mode.CLIENT) {
-                                mPayLoadClientEditLayout
-                                        .setVisibility(View.VISIBLE);
-                            }
                         }
                         checkMsgType("Select Msg Type");
                     }
@@ -799,6 +700,7 @@ public class MainActivity extends Activity {
             }
             sb.append(getString(R.string.uri));
             mReqData_ed.setText(sb.toString());
+            mNotification_ed.setText(sb.toString());
         }
     }
-}
+}
\ No newline at end of file