[TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,removed d2d conv manager testcase] 33/157733/2
authornibha2 <nibha.sharma@samsung.com>
Thu, 26 Oct 2017 04:48:45 +0000 (10:18 +0530)
committerNibha Sharma <nibha.sharma@samsung.com>
Thu, 26 Oct 2017 05:22:45 +0000 (05:22 +0000)
Change-Id: Ib56b98703a0448feb92c8866cf7b7930155198ac
Signed-off-by: nibha2 <nibha.sharma@samsung.com>
release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk [changed mode: 0755->0644]
release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk [changed mode: 0755->0644]
tbtcoreapp/inc/model/tbt-info.h
tbtcoreapp/inc/utils/app_module_config.h
tbtcoreapp/inc/view/tbt-d2d-view.h [deleted file]
tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc [deleted file]
tbtcoreapp/src/model/tbt-list.c
tbtcoreapp/src/view/tbt-d2d-view.c [deleted file]
tbtcoreapp/src/view/tbt-genlist-view.c
tbtcoreapp/tizen-manifest.xml

old mode 100755 (executable)
new mode 100644 (file)
index 7fc517d..a73c947
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
old mode 100755 (executable)
new mode 100644 (file)
index bdb95c2..658aaaa
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ
index ea941eb5a14e7cdfc27270f8cfe2c9ecd932aec7..ee2ecb7453a3318cc0b5a395f097811b7dd1fe18 100644 (file)
@@ -245,10 +245,6 @@ typedef enum {
 
     TBT_APP_CONTACTS,
 
-    TBT_APP_D2D_CLIENT,
-
-    TBT_APP_D2D_SERVER,
-
     TBT_APP_TTS,
 
        TBT_APP_STT,
@@ -354,7 +350,6 @@ typedef enum
        FEATURE_CAMERA_FRONT_FLASH,
        FEATURE_CONSUMER_IR,
        FEATURE_CONTACT,
-       FEATURE_CONVERGENCE_D2D,
        FEATURE_DATABASE_ENCRYPTION,
        FEATURE_DATACONTROL,
        FEATURE_DATASYNC,
@@ -565,7 +560,6 @@ static char* feature_list[1024]=
        [FEATURE_CAMERA_FRONT_FLASH] = "tizen.org/feature/camera.front.flash",
        [FEATURE_CONSUMER_IR] = "tizen.org/feature/consumer_ir",
        [FEATURE_CONTACT] = "tizen.org/feature/contact",
-       [FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d",
        [FEATURE_DATABASE_ENCRYPTION] = "tizen.org/feature/database.encryption",
        [FEATURE_DATACONTROL] = "tizen.org/feature/datacontrol",
        [FEATURE_DATASYNC] = "tizen.org/feature/datasync",
index 777955154e76206f02b213c31cdec45875bd30b9..e62aac2136528ab9741e22c32eff8994403197ad 100644 (file)
 #define TBT_MODULE_CONTACTS
 #define TBT_MODULE_APP_CONTACTS
 
-#define TBT_MODULE_D2D
-#define TBT_MODULE_APP_D2D_CLIENT
-#define TBT_MODULE_APP_D2D_SERVER
-
 #define TBT_MODULE_TTS
 #define TBT_MODULE_APP_TTS
 #define TBT_MODULE_STT
diff --git a/tbtcoreapp/inc/view/tbt-d2d-view.h b/tbtcoreapp/inc/view/tbt-d2d-view.h
deleted file mode 100644 (file)
index e4d0fa0..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  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.
- *******************************************************************************/
-/**
- * @file       tbt-d2d-view.h
- * @brief      covers device to device convergence communication
- * @since_tizen 3.0
- * @author     golam kayes(g.kayes@samsung.com)
- * @date       June, 2016
- * @bug
- * @credit     Tizen SDK Version 3.0 Test app
- *
- */
-
-
-#ifndef __TBT_D2D_VIEW_H__
-#define __TBT_D2D_VIEW_H__
-
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_D2D
-
-#include "model/tbt-list.h"
-
-
-/**
- * @typedef d2d_viewer_view
- * @since_tizen 2.3
- * @brief A d2d viewer view handle.
- */
-typedef struct _d2d_view d2d_view;
-
-/**
- * @brief Create tbt d2d view
- * @since_tizen 2.3
- * @param[in] navi Parent naviframe
- * @param[in] custom structute to hold tbt application information
- * @param[in] item of the main tbt menu
- * @return Pointer of d2d on success, otherwise NULL
- */
-d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item);
-
-#endif
-#endif // __TBT_D2D_VIEW_H__
diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc
deleted file mode 100644 (file)
index 4afeab6..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd 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.
- */
-
-#define TEXT_HEIGHT 0.08
-
-collections
-{
-    base_scale: 1.8;
-    group
-    {
-        name: "d2d_viewer";
-        parts{
-               part{
-                name: "base";
-                type: RECT;
-                description{
-                    state: "default" 0.0;
-                    visible: 1;
-                    color: 0 0 0 255;
-                }
-            }
-            part{
-                name: "list_container";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.0; }
-                    rel2 {relative: 1.0 0.6; }
-                    fixed: 1 1;
-                }
-            }
-            
-            part{
-                name: "others";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.6; }
-                    rel2 {relative: 1.0 0.8; }
-                    fixed: 1 1;
-                }
-            }
-            
-           part { name: "wearable_toolbar";
-                               type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                       }
-                                       visible: 1;
-                    fixed: 1 1;
-                               }
-                       }
-        }
-    }
-}
index 17b2fada0b6462009731ef4332ea5060b7ade16d..de840a72d3822138736a87d025874ee71c17ebee 100644 (file)
@@ -1306,7 +1306,7 @@ static tbt_info tbtapps[] =
                        .sensor_response_interval = 100,
                        .sensortype = SENSOR_PROXIMITY,
 
