ubuntu-touch-coreapps-reviewers team mailing list archive

[Carlos Jose Mazieri <carlos.mazieri@xxxxxxxxx>]

Carlos Jose Mazieri has proposed merging lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01 into lp:ubuntu-filemanager-app.

Commit message:
Improved Authentication saving/using by trying the host only when there is no user/password for a such URL which has path

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01/+merge/273333

Improved Authentication saving/using by trying the host only when there is no user/password for a such URL which has path
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-01 into lp:ubuntu-filemanager-app.

=== modified file 'src/plugin/folderlistmodel/net/netauthenticationdata.cpp'
--- src/plugin/folderlistmodel/net/netauthenticationdata.cpp	2015-03-01 15:32:42 +0000
+++ src/plugin/folderlistmodel/net/netauthenticationdata.cpp	2015-10-04 15:43:35 +0000
@@ -78,6 +78,13 @@
     if (!url.isEmpty())
     {
         ret = m_urlEntries.value(url);
+        if (ret == 0)
+        {
+            //try to match cases where a more complete URL like smb://host/share/directory was entered and smb://host had been saved before
+            QUrl hostUrl(url);
+            hostUrl.setPath(QLatin1String(0));
+            ret =  m_urlEntries.value(hostUrl.toString());
+        }
     }
     return ret;
 }