Remove the sim feature and deprecated vconf key

Change-Id: Id3aeea19425d911f67c8a6552941b1ffa23d1059
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e4ae11..f4bc08e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-SET(dependents "elementary evas ui-gadget-1 wifi-direct capi-network-tethering capi-network-connection capi-network-wifi capi-telephony-sim notification")
+SET(dependents "elementary evas ui-gadget-1 capi-network-wifi-direct capi-network-tethering capi-network-connection capi-network-wifi capi-network-bluetooth notification")
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
        SET(CMAKE_BUILD_TYPE "Release")

diff --git a/include/mobile_hotspot.h b/include/mobile_hotspot.h
index acf07d8..fbd16c0 100644 (file)
--- a/include/mobile_hotspot.h
+++ b/include/mobile_hotspot.h
@@ -47,7 +47,6 @@ extern "C" {
 #include <ui-gadget-module.h>
 #include <wifi.h>
 #include <net_connection.h>
-#include <sim.h>
 #include <tethering.h>
 #include <dlog.h>
 

diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec
index 895e556..569d34c 100644 (file)
--- a/packaging/ug-setting-mobileap-efl.spec
+++ b/packaging/ug-setting-mobileap-efl.spec
@@ -4,7 +4,7 @@
 
 Name:       ug-setting-mobileap-efl
 Summary:    Tethering UI Gadget Library
-Version:    0.1.165
+Version:    0.1.166
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora License Version 1.0
@@ -17,11 +17,10 @@ BuildRequires: libtzplatform-config-devel
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(ui-gadget-1)
-BuildRequires: pkgconfig(wifi-direct)
+BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: pkgconfig(capi-network-tethering)
 BuildRequires: pkgconfig(capi-network-connection)
 BuildRequires: pkgconfig(capi-network-wifi)
-BuildRequires: pkgconfig(capi-telephony-sim)
 BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(notification)
 %if %{with x}

diff --git a/src/mh_common_utility.c b/src/mh_common_utility.c
index b0a399b..539c167 100644 (file)
--- a/src/mh_common_utility.c
+++ b/src/mh_common_utility.c
@@ -130,11 +130,6 @@ static void __popup_resp_yes(void *data, Evas_Object *obj, void *event_info)
                break;
 
        case MH_POP_WIFI_OFF_CONF:
-               ret = vconf_set_int(VCONFKEY_MOBILE_HOTSPOT_WIFI_STATE,
-                               VCONFKEY_MOBILE_HOTSPOT_WIFI_PENDING_OFF);
-               if (ret < 0)
-                       ERR("vconf_set_int() is failed : %d\n", ret);
-
                ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
                if (ret != TETHERING_ERROR_NONE) {
                        ERR("wifi tethering off is failed : %d\n", ret);

diff --git a/src/mh_func_onoff.c b/src/mh_func_onoff.c
index 4f84f27..1e95642 100644 (file)
--- a/src/mh_func_onoff.c
+++ b/src/mh_func_onoff.c
@@ -93,26 +93,8 @@ static bool __is_connected_ethernet_net(mh_appdata_t *ad)
 static bool __is_connected_cellular_net(mh_appdata_t *ad)
 {
        connection_cellular_state_e cellular_state = CONNECTION_CELLULAR_STATE_OUT_OF_SERVICE;
-       sim_state_e sim_state = SIM_STATE_UNAVAILABLE;
        int ret;
 
-       /* Check SIM state */
-       ret = sim_get_state(&sim_state);
-       if (ret != SIM_ERROR_NONE) {
-               ERR("sim_get_state() is failed : %d\n", ret);
-               _prepare_popup(MH_POP_INFORMATION,
-                               _("IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"));
-               _create_popup(ad);
-               return false;
-       }
-       DBG("SIM State : %d\n", sim_state);
-       if (sim_state != SIM_STATE_AVAILABLE) {
-               _prepare_popup(MH_POP_INFORMATION,
-                               _("IDS_MOBILEAP_POP_INSERT_SIM_CARD_AND_RESTART_DEVICE_TO_USE_TETHERING"));
-               _create_popup(ad);
-               return false;
-       }
-
        ret = connection_get_cellular_state(ad->conn_handle, &cellular_state);
        if (ret != CONNECTION_ERROR_NONE) {
                ERR("connection_get_cellular_state() is failed : %d\n");
@@ -224,10 +206,6 @@ static void __disable_tethering_by_ind(mh_appdata_t *ad, tethering_disabled_caus
                DBG("TETHERING_DISABLED_IND by LOW_BATTERY\n");
                break;
 
-       case TETHERING_DISABLED_BY_MDM_ON:
-               DBG("TETHERING_DISABLED_IND by MDM\n");
-               break;
-
        default:
                DBG("TETHERING_DISABLED_IND Default\n");
                break;
@@ -350,14 +328,6 @@ void _enabled_cb(tethering_error_e result, tethering_type_e type, bool is_reques
                return;
        }
 
-       if (result == TETHERING_ERROR_NONE) {
-               int ret = vconf_set_int(
-                               VCONFKEY_MOBILE_HOTSPOT_WIFI_STATE,
-                               VCONFKEY_MOBILE_HOTSPOT_WIFI_ON);
-               if (ret < 0)
-                       ERR("vconf_set_int() is failed : %d\n", ret);
-       }
-
        mh_appdata_t *ad = (mh_appdata_t *)user_data;
 
        ad->main.need_recover_wifi_tethering = false;
@@ -491,12 +461,6 @@ int _handle_wifi_onoff_change(mh_appdata_t *ad)
                                        _("IDS_MOBILEAP_POP_DISABLING_TETHERING_WILL_PREVENT_LINKED_DEVICES_FROM_ACCESSING_THE_INTERNET_CONTINUE_Q"));
                        _create_popup(ad);
                } else {
-                       ret = vconf_set_int(
-                                       VCONFKEY_MOBILE_HOTSPOT_WIFI_STATE,
-                                       VCONFKEY_MOBILE_HOTSPOT_WIFI_PENDING_OFF);
-                       if (ret < 0)
-                               ERR("vconf_set_int() is failed : %d\n", ret);
-
                        ret = tethering_disable(ad->handle, TETHERING_TYPE_WIFI);
                        if (ret != TETHERING_ERROR_NONE) {
                                ERR("wifi tethering off is failed : %d\n", ret);