From: seolheui kim Date: Wed, 9 May 2018 12:39:36 +0000 (+0900) Subject: Add encryption progress service X-Git-Tag: submit/tizen/20180514.014354^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b50fd9f8b2d1ca97757ad90b73300caec8ee8450;p=platform%2Fcore%2Fsecurity%2Fode-ui.git Add encryption progress service Change-Id: I33eb46e7931aa62a8e52e48a190f1bef34239445 Signed-off-by: seolheui kim --- diff --git a/ode/CMakeLists.txt b/ode/CMakeLists.txt index 3aaa583..42f8b3e 100755 --- a/ode/CMakeLists.txt +++ b/ode/CMakeLists.txt @@ -80,4 +80,8 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/org.tizen.ode.edj DESTINATION ${APP_INSTALL_PR #Install app data INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKG_NAME}.xml DESTINATION ${APP_SHARE_PACKAGES_DIR}) +#Install service file +CONFIGURE_FILE(service/ode-progress-ui@.service.in service/ode-progress-ui@.service) +INSTALL(FILES service/ode-progress-ui@.service DESTINATION ${SYSTEMD_UNIT_DIR}) + ADD_SUBDIRECTORY(po) diff --git a/ode/service/ode-progress-ui@.service.in b/ode/service/ode-progress-ui@.service.in new file mode 100644 index 0000000..17cfa44 --- /dev/null +++ b/ode/service/ode-progress-ui@.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=ODE internal %i progress UI + +[Service] +User=application +Group=application +SmackProcessLabel=System +EnvironmentFile=/run/tizen-system-env +EnvironmentFile=/run/xdg-root-env +ExecStart=/usr/bin/ode progress %i Internal + diff --git a/ode/src/interface/internal/decrypt-device.cpp b/ode/src/interface/internal/decrypt-device.cpp index 4f90205..b89708a 100644 --- a/ode/src/interface/internal/decrypt-device.cpp +++ b/ode/src/interface/internal/decrypt-device.cpp @@ -150,6 +150,7 @@ DecryptDeviceInterface::~DecryptDeviceInterface() void DecryptDeviceInterface::onConfirmed(const std::string ¤t) { encryption.decrypt(current); + ::sleep(2); dispose(); } diff --git a/ode/src/interface/internal/encrypt-device.cpp b/ode/src/interface/internal/encrypt-device.cpp index 8fbbd8c..3eaea55 100644 --- a/ode/src/interface/internal/encrypt-device.cpp +++ b/ode/src/interface/internal/encrypt-device.cpp @@ -236,6 +236,7 @@ EncryptDeviceInterface::~EncryptDeviceInterface() void EncryptDeviceInterface::onConfirmed(const std::string ¤t) { encryption.encrypt(current, confirmPage->getOption()); + ::sleep(2); dispose(); } diff --git a/packaging/ode-ui.spec b/packaging/ode-ui.spec index 23722d8..496ae3c 100755 --- a/packaging/ode-ui.spec +++ b/packaging/ode-ui.spec @@ -85,6 +85,7 @@ ln -sf %{odeapp_home}/bin/org.tizen.ode /usr/bin/ode %{odeapp_home}/bin/* %{odeapp_home}/res/* %{TZ_SYS_RO_PACKAGES}/org.tizen.ode.xml +%{_unitdir}/ode-progress-ui@.service ## Secure Erase Application Package ################################ %package -n org.tizen.secure-erase