Fixed Jira issuse(30958, 30891)

Change-Id: I5f211f4410632183c203a9d99b92e0716c0d224a

diff --git a/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml b/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml
index 8f81a0f..d9d1b8b 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml
+++ b/res/screen-size-normal/IDL_CONTENTS_DELETE_POPUP.xml
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!--\r
-       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
--->\r
-<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">\r
-<ScenePopup Bversion="2.0.0.201303041025" Dversion="20120315">\r
-    <Popup id="IDL_CONTENTS_DELETE_POPUP">\r
-        <property color="" titleText="" titleTextColor=""/>\r
-        <layout height="220" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>\r
-        <layout height="220" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688"/>\r
-    </Popup>\r
-    <Button id="IDC_DELETE_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="#F8F6EF" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="#D05252" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#F8F6EF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="" text="Delete" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="334" y="126"/>\r
-        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="334" y="126"/>\r
-    </Button>\r
-    <Button id="IDC_CANCEL_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="0" y="126"/>\r
-        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314" x="0" y="126"/>\r
-    </Button>\r
-    <Label id="IDC_LABEL_DELETE_Q" parent="IDL_CONTENTS_DELETE_POPUP">\r
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="Delete?" textColor="" textSize="42" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="40" marginLeft="0" marginRight="0" marginTop="32" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="32"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="32" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="32"/>\r
-    </Label>\r
-</ScenePopup>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
+
+<ScenePopup Bversion="2.0.0.201303280947" Dversion="20120315">
+    <Popup id="IDL_CONTENTS_DELETE_POPUP">
+        <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
+        <layout height="220.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688.0"/>
+        <layout height="220.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688.0"/>
+    </Popup>
+    <Button id="IDC_CANCEL_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="20.0" y="126.0"/>
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="0.0" y="126.0"/>
+    </Button>
+    <Button id="IDC_DELETE_BUTTON" parent="IDL_CONTENTS_DELETE_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="#F8F6EF" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="#D05252" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#F8F6EF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="" text="Delete" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CANCEL_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="274.0" x="354.0" y="126.0"/>
+        <layout bottomRelation="IDL_CONTENTS_DELETE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="314.0" x="334.0" y="126.0"/>
+    </Button>
+    <Label id="IDC_LABEL_DELETE_Q" parent="IDL_CONTENTS_DELETE_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="Delete?" textColor="" textSize="42.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="40.0" marginLeft="0.0" marginRight="0.0" marginTop="32.0" mode="Portrait" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="32.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_DELETE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="32.0" mode="Landscape" rightRelation="IDL_CONTENTS_DELETE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_DELETE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="32.0"/>
+    </Label>
+</ScenePopup>

diff --git a/src/MpMusicPlayerApp.cpp b/src/MpMusicPlayerApp.cpp
index 9192a61..845da12 100644 (file)
--- a/src/MpMusicPlayerApp.cpp
+++ b/src/MpMusicPlayerApp.cpp
@@ -314,6 +314,17 @@ MusicPlayerApp::ParsingArgument(const Tizen::Base::String* pUriData, const Tizen
 
                AppLogDebug("sourceStr : %ls", sourceStr.GetPointer());
                pContentPathArrayList->Add((new (std::nothrow) String(sourceStr)));
+
+               if (__pDataList == null)
+               {
+                       __pDataList = new (std::nothrow) ArrayList();
+                       __pDataList->Construct();
+               }
+               else
+               {
+                       __pDataList->RemoveAll(true);
+               }
+
                __pDataList->Add(pContentPathArrayList);
                __pDataList->Add(*(new Integer(0)));
        }
@@ -373,4 +384,4 @@ MusicPlayerApp::GetOperationId(void)
        AppLogDebug("ENTER");
        AppLogDebug("EXIT");
        return __operationId;
-}
\ No newline at end of file
+}