MOBILE-1408 filepool: Fix download errors in iOS because of some chars

Author: dpalou

www/core/lib/emulator.js

@@ -65,6 +65,7 @@ angular.module('mm.core')
                     errorCallback();
                 } else {
                     filePath = filePath.replace(basePath, ''); // Remove basePath from the filePath.
+                    filePath = filePath.replace(/%20/g, ' '); // Replace all %20 with spaces.
                     $mmFS.writeFile(filePath, data.data).then(function(e) {
                         successCallback(e);
                     }).catch(function(error) {
@@ -81,7 +82,9 @@ angular.module('mm.core')
             unzip: function(source, destination, callback, progressCallback) {
                 // Remove basePath from the source and destination.
                 source = source.replace(basePath, '');
+                source = source.replace(/%20/g, ' '); // Replace all %20 with spaces.
                 destination = destination.replace(basePath, '');
+                destination = destination.replace(/%20/g, ' '); // Replace all %20 with spaces.
 
                 $mmFS.readFile(source, $mmFS.FORMATARRAYBUFFER).then(function(data) {
                     var zip = new JSZip(data),

www/core/lib/fs.js

@@ -914,11 +914,12 @@ angular.module('mm.core')
      * @return {Promise}             Promise resolved when the file is unzipped.
      */
     self.unzipFile = function(path, destFolder) {
-        // We need to use ansolute paths (including basePath).
-        path = self.addBasePathIfNeeded(path);
-         // If destFolder is not set, use same location as ZIP file.
-        destFolder = self.addBasePathIfNeeded(destFolder || self.removeExtension(path));
-        return $cordovaZip.unzip(path, destFolder);
+        // Get the source file.
+        return self.getFile(path).then(function(fileEntry) {
+            // If destFolder is not set, use same location as ZIP file. We need to use ansolute paths (including basePath).
+            destFolder = self.addBasePathIfNeeded(destFolder || self.removeExtension(path));
+            return $cordovaZip.unzip(fileEntry.toURL(), destFolder);
+        });
     };
 
     return self;

www/core/lib/ws.js

@@ -148,20 +148,22 @@ angular.module('mm.core')
     self.downloadFile = function(url, path, background) {
         $log.debug('Downloading file ' + url);
 
-        return $mmFS.getBasePathToDownload().then(function(basePath) {
-            // Use a tmp path to download the file and then move it to final location. This is because if the download fails,
-            // the local file is deleted.
-            var tmpPath = basePath + path + '.tmp';
-            return $cordovaFileTransfer.download(url, tmpPath, { encodeURI: false }, true).then(function() {
-                return $mmFS.moveFile(path + '.tmp', path).then(function(movedEntry) {
+        // Use a tmp path to download the file and then move it to final location.This is because if the download fails,
+        // the local file is deleted.
+        var tmpPath = path + '.tmp';
+
+        // Create the tmp file as an empty file.
+        return $mmFS.createFile(tmpPath).then(function(fileEntry) {
+            return $cordovaFileTransfer.download(url, fileEntry.toURL(), { encodeURI: false }, true).then(function() {
+                return $mmFS.moveFile(tmpPath, path).then(function(movedEntry) {
                     $log.debug('Success downloading file ' + url + ' to ' + path);
                     return movedEntry;
                 });
-            }, function(err) {
-                $log.error('Error downloading ' + url + ' to ' + path);
-                $log.error(JSON.stringify(err));
-                return $q.reject(err);
             });
+        }).catch(function(err) {
+            $log.error('Error downloading ' + url + ' to ' + path);
+            $log.error(JSON.stringify(err));
+            return $q.reject(err);
         });
     };