N_SE-35874 Issue Fix

Change-Id: Ie09ef44c38016908c1e5602daad2ca70b0e74d25

diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp
index 7d33a91..d890452 100644 (file)
--- a/src/GlAllListEditorPanel.cpp
+++ b/src/GlAllListEditorPanel.cpp
@@ -435,16 +435,28 @@ AllListEditorPanel::OnSceneActivatedN(const SceneId& previousSceneId,
 
        if (previousSceneId == IDSCN_ALL_LIST_SELECTION)
        {
-               if (pArgs != null && pArgs->GetCount() > 0)
+               if (pArgs != null)
                {
-                       IList* pSeletedIndexList = pArgs;
-                       int loopCount = pSeletedIndexList->GetCount();
-                       for (int i = 0; i < loopCount; ++i)
+                       if (__pContentIconListView != null)
                        {
-                               int index = static_cast<Integer*>(pSeletedIndexList->GetAt(i))->ToInt();
-                               __pContentIconListView->SetItemChecked(index, true);
+                               int loopCount = __pPresentationModel->GetCurrentAlbumContentInfoCount();
+                               for (int i = 0; i < loopCount; ++i)
+                               {
+                                       __pContentIconListView->SetItemChecked(i, false);
+                               }
+                       }
+
+                       if( pArgs->GetCount() > 0) //SomeItems are Still Selected.
+                       {
+                               IList* pSeletedIndexList = pArgs;
+                               int loopCount = pSeletedIndexList->GetCount();
+                               for (int i = 0; i < loopCount; ++i)
+                               {
+                                       int index = static_cast<Integer*>(pSeletedIndexList->GetAt(i))->ToInt();
+                                       __pContentIconListView->SetItemChecked(index, true);
+                               }
+                               __pContentIconListView->RequestRedraw(true);
                        }
-                       __pContentIconListView->RequestRedraw(true);
                }
 
                int checkedCount = GetItemCheckedCount();
@@ -466,7 +478,6 @@ AllListEditorPanel::OnSceneActivatedN(const SceneId& previousSceneId,
 
                __pLabelSelectCnt->SetText(strTmp);
                __pLabelSelectCnt->RequestRedraw(true);
-               SetButtonState();
        }
        else if (previousSceneId == IDSCN_ALL_LIST)
        {
@@ -511,6 +522,10 @@ AllListEditorPanel::GetItemCheckedCount(void) const
                        {
                                ++count;
                        }
+                       else
+                       {
+                               AppLog("Index i = %d is Not Checked", i);
+                       }
                }
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index d89dc35..d7784a9 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -1067,7 +1067,8 @@ FileListEditorForm::OnFormBackRequested(Form& source)
                                        pList = new (std::nothrow) ArrayList(SingleObjectDeleter);
                                }
 
-                               pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_ALL_LIST_EDITOR), pList);
+                               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST_EDITOR, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                                                  SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_DESTROY), pList);
                        }
                }
                else