[kdepim-runtime/Applications/16.12] resources/shared/singlefileresource: Fix DATA LOSS bug in ical resource which failed to create std.ics if it didn't exist.

David Faure null at kde.org
Mon Dec 19 12:30:44 UTC 2016


Git commit 8ae09b6f4afa8ceb2770da67b6dc79c78b86af47 by David Faure.
Committed on 19/12/2016 at 12:29.
Pushed by dfaure into branch 'Applications/16.12'.

Fix DATA LOSS bug in ical resource which failed to create std.ics if it didn't exist.

The default setup sets the Path to be a local path, not a URL.
=> Use QUrl::fromUserInput so that it can deal with both cases, paths and URLs.

CCMAIL: smartins at kde.org, release-team at kde.org

M  +2    -2    resources/shared/singlefileresource/singlefileresource.h

https://commits.kde.org/kdepim-runtime/8ae09b6f4afa8ceb2770da67b6dc79c78b86af47

diff --git a/resources/shared/singlefileresource/singlefileresource.h b/resources/shared/singlefileresource/singlefileresource.h
index f3c19aaf5..3f4149903 100644
--- a/resources/shared/singlefileresource/singlefileresource.h
+++ b/resources/shared/singlefileresource/singlefileresource.h
@@ -55,7 +55,7 @@ public:
         , mSettings(new Settings(config()))
     {
         // The resource needs network when the path refers to a non local file.
-        setNeedsNetwork(!QUrl(mSettings->path()).isLocalFile());
+        setNeedsNetwork(!QUrl::fromUserInput(mSettings->path()).isLocalFile());
     }
     ~SingleFileResource()
     {
@@ -82,7 +82,7 @@ public:
             return;
         }
 
-        mCurrentUrl = QUrl(mSettings->path()); // path already has scheme
+        mCurrentUrl = QUrl::fromUserInput(mSettings->path()); // the string contains the scheme if remote, doesn't if local path
         if (mCurrentHash.isEmpty())
         {
             // First call to readFile() lets see if there is a hash stored in a


More information about the release-team mailing list