cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [2/2] cordova-plugin-file-transfer git commit: fix merge issue with cleanUrl
Date Tue, 06 Jan 2015 21:29:56 GMT
fix merge issue with cleanUrl


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/046e9ae5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/046e9ae5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/046e9ae5

Branch: refs/heads/master
Commit: 046e9ae59a19aa9ce8a62261c0d9dc18cd6a437f
Parents: 2527338 355ed38
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue Jan 6 13:28:57 2015 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue Jan 6 13:28:57 2015 -0800

----------------------------------------------------------------------
 src/wp/FileTransfer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/046e9ae5/src/wp/FileTransfer.cs
----------------------------------------------------------------------
diff --cc src/wp/FileTransfer.cs
index 07ff64a,69bdd53..11db284
--- a/src/wp/FileTransfer.cs
+++ b/src/wp/FileTransfer.cs
@@@ -377,15 -389,6 +377,15 @@@ namespace WPCordovaClassLib.Cordova.Com
                  {
                      using (IsolatedStorageFile isoFile = IsolatedStorageFile.GetUserStoreForApplication())
                      {
-                         string cleanUrl = downloadOptions.Url.Replace("x-wmapp0:", "").Replace("file:",
"");
++                        string cleanUrl = downloadOptions.Url.Replace("x-wmapp0:", "").Replace("file:",
"").Replace("//","");
 +
 +                        // pre-emptively create any directories in the FilePath that do
not exist
 +                        string directoryName = getDirectoryName(downloadOptions.FilePath);
 +                        if (!string.IsNullOrEmpty(directoryName) && !isoFile.DirectoryExists(directoryName))
 +                        {
 +                            isoFile.CreateDirectory(directoryName);
 +                        }
 +
                          // just copy from one area of iso-store to another ...
                          if (isoFile.FileExists(downloadOptions.Url))
                          {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message