Merge pull request #389 from dpalou/MOBILE-1427

MOBILE-1427 scorm: Fix download error if view was cached

Author: jleyva

www/addons/mod_scorm/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_scorm')
  */
 .factory('$mmaModScormHandlers', function($mmCourse, $mmaModScorm, $mmEvents, $state, $mmSite, $mmaModScormHelper,
         $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated, mmCoreEventPackageStatusChanged,
-        mmaModScormComponent, $q, $mmContentLinksHelper) {
+        mmaModScormComponent, $q, $mmContentLinksHelper, $mmUtil) {
     var self = {};
 
     /**
@@ -90,12 +90,26 @@ angular.module('mm.addons.mod_scorm')
                         timemodified = 0;
 
                     function download() {
-                        $mmaModScormHelper.confirmDownload(scorm).then(function() {
-                            $mmaModScorm.prefetch(scorm).catch(function() {
-                                if (!$scope.$$destroyed) {
-                                    $mmaModScormHelper.showDownloadError(scorm);
-                                }
+                        // We need to call getScorm again, the package might have been updated.
+                        $scope.spinner = true; // Show spinner since this operation might take a while.
+                        $mmaModScorm.getScorm(courseid, module.id, module.url).then(function(scorm) {
+                            $mmaModScormHelper.confirmDownload(scorm).then(function() {
+                                $mmaModScorm.prefetch(scorm).catch(function() {
+                                    if (!$scope.$$destroyed) {
+                                        $mmaModScormHelper.showDownloadError(scorm);
+                                    }
+                                });
+                            }).catch(function() {
+                                // User hasn't confirmed, stop spinner.
+                                $scope.spinner = false;
                             });
+                        }).catch(function(error) {
+                            $scope.spinner = false;
+                            if (error) {
+                                $mmUtil.showErrorModal(error);
+                            } else {
+                                $mmaModScormHelper.showDownloadError(scorm);
+                            }
                         });
                     }