ubuntu-touch-coreapps-reviewers team mailing list archive

[Stefano Verzegnassi <stefano92.100@xxxxxxxxx>]

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1477713 into lp:ubuntu-docviewer-app.

Commit message:
Fixed DocumentsModel's duplicated entries when reading from FAT file systems

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1477713 in Ubuntu Document Viewer App: "Duplicate entries shown for documents on SD card (BQ E4.5)"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1477713

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/fix-1477713/+merge/266395

Fixed DocumentModel showing duplicated entries for files stored in the SD card.

I've removed the check for "[MEDIA]/documents", which was meant to be used with UNIX file systems.
Anyway we're not following XDG specifications ATM, neither officially supporting the desktop platform, so there's no real disruptive change.
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1477713 into lp:ubuntu-docviewer-app.

=== modified file 'src/plugin/file-qml-plugin/documentmodel.cpp'
--- src/plugin/file-qml-plugin/documentmodel.cpp	2015-05-19 12:03:01 +0000
+++ src/plugin/file-qml-plugin/documentmodel.cpp	2015-07-30 11:11:53 +0000
@@ -231,15 +231,9 @@
             QString rootPath = volume.rootPath();
 
             if (rootPath.startsWith("/media/")) {
-                // In a Unix filesystem, names are case sentitive.
-                // For that reason we need to check twice.
                 QDir dir;
-
                 dir.setPath(rootPath + "/Documents");
-                if (dir.exists())
-                    m_docsMonitor->addDirectory(dir.canonicalPath());
 
-                dir.setPath(rootPath + "/documents");
                 if (dir.exists())
                     m_docsMonitor->addDirectory(dir.canonicalPath());
             }