From 215748d3be876ffec5d72f2d1dfcce56bb7a5937 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 20 Dec 2010 17:38:05 +0200
Subject: Fix using QFileDialog statics in Symbian.

Trying to access files outside C:/data with QFileDialog static functions
either paniced or simply threw an exception depending on what you were
trying to do exactly. To fix this, QFileDialog static functions now
will default to QDir::rootPath() if the path specified by user is
invalid.

Task-number: QTBUG-16204
Reviewed-by: Janne Koskinen
---
 src/gui/dialogs/qfiledialog_symbian.cpp | 69 ++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/gui/dialogs/qfiledialog_symbian.cpp b/src/gui/dialogs/qfiledialog_symbian.cpp
index 1f70305..d82ce2b 100644
--- a/src/gui/dialogs/qfiledialog_symbian.cpp
+++ b/src/gui/dialogs/qfiledialog_symbian.cpp
@@ -119,36 +119,49 @@ static QString launchSymbianDialog(const QString dialogCaption, const QString st
 {
     QString selection;
 #if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3)
-    QT_TRAP_THROWING(
-        TFileName startFolder;
-        if (!startDirectory.isEmpty()) {
-            QString dir = QDir::toNativeSeparators(startDirectory);
+    TFileName startFolder;
+    if (!startDirectory.isEmpty()) {
+        QString dir = QDir::toNativeSeparators(QFileDialogPrivate::workingDirectory(startDirectory));
+        startFolder = qt_QString2TPtrC(dir);
+    }
+    TInt types = AknCommonDialogsDynMem::EMemoryTypeMMCExternal|
+                 AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage|
+                 AknCommonDialogsDynMem::EMemoryTypePhone;
+
+    TPtrC titlePtr(qt_QString2TPtrC(dialogCaption));
+    TFileName target;
+    bool select = false;
+    int tryCount = 2;
+    while (tryCount--) {
+        TInt err(KErrNone);
+        TRAP(err,
+            if (dialogMode == DialogOpen) {
+                CExtensionFilter* extensionFilter = new (ELeave) CExtensionFilter;
+                CleanupStack::PushL(extensionFilter);
+                extensionFilter->setFilter(filter);
+                select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target,
+                         startFolder, NULL, NULL, titlePtr, extensionFilter);
+                CleanupStack::Pop(extensionFilter);
+            } else if (dialogMode == DialogSave) {
+                select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target,
+                         startFolder, NULL, NULL, titlePtr);
+            } else if (dialogMode == DialogFolder) {
+                select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder,
+                            0, 0, titlePtr, NULL, NULL);
+            }
+        );
+
+        if (err == KErrNone) {
+            tryCount = 0;
+        } else {
+            // Symbian native file dialog doesn't allow accessing files outside C:/Data
+            // It will always leave in that case, so default into QDir::rootPath() in error cases.
+            QString dir = QDir::toNativeSeparators(QDir::rootPath());
             startFolder = qt_QString2TPtrC(dir);
         }
-        TInt types = AknCommonDialogsDynMem::EMemoryTypeMMCExternal|
-                     AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage|
-                     AknCommonDialogsDynMem::EMemoryTypePhone;
-
-        TPtrC titlePtr(qt_QString2TPtrC(dialogCaption));
-        TFileName target;
-        bool select = false;
-        if (dialogMode == DialogOpen) {
-            CExtensionFilter* extensionFilter = new (ELeave) CExtensionFilter;
-            CleanupStack::PushL(extensionFilter);
-            extensionFilter->setFilter(filter);
-            select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target,
-                     startFolder, NULL, NULL, titlePtr, extensionFilter);
-            CleanupStack::Pop(extensionFilter);
-        } else if (dialogMode == DialogSave) {
-            select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target,
-                     startFolder, NULL, NULL, titlePtr);
-        } else if (dialogMode == DialogFolder) {
-            select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder,
-                        0, 0, titlePtr, NULL, NULL);
-        }
-        if (select)
-            selection.append(qt_TDesC2QString(target));
-    );
+    }
+    if (select)
+        selection.append(qt_TDesC2QString(target));
 #endif
     return selection;
 }
-- 
cgit v0.12