From 84b743230c6635efa8ebfae3c31d3c1cb62c8a93 Mon Sep 17 00:00:00 2001 From: Seongjun Yim Date: Fri, 25 Oct 2013 13:00:22 +0900 Subject: [PATCH] move ClearCertificateDb() to _WebManager Change-Id: Icee9882e2e75963012d273ed2e0107ed29bd840b Signed-off-by: Seongjun Yim --- src/controls/FWebCtrl_WebImpl.cpp | 27 --------------------------- src/controls/FWebCtrl_WebManager.cpp | 27 +++++++++++++++++++++++++++ src/controls/FWebCtrl_WebManager.h | 1 + src/controls/inc/FWebCtrl_WebImpl.h | 1 - 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp index 666fc51..42ae6b5 100755 --- a/src/controls/FWebCtrl_WebImpl.cpp +++ b/src/controls/FWebCtrl_WebImpl.cpp @@ -2299,7 +2299,6 @@ _WebImpl::~_WebImpl() CATCH: _SettingInfoImpl::RemoveSettingEventListener(*this); RemoveEventListenerCallback(); - ClearCertificateDb(); } @@ -3961,32 +3960,6 @@ _WebImpl::RemoveEventListenerCallback(void) const } -void -_WebImpl::ClearCertificateDb(void) -{ - result r = E_SUCCESS; - - String certificatePath(Tizen::App::App::GetInstance()->GetAppRootPath() + CUSTOM_DB_DIRECTORY_PATH + USER_CONFIRM_DB_NAME); - String table(CERTIFICATE_TABLE_NAME); - _DatabaseImpl db; - - r = db.Construct(certificatePath, "r+", null); - SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); - - db.BeginTransaction(); - - r = db.ExecuteSql(L"Delete From " + table, true); - SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - - db.CommitTransaction(); - - return; - -CATCH: - db.RollbackTransaction(); -} - - result _WebImpl::SetBlockSelectionPosition(const Point& startPoint) { diff --git a/src/controls/FWebCtrl_WebManager.cpp b/src/controls/FWebCtrl_WebManager.cpp index 6b36392..137a022 100755 --- a/src/controls/FWebCtrl_WebManager.cpp +++ b/src/controls/FWebCtrl_WebManager.cpp @@ -76,6 +76,7 @@ _WebManager::_WebManager(void) _WebManager::~_WebManager(void) { free(__pProxy); + ClearCertificateDb(); } @@ -153,6 +154,32 @@ _WebManager::Construct(void) } +void +_WebManager::ClearCertificateDb(void) +{ + result r = E_SUCCESS; + + String certificatePath(Tizen::App::App::GetInstance()->GetAppRootPath() + CUSTOM_DB_DIRECTORY_PATH + USER_CONFIRM_DB_NAME); + String table(CERTIFICATE_TABLE_NAME); + _DatabaseImpl db; + + r = db.Construct(certificatePath, "r+", null); + SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + + db.BeginTransaction(); + + r = db.ExecuteSql(L"Delete From " + table, true); + SysTryCatch(NID_WEB_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + + db.CommitTransaction(); + + return; + +CATCH: + db.RollbackTransaction(); +} + + result _WebManager::InitializeProxyAddress(void) { diff --git a/src/controls/FWebCtrl_WebManager.h b/src/controls/FWebCtrl_WebManager.h index ed5262f..57061fd 100755 --- a/src/controls/FWebCtrl_WebManager.h +++ b/src/controls/FWebCtrl_WebManager.h @@ -71,6 +71,7 @@ private: static void InitWebManager(void); static void DestroyWebManager(void); + void ClearCertificateDb(void); result InitializeProxyAddress(void); result CreateResourceDirectory(void) const; result InitializeCustomDb(void) const; diff --git a/src/controls/inc/FWebCtrl_WebImpl.h b/src/controls/inc/FWebCtrl_WebImpl.h index b8ee325..d96237c 100755 --- a/src/controls/inc/FWebCtrl_WebImpl.h +++ b/src/controls/inc/FWebCtrl_WebImpl.h @@ -326,7 +326,6 @@ public: bool IsCertificateRequested(void) const; void SetCertificateConfirmed(bool arg); bool IsCertificateConfirmed(void) const; - void ClearCertificateDb(void); void SetOrientationChanged(bool arg); bool IsOrientationChanged(void) const; -- 2.7.4