Mobile 1554

www/addons/mod_book/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_book')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModBookPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModBook, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModBook, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_book')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModBookPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModBook, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModBook, module, size, true);
                     }
                 };
 

www/addons/mod_folder/services/handlers.js

@@ -73,7 +73,7 @@ angular.module('mm.addons.mod_folder')
 
                     // Check size and show confirmation if needed.
                     var size = $mmaModFolderPrefetchHandler.getDownloadSize(module);
-                    $mmCourseHelper.prefetchModule($mmaModFolder, module, size, false);
+                    $mmCourseHelper.prefetchModule($scope, $mmaModFolder, module, size, false);
                 }
 
                 downloadBtn = {

www/addons/mod_imscp/services/handlers.js

@@ -74,7 +74,7 @@ angular.module('mm.addons.mod_imscp')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModImscpPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModImscp, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModImscp, module, size, false);
                     }
                 };
 
@@ -86,7 +86,7 @@ angular.module('mm.addons.mod_imscp')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModImscpPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModImscp, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModImscp, module, size, true);
                     }
                 };
 

www/addons/mod_page/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_page')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModPagePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModPage, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModPage, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_page')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModPagePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModPage, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModPage, module, size, true);
                     }
                 };
 

www/addons/mod_resource/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_resource')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModResourcePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModResource, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModResource, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_resource')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModResourcePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModResource, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModResource, module, size, true);
                     }
                 };
 

www/addons/mod_resource/services/resource.js

@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_resource')
  * @name $mmaModResource
  */
 .factory('$mmaModResource', function($mmFilepool, $mmSite, $mmUtil, $mmFS, $http, $log, $q, $sce, $mmApp, $mmSitesManager,
-            mmaModResourceComponent) {
+            mmaModResourceComponent, mmCoreNotDownloaded, mmCoreDownloading, mmCoreDownloaded) {
     $log = $log.getInstance('$mmaModResource');
 
     var self = {};
@@ -356,20 +356,61 @@ angular.module('mm.addons.mod_resource')
             siteId = $mmSite.getId(),
             revision = $mmFilepool.getRevisionFromFileList(files),
             timeMod = $mmFilepool.getTimemodifiedFromFileList(files),
+            component = mmaModResourceComponent,
+            url = contents[0].fileurl,
+            fixedUrl = $mmSite.fixPluginfileURL(url),
             promise;
 
         if ($mmFS.isAvailable()) {
             // The file system is available.
-            promise = $mmFilepool.downloadPackage(siteId, files, mmaModResourceComponent, moduleId, revision, timeMod).then(function() {
-                return $mmFilepool.getUrlByUrl(siteId, contents[0].fileurl, mmaModResourceComponent, moduleId, timeMod);
+            promise = $mmFilepool.getPackageStatus(siteId, component, moduleId, revision, timeMod).then(function(status) {
+                var isWifi = !$mmApp.isNetworkAccessLimited(),
+                    isOnline = $mmApp.isOnline();
+
+                if (status === mmCoreDownloaded) {
+                    // Get the local file URL.
+                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                } else if (status === mmCoreDownloading) {
+                    // Return the online URL.
+                    return fixedUrl;
+                } else {
+                    if (!isOnline && status === mmCoreNotDownloaded) {
+                        // Not downloaded and we're offline, reject.
+                        return $q.reject();
+                    }
+
+                    return $mmFilepool.shouldDownloadBeforeOpen(fixedUrl, contents[0].filesize).then(function() {
+                        // Download and then return the local URL.
+                        return $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod).then(function() {
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                        });
+                    }, function() {
+                        // Start the download if in wifi, but return the URL right away so the file is opened.
+                        if (isWifi && isOnline) {
+                            $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod);
+                        }
+
+                        if (status === mmCoreNotDownloaded || isOnline) {
+                            // Not downloaded or outdated and online, return the online URL.
+                            return fixedUrl;
+                        } else {
+                            // Outdated but offline, so we return the local URL.
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                        }
+                    });
+                }
             });
         } else {
             // We use the live URL.
-            promise = $q.when($mmSite.fixPluginfileURL(url));
+            promise = $q.when(fixedUrl);
         }
 
-        return promise.then(function(localUrl) {
-            return $mmUtil.openFile(localUrl);
+        return promise.then(function(url) {
+            if (url.indexOf('http') === 0) {
+                return $mmUtil.openOnlineFile(url);
+            } else {
+                return $mmUtil.openFile(url);
+            }
         });
     };
 

www/core/components/course/services/helper.js

@@ -314,13 +314,14 @@ angular.module('mm.core.course')
      * @module mm.core.course
      * @ngdoc method
      * @name $mmCourseHelper#prefetchModule
+     * @param  {Object} scope    Scope.
      * @param  {Object} service  Service implementing 'invalidateContent' and 'prefetchContent'.
      * @param  {Object} module   Module to download.
      * @param  {Number} size     Size of the module.
      * @param  {Boolean} refresh True if refreshing, false otherwise.
      * @return {Promise}         Promise resolved when downloaded.
      */
-    self.prefetchModule = function(service, module, size, refresh) {
+    self.prefetchModule = function(scope, service, module, size, refresh) {
         // Show confirmation if needed.
         return $mmUtil.confirmDownloadSize(size).then(function() {
             // Invalidate content if refreshing and download the data.
@@ -329,7 +330,7 @@ angular.module('mm.core.course')
                 // Ignore errors.
             }).then(function() {
                 return service.prefetchContent(module).catch(function() {
-                    if (!$scope.$$destroyed) {
+                    if (!scope.$$destroyed) {
                         $mmUtil.showErrorModal('mm.core.errordownloading', true);
                     }
                 });

www/core/directives/external_content.js

@@ -31,7 +31,7 @@ angular.module('mm.core')
  * Attributes accepted:
  *     - siteid: Reference to the site ID if different than the site the user is connected to.
  */
-.directive('mmExternalContent', function($log, $mmFilepool, $mmSite, $mmSitesManager, $mmUtil, $q) {
+.directive('mmExternalContent', function($log, $mmFilepool, $mmSite, $mmSitesManager, $mmUtil, $q, $mmApp) {
     $log = $log.getInstance('mmExternalContent');
 
     /**
@@ -99,6 +99,27 @@ angular.module('mm.core')
                 } else {
                     dom.setAttribute(targetAttr, finalUrl);
                 }
+
+                // Set events to download big files (not downloaded automatically).
+                if (finalUrl.indexOf('http') === 0 &&
+                            (dom.tagName == 'VIDEO' || dom.tagName == 'AUDIO' || dom.tagName == 'A' || dom.tagName == 'SOURCE')) {
+                    var eventName = dom.tagName == 'A' ? 'click' : 'play';
+
+                    if (dom.tagName == 'SOURCE') {
+                        dom = $mmUtil.closest(dom, 'video,audio');
+                        if (!dom) {
+                            return;
+                        }
+                    }
+
+                    angular.element(dom).on(eventName, function() {
+                        // User played media or opened a downloadable link.
+                        // Download the file if in wifi and it hasn't been downloaded already (for big files).
+                        if (!$mmApp.isNetworkAccessLimited()) {
+                            fn(siteId, url, component, componentId, undefined, false);
+                        }
+                    });
+                }
             });
         });
     }