[UI]Remove mdm

Change-Id: If432efb2fcf80c50314c8284604910eaa1377421

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c86a2a0da0d021658e6b1214d6ca45dcffe70975..64a9fcd7d3533913d678384eb14a05fa16241dc1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ pkg_check_modules(pkgs REQUIRED
        utilX
        ail
        notification
-       mdm
        security-server
 )
 

diff --git a/org.tizen.lockscreen.xml.in b/org.tizen.lockscreen.xml.in
index 6243fd49a541d37f8daf9b09cc6d00594eecc45d..540553c2f34243e52ab2be701fa1c964f83d4efd 100755 (executable)
--- a/org.tizen.lockscreen.xml.in
+++ b/org.tizen.lockscreen.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.2" install-location="internal-only">\r
+<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.3" install-location="internal-only">\r
        <label>@PROJECT_NAME@</label>\r
        <author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>\r
        <author email="seungtaek.chung@samsung.com" href="www.samsung.com">seungtaek chung</author>\r

diff --git a/packaging/org.tizen.lockscreen.spec b/packaging/org.tizen.lockscreen.spec
index f5145cb8f64df4563465fa3319dec1d44db41cdc..320b775aa9a9e1eb693723b1e0ceb74f8a00f4a5 100755 (executable)
--- a/packaging/org.tizen.lockscreen.spec
+++ b/packaging/org.tizen.lockscreen.spec
@@ -2,7 +2,7 @@
 
 Name:       org.tizen.lockscreen
 Summary:    lockscreen application
-Version: 0.1.2
+Version: 0.1.3
 Release:    1
 Group:      TBD
 License:    Apache
@@ -14,7 +14,6 @@ BuildRequires: pkgconfig(utilX)
 BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(notification)
 BuildRequires: pkgconfig(security-server)
-BuildRequires: pkgconfig(mdm)
 
 BuildRequires: cmake
 BuildRequires: gettext

diff --git a/src/password-verification.c b/src/password-verification.c
index 9e4093bf7e35dfb1ef23b7d9ff0b96c248413c1b..56902f175890300d8307d1a83cc11404266efb09 100755 (executable)
--- a/src/password-verification.c
+++ b/src/password-verification.c
@@ -18,7 +18,6 @@
 #include <sys/types.h>\r
 #include <unistd.h>\r
 #include <security-server.h>\r
-#include <mdm.h>\r
 #include <vconf.h>\r
 #include <vconf-keys.h>\r
 \r
@@ -36,43 +35,10 @@ typedef struct {
        unsigned int max_attempt;\r
        unsigned int expire_sec;\r
        int recoverable;\r
-       int mdm_quality;\r
        password_operation_cb callback;\r
        void *data;\r
 } lockscreen_password_policy;\r
 \r
