Change installlocation tag in manifest.xml

Change-Id: Ib7c29c9c85d3972d42409d5411b5b48804f85acc
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index de72d98..65df5d1 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130410.1]"
+#define OSP_INSTALLER_VERSION "version=[20130410.2]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Step/SystemCheckStep.cpp b/src/Step/SystemCheckStep.cpp
index 5e7fe19..94ad6a1 100755 (executable)
--- a/src/Step/SystemCheckStep.cpp
+++ b/src/Step/SystemCheckStep.cpp
@@ -148,9 +148,6 @@ SystemCheckStep::OnStateVersionCheck(void)
                }
        }
 
-       // Check preferred storage
-       __pContext->__storage = INSTALLATION_STORAGE_INTERNAL;
-
        GoNextState();
        return error;
 }

diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp
index 2e9a093..d66ff6e 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.cpp
+++ b/src/XmlHandler/ManifestHandler.cpp
@@ -55,6 +55,7 @@ ManifestHandler::ManifestHandler(void)
 ,__isDefaultLaunchImage(false)
 ,__isDefaultName(false)
 ,__isDefaultAppDetected(false)
+,__isInternalStorage(false)
 ,__pAppData(null)
 ,__isParserMode(false)
 ,__pParser(null)
@@ -324,9 +325,9 @@ ManifestHandler::OnCharacters(const char *pCharacters)
        {
                status = OnNotificationValue(pCharacters);
        }
-       else if (strcasecmp(pName, "InstallationLocation") == 0)
+       else if (strcasecmp(pName, "InstallLocation") == 0)
        {
-               status = OnInstallationLocationValue(pCharacters);
+               status = OnInstallLocationValue(pCharacters);
        }
        else if (strcasecmp(pName, "Category") == 0)
        {
@@ -742,6 +743,12 @@ ManifestHandler::OnAppsEndElement(void)
 {
        AppLog("</Apps>");
 
+       if ((__isInternalStorage == false) && (File::IsFileExist(DIR_MEMORYCARD_INSTALLATION) == true))
+       {
+               AppLog("INSTALLATION_STORAGE = [EXTERNAL]");
+               __pContext->__storage = INSTALLATION_STORAGE_EXTERNAL;
+       }
+
        return true;
 }
 
@@ -859,7 +866,7 @@ ManifestHandler::OnIdValue(const char* pCharacters)
 }
 
 bool
