[Release] wrt-installer_0.1.19 submit/tizen_2.1/20130329.053727
authorJihoon Chung <jihoon.chung@samsung.com>
Fri, 29 Mar 2013 05:37:09 +0000 (14:37 +0900)
committerJihoon Chung <jihoon.chung@samsung.com>
Fri, 29 Mar 2013 05:37:09 +0000 (14:37 +0900)
packaging/wrt-installer.spec
src/jobs/widget_install/manifest.h
src/jobs/widget_install/task_database.cpp
src/jobs/widget_install/task_manifest_file.cpp
src/wrt-installer/wrt_installer.cpp

index bf18c80..96755b9 100644 (file)
@@ -1,7 +1,7 @@
-#git:framework/web/wrt-installer wrt-installer 0.1.18
+#git:framework/web/wrt-installer wrt-installer 0.1.19
 Name:       wrt-installer
 Summary:    Installer for tizen Webruntime
-Version:    0.1.18
+Version:    0.1.19
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
index 20236a4..e6f7827 100644 (file)
@@ -403,10 +403,6 @@ class LiveBox
     {
         this->primary = x;
     }
-    void setAutoLaunch(const NcnameType &x)
-    {
-        this->autoLaunch = x;
-    }
     void setUpdatePeriod(const NcnameType &x)
     {
         this->updatePeriod = x;
index d7f4646..7708055 100755 (executable)
@@ -161,29 +161,13 @@ void TaskDatabase::StepSecurityOriginDBInsert()
     FOREACH(it, m_context.widgetConfig.configInfo.privilegeList) {
         std::map<std::string, Feature>::const_iterator result =
             g_W3CPrivilegeTextMap.find(DPL::ToUTF8String(it->name));
-        std::string tizenAppId = DPL::ToUTF8String(m_context.widgetConfig.tzAppid).c_str();
-        std::transform(tizenAppId.begin(), tizenAppId.end(), tizenAppId.begin(), tolower);
         if (result != g_W3CPrivilegeTextMap.end()) {
             if (result->second == FEATURE_USER_MEDIA) {
-                // In case of user media, webkit callback doesn't control origin data
-                // Checking code also useing blank("") scheme and origin
-                SecurityOriginData data(
-                    FEATURE_USER_MEDIA,
-                    Origin(DPL::FromUTF8String(""),
-                           DPL::FromUTF8String(""),
-                           0));
-                dao.setSecurityOriginData(data, RESULT_ALLOW_ALWAYS, true);
+                dao.setPrivilegeSecurityOriginData(result->second, false);
             } else if (result->second == FEATURE_FULLSCREEN_MODE) {
-                // In case of fullscreen mode, use case directly compare
-                // whether web application define privilege name or not
                 continue;
             } else {
-                SecurityOriginData data(
-                    result->second,
-                    Origin(DPL::FromUTF8String("app"),
-                           DPL::FromUTF8String(tizenAppId),
-                           0));
-                dao.setSecurityOriginData(data, RESULT_ALLOW_ALWAYS, true);
+                dao.setPrivilegeSecurityOriginData(result->second);
             }
         }
     }
@@ -333,9 +317,16 @@ void TaskDatabase::StepLiveboxDBInsert()
         LogInfo("livebox id: " << boxId);
         LogInfo("livebox type: " << boxType);
 
+        int autoLaunch;
+        if ((**it).m_autoLaunch == L"true") {
+            autoLaunch = 1;
+        } else {
+            autoLaunch = 0;
+        }
+
         int ret =
-            web_provider_livebox_insert_box_type(
-                boxId.c_str(), tizenId.c_str(), boxType.c_str());
+            web_provider_livebox_insert_box_info(
+                boxId.c_str(), tizenId.c_str(), boxType.c_str(), autoLaunch);
 
         if (ret < 0) {
             LogDebug("failed to set type of livebox: " << boxId);
index 95b53c5..400fc65 100644 (file)
@@ -899,10 +899,6 @@ void TaskManifestFile::setLiveBoxInfo(Manifest& manifest)
             liveBox.setPrimary(ConfigInfo->m_primary);
         }
 
-        if (ConfigInfo->m_autoLaunch == L"true") {
-            liveBox.setAutoLaunch(appid);
-        }
-
         if (ConfigInfo->m_updatePeriod != L"") {
             liveBox.setUpdatePeriod(ConfigInfo->m_updatePeriod);
         }
index 9037cff..da38798 100644 (file)
@@ -661,7 +661,7 @@ void WrtInstaller::staticWrtStatusCallback(std::string tizenId,
                 break;
 
             case WRT_INSTALLER_ERROR_INVALID_CERTIFICATE:
-                fprintf(stderr,"## wrt-installer : %s %s has failed - invalid certificate\n",
+                fprintf(stderr,"## wrt-installer : %s %s has failed - invalid certificate - invalid signature\n",
                         tizenId.c_str(), printMsg.c_str());
                 break;