-static Eina_Bool __password_verification_check_pw_expired(void *data)\r
-{\r
-       lockscreen_password_policy *password_policy = (lockscreen_password_policy *)data;\r
-       if (!password_policy) {\r
-               return EINA_FALSE;\r
-       }\r
-\r
-       LOCK_SCREEN_TRACE_DBG("Checking pw expired => valid_secs:%d:%d", password_policy->expire_sec);\r
-\r
-       if (password_policy->expire_sec == 0) {\r
-               return EINA_TRUE;\r
-       } else\r
-               return EINA_FALSE;\r
-}\r
-\r
-static Eina_Bool __password_verification_check_recovery(void *data)\r
-{\r
-       lockscreen_password_policy *password_policy = (lockscreen_password_policy *)data;\r
-       if (!password_policy) {\r
-               return EINA_FALSE;\r
-       }\r
-\r
-       LOCK_SCREEN_TRACE_DBG("Checking recovery => current_attempt:%d max_attempt:%d",\r
-               password_policy->current_attempt, password_policy->max_attempt);\r
-\r
-       if ((password_policy->max_attempt != 0) && (password_policy->max_attempt == password_policy->current_attempt))  {\r
-               password_policy->recoverable = 1;\r
-               return EINA_TRUE;\r
-       } else\r
-               return EINA_FALSE;\r
-}\r
-\r
 static Eina_Bool __password_verification_check_phone_password(void *data, const char *str)\r
 {\r
        LOCK_SCREEN_TRACE_DBG("%s : %s\n", __FUNCTION__, str);\r
@@ -128,69 +94,6 @@ static lockscreen_password_type __password_verification_check_length(const char
        return NORMAL_PASSWORD;\r
 }\r
 \r
-static void __password_verification_set_expired_password_by_mdm(void *data)\r
-{\r
-       lockscreen_password_policy *password_policy = (lockscreen_password_policy *)data;\r
-\r
-       if(!password_policy) {\r
-               LOCK_SCREEN_TRACE_DBG("lock_policy is NULL");\r
-               return;\r
-       }\r
-\r
-       if(mdm_get_service() == MDM_RESULT_SUCCESS) {\r
-               LOCK_SCREEN_TRACE_DBG("success to connect mdm server..!!");\r
-               if (mdm_enforce_password_change() == MDM_RESULT_SUCCESS) {\r
-                       LOCK_SCREEN_TRACE_DBG("success to call mdm_enforce_password_change..!!");\r
-               } else {\r
-                       LOCK_SCREEN_TRACE_DBG("[ERROR] failed to call mdm_enforce_password_change..!!");\r
-               }\r
-\r
-               if (mdm_set_password_status(MDM_PASSWORD_EXPIRED) == MDM_RESULT_SUCCESS) {\r
-                       LOCK_SCREEN_TRACE_DBG("success to set MDM_PASSWORD_EXPIRED..!!");\r
-               } else {\r
-                       LOCK_SCREEN_TRACE_DBG("[ERROR] failed to set MDM_PASSWORD_EXPIRED..!!");\r
-               }\r
-               mdm_release_service();\r
-       } else {\r
-               LOCK_SCREEN_TRACE_DBG("[ERROR] failed to connect mdm server");\r
-       }\r
-}\r
-\r
-static void __password_verification_recorver_password_by_mdm(void *data)\r
-{\r
-       lockscreen_password_policy *password_policy = (lockscreen_password_policy *)data;\r
-\r
-       if(!password_policy) {\r
-               LOCK_SCREEN_TRACE_DBG("lock_policy is NULL");\r
-               return;\r
-       }\r
-\r
-       if(mdm_get_service() == MDM_RESULT_SUCCESS) {\r
-               LOCK_SCREEN_TRACE_DBG("success to connect mdm server..!!");\r
-               mdm_data_t * lp_data = NULL;\r
-               mdm_password_policy_t *pwd_info = NULL;\r
-               lp_data = mdm_get_password_policy();\r
-               if (lp_data != NULL) {\r
-                       pwd_info = (mdm_password_policy_t *)lp_data->data;\r
-                       password_policy->mdm_quality = pwd_info->quality;\r
-                       LOCK_SCREEN_TRACE_DBG("mdm quality : %d", password_policy->mdm_quality);\r
-                       lp_data->mem_header.free_func(lp_data);\r
-               } else {\r
-                       LOCK_SCREEN_TRACE_DBG("set password policy fail");\r
-               }\r
-               if (password_policy->mdm_quality != MDM_PASSWORD_QUALITY_UNSPECIFIED) {\r
-                       if (mdm_set_password_status(MDM_PASSWORD_FAILED) == MDM_RESULT_SUCCESS) {\r
-                               LOCK_SCREEN_TRACE_DBG("success to set MDM_PASSWORD_FAILED..!!");\r
-                       } else {\r
-                               LOCK_SCREEN_TRACE_DBG("[ERROR] failed to set MDM_PASSWORD_FAILED..!!");\r
-                       }\r
-               }\r
-               mdm_release_service();\r
-       }else {\r
-               LOCK_SCREEN_TRACE_DBG("[ERROR] failed to connect mdm server");\r
-       }\r
-}\r
-\r
 void *password_verification_policy_create()\r
 {\r
        lockscreen_password_policy *password_policy = NULL;\r
@@ -205,8 +108,6 @@ void *password_verification_policy_create()
                return NULL;\r
        }\r
 \r
-       password_policy->mdm_quality = MDM_PASSWORD_QUALITY_UNSPECIFIED;\r
-\r
        ret = security_server_is_pwd_valid(&cur_attempt, &max_attempt, &expire_sec);\r
        LOCK_SCREEN_TRACE_DBG("policy status:%d, cur_attempt:%d, max_attempt:%d ", ret, cur_attempt, max_attempt);\r
 \r
@@ -245,16 +146,9 @@ void password_verification_verify(void *data, const char *password)
        switch(password_type){\r
                case NORMAL_PASSWORD:\r
                        if (__password_verification_check_phone_password(password_policy, password)) {\r
-                               if ( __password_verification_check_pw_expired(password_policy)) {\r
-                                       __password_verification_set_expired_password_by_mdm(password_policy);\r
-                               }\r
                                LOCK_SCREEN_TRACE_DBG("password is right!!!!");\r
                                elm_exit();\r
                        } else {\r
-                               if (__password_verification_check_recovery (password_policy)) {\r
-                                       LOCK_SCREEN_TRACE_DBG("Recovery lock mode..!!");\r
-                                       __password_verification_recorver_password_by_mdm(password_policy);\r
-                               }\r
                                if(password_policy->callback){\r
                                        password_policy->callback("", password_policy->data);\r
                                }\r