-ManifestHandler::OnVersionValue(const char *pCharacters)
+ManifestHandler::OnVersionValue(const char* pCharacters)
 {
        AppLog("<Version>%s</Version>", pCharacters);
        __pContext->__version = pCharacters;
@@ -868,7 +875,7 @@ ManifestHandler::OnVersionValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnTypeValue(const char *pCharacters)
+ManifestHandler::OnTypeValue(const char* pCharacters)
 {
        AppLog("<Type>%s</Type>", pCharacters);
 
@@ -881,7 +888,7 @@ ManifestHandler::OnTypeValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnAuthorValue(const char *pCharacters)
+ManifestHandler::OnAuthorValue(const char* pCharacters)
 {
        AppLog("<Author>%s</Author>", pCharacters);
        __pContext->__author = pCharacters;
@@ -890,7 +897,7 @@ ManifestHandler::OnAuthorValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnUrlValue(const char *pCharacters)
+ManifestHandler::OnUrlValue(const char* pCharacters)
 {
        __pContext->__url = pCharacters;
        AppLog("<Url>%s</Url>", pCharacters);
@@ -899,7 +906,7 @@ ManifestHandler::OnUrlValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnApiVersionValue(const char *pCharacters)
+ManifestHandler::OnApiVersionValue(const char* pCharacters)
 {
        __pContext->__apiVersion = pCharacters;
        AppLog("<ApiVersion>%s</ApiVersion>", pCharacters);
@@ -919,7 +926,7 @@ ManifestHandler::OnApiVersionValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnPrivilegeValue(const char *pCharacters)
+ManifestHandler::OnPrivilegeValue(const char* pCharacters)
 {
        __pPrivilegeList->Add(*new (std::nothrow) String(pCharacters));
        AppLog("<Privilege>%s</Privilege>", pCharacters);
@@ -928,7 +935,7 @@ ManifestHandler::OnPrivilegeValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnIconValue(const char *pCharacters)
+ManifestHandler::OnIconValue(const char* pCharacters)
 {
        AppLog("<Icon>%s</Icon>", pCharacters);
 
@@ -1043,7 +1050,7 @@ ManifestHandler::OnIconValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnNameValue(const char *pCharacters)
+ManifestHandler::OnNameValue(const char* pCharacters)
 {
        XmlAttribute* pAttr = 0;
        char* pAttrValue = 0;
@@ -1084,7 +1091,7 @@ ManifestHandler::OnNameValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnDescriptionValue(const char *pCharacters)
+ManifestHandler::OnDescriptionValue(const char* pCharacters)
 {
        XmlAttribute *pAttr = 0;
        char *pAttrValue = 0;
@@ -1106,7 +1113,7 @@ ManifestHandler::OnDescriptionValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnDataControlTypeValue(const char *pCharacters)
+ManifestHandler::OnDataControlTypeValue(const char* pCharacters)
 {
        XmlAttribute* pAttr = null;
        char* pAccessValue = null;
@@ -1129,7 +1136,7 @@ ManifestHandler::OnDataControlTypeValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnConditionValue(const char *pCharacters)
+ManifestHandler::OnConditionValue(const char* pCharacters)
 {
        XmlAttribute *pAttr = null;
        char *pName = null;
@@ -1152,7 +1159,7 @@ ManifestHandler::OnConditionValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnNotificationValue(const char *pCharacters)
+ManifestHandler::OnNotificationValue(const char* pCharacters)
 {
        XmlAttribute *pAttr = null;
        const char *pName = null;
@@ -1193,22 +1200,21 @@ ManifestHandler::OnNotificationValue(const char *pCharacters)
 }
 
 bool
-ManifestHandler::OnInstallationLocationValue(const char *pCharacters)
+ManifestHandler::OnInstallLocationValue(const char* pCharacters)
 {
-       AppLog("<InstallationLocation>%s</InstallationLocation>", pCharacters);
+       AppLog("<InstallLocation>%s</InstallLocation>", pCharacters);
 
-       if ((strcasecmp(pCharacters, "UserPreferred") == 0) &&
-                       (File::IsFileExist(DIR_MEMORYCARD_INSTALLATION) == true))
+       if (strcasecmp(pCharacters, "Internal") == 0)
        {
-               AppLog("INSTALLATION_STORAGE = [EXTERNAL]");
-               __pContext->__storage = INSTALLATION_STORAGE_EXTERNAL;
+               AppLog("INSTALLATION_STORAGE = [INTERNAL]");
+               __isInternalStorage = true;
        }
 
        return true;
 }
 
 bool
-ManifestHandler::OnCategoryValue(const char *pCharacters)
+ManifestHandler::OnCategoryValue(const char* pCharacters)
 {
        TryReturn(__pAppData, false, "__pAppData is null");
 

diff --git a/src/XmlHandler/ManifestHandler.h b/src/XmlHandler/ManifestHandler.h
index b73fc9c..84008d9 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.h
+++ b/src/XmlHandler/ManifestHandler.h
@@ -106,22 +106,22 @@ private:
        bool OnManifestEndElement(void);
 
        // OnValue
-       bool OnIdValue(const char *pCharacters);
-       bool OnVersionValue(const char *pCharacters);
-       bool OnTypeValue(const char *pCharacters);
-       bool OnAuthorValue(const char *pCharacters);
-       bool OnUrlValue(const char *pCharacters);
-       bool OnApiVersionValue(const char *pCharacters);
-       bool OnPrivilegeValue(const char *pCharacters);
-       bool OnIconValue(const char *pCharacters);
-       bool OnNameValue(const char *pCharacters);
-       bool OnDescriptionValue(const char *pCharacters);
-       bool OnDataControlTypeValue(const char *pCharacters);
-       bool OnConditionValue(const char *pCharacters);
-       bool OnNotificationValue(const char *pCharacters);
-       bool OnSizeValue(const char *pCharacters);
-       bool OnInstallationLocationValue(const char *pCharacters);
-       bool OnCategoryValue(const char *pCharacters);
+       bool OnIdValue(const char* pCharacters);
+       bool OnVersionValue(const char* pCharacters);
+       bool OnTypeValue(const char* pCharacters);
+       bool OnAuthorValue(const char* pCharacters);
+       bool OnUrlValue(const char* pCharacters);
+       bool OnApiVersionValue(const char* pCharacters);
+       bool OnPrivilegeValue(const char* pCharacters);
+       bool OnIconValue(const char* pCharacters);
+       bool OnNameValue(const char* pCharacters);
+       bool OnDescriptionValue(const char* pCharacters);
+       bool OnDataControlTypeValue(const char* pCharacters);
+       bool OnConditionValue(const char* pCharacters);
+       bool OnNotificationValue(const char* pCharacters);
+       bool OnSizeValue(const char* pCharacters);
+       bool OnInstallLocationValue(const char* pCharacters);
+       bool OnCategoryValue(const char* pCharacters);
        bool OnMetadataValue(const char* pCharacters);
 
        bool OnMimeTypeValue(const char* pCharacters);
@@ -156,6 +156,7 @@ private:
        bool __isDefaultLaunchImage;
        bool __isDefaultName;
        bool __isDefaultAppDetected;
+       bool __isInternalStorage;
 
        AppData* __pAppData;