MOBILE-1576 quiz: Unblock quiz if JS exception is thrown

Author: dpalou

www/addons/mod_quiz/lang/en.json

@@ -23,6 +23,7 @@
 	"errorrulesnotsupported": "This quiz can't be attempted in the app because it has active rules not supported by the app:",
 	"errorsaveattempt": "An error occurred while saving the attempt data.",
 	"errorsyncquiz": "An error occurred while synchronizing. Please try again.",
+	"errorsyncquizblocked": "This quiz cannot be synchronized right now because there's an ongoing operation. Please try again later. If the problem persists, please restart the app.",
 	"feedback": "Feedback",
 	"finishattemptdots": "Finish attempt...",
 	"finishnotsynced": "Finished but not synchronized",

www/addons/mod_quiz/services/quiz.js

@@ -2078,17 +2078,23 @@ angular.module('mm.addons.mod_quiz')
     self.processAttempt = function(quiz, attempt, data, preflightData, finish, timeup, offline, siteId) {
         var promise;
 
-        self.blockQuiz(siteId, quiz.id); // Block quiz so it cannot be synced.
+        try {
+            self.blockQuiz(siteId, quiz.id); // Block quiz so it cannot be synced.
 
-        if (offline) {
-            promise = processOfflineAttempt(quiz, attempt, data, preflightData, finish, siteId);
-        } else {
-            promise = $mmaModQuizOnline.processAttempt(attempt.id, data, preflightData, finish, timeup, siteId);
-        }
+            if (offline) {
+                promise = processOfflineAttempt(quiz, attempt, data, preflightData, finish, siteId);
+            } else {
+                promise = $mmaModQuizOnline.processAttempt(attempt.id, data, preflightData, finish, timeup, siteId);
+            }
 
-        return promise.finally(function() {
+            return promise.finally(function() {
+                self.unblockQuiz(siteId, quiz.id);
+            });
+        } catch(ex) {
             self.unblockQuiz(siteId, quiz.id);
-        });
+            console.error(ex);
+            return $q.reject();
+        }
     };
 
     /**
@@ -2180,17 +2186,23 @@ angular.module('mm.addons.mod_quiz')
     self.saveAttempt = function(quiz, attempt, data, preflightData, offline, siteId) {
         var promise;
 
-        self.blockQuiz(siteId, quiz.id); // Block quiz so it cannot be synced.
+        try {
+            self.blockQuiz(siteId, quiz.id); // Block quiz so it cannot be synced.
 
-        if (offline) {
-            promise = processOfflineAttempt(quiz, attempt, data, preflightData, false, siteId);
-        } else {
-            promise = $mmaModQuizOnline.saveAttempt(attempt.id, data, preflightData, siteId);
-        }
+            if (offline) {
+                promise = processOfflineAttempt(quiz, attempt, data, preflightData, false, siteId);
+            } else {
+                promise = $mmaModQuizOnline.saveAttempt(attempt.id, data, preflightData, siteId);
+            }
 
-        return promise.finally(function() {
+            return promise.finally(function() {
+                self.unblockQuiz(siteId, quiz.id);
+            });
+        } catch(ex) {
             self.unblockQuiz(siteId, quiz.id);
-        });
+            console.error(ex);
+            return $q.reject();
+        }
     };
 
     /**

www/addons/mod_quiz/services/quiz_sync.js

@@ -40,7 +40,7 @@ angular.module('mm.addons.mod_quiz')
  * @ngdoc service
  * @name $mmaModQuizSync
  */
-.factory('$mmaModQuizSync', function($log, $mmaModQuiz, $mmSite, $mmSitesManager, $q, $mmaModQuizOffline, $mmQuestion,
+.factory('$mmaModQuizSync', function($log, $mmaModQuiz, $mmSite, $mmSitesManager, $q, $mmaModQuizOffline, $mmQuestion, $mmLang,
             $mmQuestionDelegate, $mmApp, $mmConfig, $mmEvents, $translate, mmaModQuizSynchronizationStore, mmaModQuizSyncTime,
             mmaModQuizEventAutomSynced, mmCoreSettingsSyncOnlyOnWifi, mmaModQuizSynchronizationWarningsStore) {
 
@@ -75,7 +75,7 @@ angular.module('mm.addons.mod_quiz')
      *
      * @module mm.addons.mod_quiz
      * @ngdoc method
-     * @name $mmaModQuizSync#getQuizSyncTime
+     * @name $mmaModQuizSync#getQuizSyncWarnings
      * @param  {Number} quizId   Quiz ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the time.
@@ -290,7 +290,7 @@ angular.module('mm.addons.mod_quiz')
         // Verify that quiz isn't blocked.
         if ($mmaModQuiz.isQuizBlocked(siteId, quiz.id)) {
             $log.debug('Cannot sync quiz ' + quiz.id + ' because it is blocked.');
-            return $q.reject();
+            return $mmLang.translateAndReject('mma.mod_quiz.errorsyncquizblocked');
         }
 
         $log.debug('Try to sync quiz ' + quiz.id + ' in site ' + siteId);