Hide history in secret mode

[Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-2107
[Problem]      In Bookmarks view toolbar wasn't hide for secret mode.
[Solution]     Added hiding of toolbar
[Verify]       Open bookmarks in secret and normal mode, check if toolbar
               is properly hidden

Change-Id: I1ae6bef53733bcfc468b65fb31777c2d4b43fb67
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.cpp b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
index 43219d9049179e1b7cca6ba23c96243a2904abc0..2fbeb6b72c754975e3dceeb8d7ab544660f45ac9 100644 (file)
--- a/services/BookmarkManagerUI/BookmarkManagerUI.cpp
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
@@ -78,6 +78,7 @@ void BookmarkManagerUI::showUI()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_naviframe->getLayout());
     m_naviframe->show();
+    checkSecretMode();
 }
 
 void BookmarkManagerUI::hideUI()
@@ -502,6 +503,23 @@ void BookmarkManagerUI::addBookmarkItem(BookmarkData* item)
     elm_genlist_item_selected_set(bookmarkView, EINA_FALSE);
 }
 
+void BookmarkManagerUI::checkSecretMode()
+{
+    auto secretMode = isEngineSecretMode();
+    if (!secretMode) {
+        BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
+        return;
+    }
+
+    if (*secretMode) {
+        elm_object_signal_emit(m_content, "hide_modules_toolbar", "ui");
+        evas_object_hide(m_modulesToolbar);
+    } else {
+        elm_object_signal_emit(m_content, "show_toolbars", "ui");
+        evas_object_show(m_modulesToolbar);
+    }
+}
+
 void BookmarkManagerUI::onBackPressed()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.h b/services/BookmarkManagerUI/BookmarkManagerUI.h
index 87aac3f422b078ccb86686bbfbc90204733c9d08..d0e8b13902aca425fa268c062ea8d4c328ed7dd6 100644 (file)
--- a/services/BookmarkManagerUI/BookmarkManagerUI.h
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.h
@@ -86,6 +86,7 @@ public:
     boost::signals2::signal<void (int)> newFolderItemClicked;
     boost::signals2::signal<Evas_Object* (Evas_Object*, SharedNaviframeWrapper, bool)> getHistoryGenlistContent;
     boost::signals2::signal<void (void)> removeSelectedItemsFromHistory;
+    boost::signals2::signal<bool ()> isEngineSecretMode;
 
 private:
     using FolderData = struct
@@ -110,6 +111,7 @@ private:
     void createEmptyLayout();
     void createGenlistItemClasses();
     void addBookmarkItem(BookmarkData* item);
+    void checkSecretMode();
 
     void changeState(BookmarkManagerState state);
     void reoderBookmarkItems();

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 98914b1c6421c08cc38d8e7114fe9cd15b435dde..8af29ffb97d5fcccae500535741004ce7336d0a2 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -419,6 +419,7 @@ void SimpleUI::connectUISignals()
     m_bookmarkManagerUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
     m_bookmarkManagerUI->getHistoryGenlistContent.connect(boost::bind(&SimpleUI::showHistoryUI, this, _1, _2, _3));
     m_bookmarkManagerUI->removeSelectedItemsFromHistory.connect(boost::bind(&HistoryUI::removeSelectedHistoryItems, m_historyUI.get()));
+    m_bookmarkManagerUI->isEngineSecretMode.connect(boost::bind(&basic_webengine::AbstractWebEngine::isSecretMode, m_webEngine.get()));
 #if PROFILE_MOBILE
     // TODO: delete dead code
 #else