-                       .units = SENSOR_UNIT_MAX,
+                       .units = SENSOR_UNIT_DEGREE,
                        .required_features_count = 1,
                        .features_required = {FEATURE_SENSOR_PROXIMITY}
 
@@ -1348,7 +1348,7 @@ static tbt_info tbtapps[] =
                        .result = -1,
                        .sensor_response_interval = 100,
                        .sensortype = SENSOR_ULTRAVIOLET,
-                       .units = SENSOR_UNIT_MAX,
+                       .units = SENSOR_UNIT_DEGREE,
                        .required_features_count = 1,
                        .features_required = {FEATURE_SENSOR_ULTRAVIOLET}
                },
@@ -2358,41 +2358,6 @@ static tbt_info tbtapps[] =
        #endif
 #endif
 
-/*#ifdef TBT_MODULE_D2D
-       #ifdef TBT_MODULE_APP_D2D_CLIENT
-
-               //NSD DNSSD
-               {
-                       .name = "D2D Client",
-                       .parent = "D2D Convergence",
-                       .apptype = TBT_APP_D2D_CLIENT,
-                       .icon_name = "dummy",
-                       .info = "1.     Connect <b>D2D Server to Same WiFi Network.<br/>"
-                                       "2.     Run <b>D2D server</b> module of TBT.<br/>"
-                                       "3.     A list of two elements <b>http://192.168.43.54:8001/api/v2/</b> and <b>/tizen/remote-app-control</b> will be shown<br/>"
-                                       "4.     Select <b>/tizen/remote-app-control</b> first. Then <b>cortbt_uiapp</b> will be launch in <b>D2D Server</b>.<br/>"
-                                       "5.     Select<b> http://192.168.43.54:8001/api/v2/</b> then <b>Connect</b> will be shown in <b>D2D Server</b> and <b>Publish</b> will be shown in <b>D2D Client</b>.<br/>"
-                                       "6.     Select <b>Publish</b> on <b>Client</b> side and <b>GoodNews Received</b> will be shown in <b>D2D Server</b>.",
-                       .result = 0,
-                       .required_features_count = 1,
-                       .features_required = { FEATURE_NETWORK_WIFI }
-               },
-       #endif
-       #ifdef TBT_MODULE_APP_D2D_SERVER
-               {
-                       .name = "D2D Server",
-                       .parent = "D2D Convergence",
-                       .apptype = TBT_APP_D2D_SERVER,
-                       .icon_name = "dummy",
-                       .info = "1.     Connect D2D Client to Same WiFi Network.<br/>"
-                                       "2.     Run D2D Server Module from TBT again.<br/>"
-                                       "3.     Server Ready Message will be shown",
-                       .result = 0,
-                       .required_features_count = 1,
-                       .features_required = { FEATURE_NETWORK_WIFI }
-               },
-       #endif
-#endif*/
 #ifdef TBT_MODULE_TTS
        #ifdef TBT_MODULE_APP_TTS
                {
diff --git a/tbtcoreapp/src/view/tbt-d2d-view.c b/tbtcoreapp/src/view/tbt-d2d-view.c
deleted file mode 100644 (file)
index 385fc5d..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  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.
- *******************************************************************************/
-/**
- * @file       tbt-d2d-view.c
- * @brief      covers d2d convergence apis
- *
- * @author     A. B. M. Nazibullah(nazib.ullah@samsung.com)
- * @date       October, 2016
- * @credit
- *
- */
-
-#if 0
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_D2D
-
-
-#include "utils/logger.h"
-#include "utils/config.h"
-#include "utils/ui-utils.h"
-#include "view/tbt-d2d-view.h"
-#include "view/tbt-common-view.h"
-#include <json-glib/json-glib.h>
-#include <d2d_conv_manager.h>
-
-struct _d2d_view
-{
-       common_view* view;
-       Evas_Object *server_list;
-       Evas_Object *client_msg_list;
-       conv_h gl_conv_h;
-       GList *devices_list;
-};
-
-typedef struct _device_data{
-       d2d_view *this;
-       conv_device_h selected_device;
-}device_data;
-
-typedef struct _service_data{
-       d2d_view *view;
-       conv_service_h service_handle;
-}service_data;
-
-static Evas_Object *found_device_list;
-static Evas_Object *service_list;
-static Evas_Object *app_comm_menu_list;
-
-
-static void _app_destroy_cb(void* this);
-static void discovery_cb(conv_device_h device, int result, void* user_data);
-static void device_selected_cb(void *data, Evas_Object *obj, void *event_info);
-static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data);
-static void start_discovery_cb(void *data, Evas_Object *obj, void *event_info);
-
-/**
- * @function           d2d_view_add
- * @since_tizen                2.3
- * @description                Gps View Add
- * @parameter          Evas_Object*: Evas Object Pointer, tbt_info*: Tbt Info Pointer, Elm_Object_Item*: Elm Object Item Pointer
- * @return             d2d_view*
- */
-d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item)
-{
-       RETVM_IF(NULL == navi, NULL, "navi is null");
-       RETVM_IF(NULL == tbt_info, NULL, "tbt_info is null");
-    RETVM_IF(NULL == item, NULL, "item is NULL");
-
-
-    d2d_view *this = NULL;
-    this = calloc(1, sizeof(d2d_view));
-    RETVM_IF(!this, NULL, "calloc failed");
-    this->view = calloc(1, sizeof(common_view));
-    RETVM_IF(!this->view, NULL, "calloc failed");
-
-    tbt_info->layout_group = "d2d_viewer";
-    tbt_info->layout_file = get_edje_path("d2d_viewer.edj");
-
-    common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
-
-    if (tbt_info->apptype == TBT_APP_D2D_CLIENT)
-    {
-               this->server_list = elm_list_add(this->view->layout);
-               elm_list_mode_set(this->server_list, ELM_LIST_COMPRESS);
-               evas_object_smart_callback_add(this->server_list, "selected", NULL, NULL);
-               elm_list_item_append(this->server_list, "D2D discover", NULL, NULL, start_discovery_cb, this);
-
-               elm_list_go(this->server_list);
-
-               elm_object_part_content_set(this->view->layout, "list_container", this->server_list);
-
-       found_device_list = elm_list_add(this->view->layout);
-       elm_list_mode_set(found_device_list, ELM_LIST_COMPRESS);
-       evas_object_smart_callback_add(found_device_list, "selected", NULL, NULL);
-
-       service_list = elm_list_add(this->view->layout);
-       elm_list_mode_set(service_list, ELM_LIST_COMPRESS);
-       evas_object_smart_callback_add(service_list, "selected", NULL, NULL);
-       elm_list_select_mode_set(service_list, ELM_OBJECT_SELECT_MODE_ALWAYS);
-
-       app_comm_menu_list = elm_list_add(this->view->layout);
-       elm_list_mode_set(app_comm_menu_list, ELM_LIST_COMPRESS);
-       evas_object_smart_callback_add(app_comm_menu_list, "selected", NULL, NULL);
-
-    }
-    else  if (tbt_info->apptype == TBT_APP_D2D_SERVER)
-    {
-       this->client_msg_list = elm_list_add(this->view->layout);
-       elm_list_mode_set(this->client_msg_list, ELM_LIST_COMPRESS);
-       elm_list_item_append(this->client_msg_list, "Ready", NULL, NULL, NULL, NULL);
-
-       elm_list_go(this->client_msg_list);
-
-       elm_object_part_content_set(this->view->layout, "list_container", this->client_msg_list);
-    }
-
-    return this;
-}
-
-
-/**
- * @function           get_d2d_error
- * @since_tizen                3.0
- * @description                get the name of the error for d2d
- * @parameter          int: error int
- * @return                     char*: error string
- */
-static char* get_d2d_error(int e)
-{
-       switch (e) {
-       case CONV_ERROR_NONE:
-               return "CONV_ERROR_NONE";
-       case CONV_ERROR_INVALID_PARAMETER:
-               return "CONV_ERROR_INVALID_PARAMETER";
-       case CONV_ERROR_INVALID_OPERATION:
-               return "CONV_ERROR_INVALID_OPERATION";
-       case CONV_ERROR_OUT_OF_MEMORY:
-               return "CONV_ERROR_OUT_OF_MEMORY";
-       case CONV_ERROR_PERMISSION_DENIED:
-               return "CONV_ERROR_PERMISSION_DENIED";
-       case CONV_ERROR_NOT_SUPPORTED:
-               return "CONV_ERROR_NOT_SUPPORTED";
-       case CONV_ERROR_NO_DATA:
-               return "CONV_ERROR_NO_DATA";
-       default:
-               return "UNKNOWN_ERROR";
-       }
-
-       return "UNKNOWN_ERROR";
-}
-
-static void start_discovery_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       d2d_view* this = (d2d_view*) data;
-       DBG("Inside start server discovery cb");
-
-       int ret = conv_create(&this->gl_conv_h);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_create failed with error : %s", get_d2d_error(ret));
-
-    ret = conv_discovery_start(this->gl_conv_h, 90, discovery_cb, this);/*Timeout 90 seconds*/
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_discovery_start failed with error : %s", get_d2d_error(ret));
-}
-
-
-static int app_control_start(conv_service_h service_handle, void* data)
-{
-       DBG("app_control_start");
-       int ret;
-
-       service_data *s_data = (service_data*) data;
-       s_data->service_handle = service_handle;
-       ret = conv_service_set_listener_cb(service_handle, message_listener, (void*)s_data);
-       RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
-       ret = conv_service_read(service_handle, NULL, NULL);
-       RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_read failed with error : %s", get_d2d_error(ret));
-       ret = conv_service_start(service_handle, NULL, NULL);
-       RETVM_IF(ret != CONV_ERROR_NONE,0, "conv_service_start failed with error : %s", get_d2d_error(ret));
-
-       return 0;
-}
-
-static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       DBG("service_selected_cb");
-
-       service_data *s_data = (service_data*) data;
-
-       RETM_IF(NULL==s_data, "s_data is NULL");
-
-       conv_service_e e = CONV_SERVICE_NONE;
-
-       if(s_data->service_handle == NULL)
-       {
-               ERR("s_data->service_handle is NULL");
-       }
-
-       conv_service_h service_handle =s_data->service_handle;
-
-
-       int ret = conv_service_get_type(service_handle, &e);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_type failed with error : %s", get_d2d_error(ret));
-
-       switch (e)
-       {
-       case CONV_SERVICE_APP_TO_APP_COMMUNICATION :
-               DBG("CONV_SERVICE_APP_TO_APP_COMMUNICATION");
-               break;
-
-       case CONV_SERVICE_REMOTE_APP_CONTROL :
-               DBG("CONV_SERVICE_REMOTE_APP_CONTROL");
-               ret = app_control_start(service_handle, s_data);
-               RETM_IF(ret != CONV_ERROR_NONE, "app_control_start failed with error : %s", get_d2d_error(ret));
-               break;
-       case CONV_SERVICE_REMOTE_INTERACTION:
-               DBG("CONV_SERVICE_REMOTE_INTERACTION");
-               break;
-
-       default :
-               DBG( "UNKNOWN_SERVICE");
-               break;
-       }
-
-}
-
-static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data)
-{
-       DBG("message_listener");
-
-       char* test;
-       service_data* s_data = (service_data*) user_data;
-       conv_payload_get_string(result, "result_type", &test);
-       int ret;
-
-       DBG("result_type : %s", test);
-
-       if (!strcmp(test, "onStart"))
-       {
-               conv_payload_h payload_handle;
-
-               ret = conv_payload_create(&payload_handle);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_create failed with error : %s", get_d2d_error(ret));
-
-               app_control_h app_control = NULL;
-               app_control_create(&app_control);
-               app_control_set_app_id(app_control, "org.tizen.coretbt_uiapp");
-               app_control_set_operation(app_control, APP_CONTROL_OPERATION_MAIN);
-
-               ret = conv_payload_set_app_control(payload_handle, "app_control", app_control);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_set_app_control failed with error : %s", get_d2d_error(ret));
-               ret = conv_payload_set_string(payload_handle, "reply", "0");
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_set_string failed with error : %s", get_d2d_error(ret));
-               ret = conv_service_publish(s_data->service_handle, NULL, payload_handle);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_service_publish failed with error : %s", get_d2d_error(ret));
-               sleep(3);
-
-               ret = conv_service_stop(s_data->service_handle, NULL, NULL);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_service_stop failed with error : %s", get_d2d_error(ret));
-
-               DBG("conv_payload_destroy called..");
-               ret = conv_payload_destroy(payload_handle);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_destroy failed with error : %s", get_d2d_error(ret));
-
-               ret = conv_service_destroy(s_data->service_handle);
-               RETM_IF(ret != CONV_ERROR_NONE, "conv_service_destroy failed with error : %s", get_d2d_error(ret));
-
-       }
-
-}
-
-
-static void service_foreach_cb(conv_service_h service_handle, void *user_data)
-{
-       conv_service_e e;
-       d2d_view* this = (d2d_view*) user_data;
-
-       DBG( "service_foreach_cb");
-       service_data* s_data = (service_data*)malloc(sizeof(service_data));
-       s_data->view = this;
-
-
-       int ret = conv_service_get_type(service_handle, &e);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_type failed with error : %s", get_d2d_error(ret));
-       DBG( "service_get_type = %d", (int)e);
-
-       char* value = NULL;
-       char* service_id = NULL;
-
-       ret = conv_service_get_property_string(service_handle, CONV_SERVICE_ID, &service_id);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_property_string failed with error : %s", get_d2d_error(ret));
-       DBG( "service id = %s", service_id);
-
-       ret = conv_service_get_property_string(service_handle, CONV_SERVICE_VERSION, &value);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_property_string failed with error : %s", get_d2d_error(ret));
-       DBG( "service version = %s", value);
-
-       conv_service_h clone_service_handle;
-
-       ret = conv_service_clone(service_handle, &clone_service_handle);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_service_clone failed with error : %s", get_d2d_error(ret));
-
-       s_data->service_handle = clone_service_handle;
-
-       elm_list_item_append(service_list, service_id, NULL, NULL, service_selected_cb, s_data);
-
-       elm_list_go(service_list);
-       elm_object_part_content_set(this->view->layout, "list_container", service_list);
-
-}
-
-static void device_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       device_data* new_device_data = (device_data*) data;
-       d2d_view* this = new_device_data->this;
-       char* device_name;
-       conv_device_get_property_string(new_device_data->selected_device, CONV_DEVICE_NAME, &device_name);
-       DBG("%s is the device name inside device_selected_cb.", device_name );
-
-       elm_list_clear(this->server_list);
-       conv_device_h clone_device;
-       int ret = conv_device_clone(new_device_data->selected_device, &clone_device);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_device_clone failed with error : %s", get_d2d_error(ret));
-
-       ret = conv_device_foreach_service(clone_device, service_foreach_cb, this);
-       RETM_IF(ret != CONV_ERROR_NONE, "conv_device_foreach_service failed with error : %s", get_d2d_error(ret));
-
-
-}
-
-static void discovery_cb(conv_device_h device, int result, void* user_data)
-{
-       char* value = NULL;
-       char* device_name = NULL;
-       d2d_view* this = (d2d_view*) user_data;
-       DBG("Inside server discovery cb.");
-       int ret = conv_device_get_property_string(device, CONV_DEVICE_ID, &value);
-       DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-       DBG("device id = %s", value);
-
-       ret = conv_device_get_property_string(device, CONV_DEVICE_NAME, &device_name);
-       DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-       DBG("device name = %s", device_name);
-
-    ret = conv_device_get_property_string(device, CONV_DEVICE_TYPE, &value);
-       DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-       DBG( "device TYPE = %s", value);
-
-//     this->selected_device = device;
-
-
-       if( device_name!=NULL)
-       {
-               //FIX_ME
-               device_data *new_device_data = (device_data*) malloc(sizeof(device_data));
-               new_device_data->this = this;
-               new_device_data->selected_device = device;
-               this->devices_list = g_list_append(this->devices_list, (gpointer) new_device_data);
-               elm_list_item_append(found_device_list, device_name, NULL, NULL, device_selected_cb, new_device_data);
-               elm_list_go(found_device_list);
-               elm_object_part_content_set(this->view->layout, "list_container", found_device_list);
-
-       }
-}
-
-
-/**
- * @function           _app_destroy_cb
- * @since_tizen                2.3
- * @description                 App Destroy Cb
- * @parameter          void*: Void Pointer
- * @return             static void
- */
-static void _app_destroy_cb(void* this)
-{
-       RETM_IF(NULL == this, "data is NULL");
-
-       d2d_view *view = NULL;
-       view = (d2d_view*)this;
-       RETM_IF(NULL == view, "view is NULL");
-
-       GList *l;
-       device_data *d;
-       for(l = view->devices_list; l != NULL; l = l->next)
-       {
-               d = (device_data*)l->data;
-               conv_device_destroy(d->selected_device);
-               SAFE_DELETE(d);
-       }
-
-       SAFE_DELETE(view->view);
-       SAFE_DELETE(view);
-}
-#endif
-#endif
index d4f350e468b00f68c0ff951fc91c11d0628afec1..be9c4ed18f7f1ce0ffc6bceaf3e5971a9bc3f659 100644 (file)
@@ -94,7 +94,6 @@
 #include "view/tbt-connection-view.h"
 #include "view/tbt-systemsettings-view.h"
 #include "view/tbt-contacts-view.h"
-//#include "view/tbt-d2d-view.h"
 #include "view/tbt-nfc-hce-preferred-view.h"
 #include "view/tbt-nfc-ese-view.h"
 #include "view/tbt-tts-view.h"
@@ -1228,14 +1227,6 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
                                contacts_view_add(view->navi, info, it);
                                break;
                #endif
-               /*#ifdef TBT_MODULE_D2D
-                       case TBT_APP_D2D_CLIENT:
-                               d2d_view_add(view->navi, info, it);
-                               break;
-                       case TBT_APP_D2D_SERVER:
-                               d2d_view_add(view->navi, info, it);
-                               break;
-               #endif*/
 
                #ifdef TBT_MODULE_TTS
                        case TBT_APP_TTS:
index 33c38b2a3100f86cd7024f51c6a21b4139c7cf97..6779f31eedca0754b40277be18680d8d1e62e182 100644 (file)
@@ -25,7 +25,6 @@
         <privilege>http://tizen.org/privilege/internet</privilege>
         <privilege>http://tizen.org/privilege/network.set</privilege>
         <privilege>http://tizen.org/privilege/notification</privilege>
-        <privilege>http://tizen.org/privilege/d2d.datasharing</privilege>
         <privilege>http://tizen.org/privilege/callhistory.write</privilege>
         <privilege>http://tizen.org/privilege/volume.set</privilege>
         <privilege>http://tizen.org/privilege/contact.read</privilege>