MOBILE-2103 chat: Show modal while sending

Author: dpalou

www/addons/mod/chat/controllers/chat.js

@@ -64,7 +64,7 @@ angular.module('mm.addons.mod_chat')
         $mmaModChat.getChatUsers($scope.chatsid).then(function(data) {
             $scope.chatUsers = data.users;
         }).catch(function(error) {
-            showError(error, 'mma.mod_chat.errorwhilegettingchatusers');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhilegettingchatusers', true);
         }).finally(function() {
             $scope.usersLoaded = true;
         });
@@ -104,16 +104,6 @@ angular.module('mm.addons.mod_chat')
         });
     }
 
-    // Show error modal.
-    function showError(error, defaultMessage) {
-        if (typeof error === 'string') {
-            $mmUtil.showErrorModal(error);
-        } else {
-            $mmUtil.showErrorModal(defaultMessage, true);
-        }
-        return $q.reject();
-    }
-
     // Start the polling to get chat messages periodically.
     function startPolling() {
         // We already have the polling in place.
@@ -145,7 +135,8 @@ angular.module('mm.addons.mod_chat')
                     $interval.cancel($scope.polling);
                     $scope.polling = undefined;
                 }
-                return showError(error, 'mma.mod_chat.errorwhileretrievingmessages');
+                $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileretrievingmessages', true);
+                return $q.reject();
             });
         }).finally(function() {
             pollingRunning = false;
@@ -175,17 +166,20 @@ angular.module('mm.addons.mod_chat')
         }
         text = $mmText.replaceNewLines(text, '<br>');
 
+        var modal = $mmUtil.showModalLoading('mm.core.sending', true);
         $mmaModChat.sendMessage($scope.chatsid, text, beep).then(function() {
             if (beep === '') {
                 $scope.newMessage.text = '';
             }
             getMessagesInterval(); // Update messages to show the sent message.
-        }, function(error) {
+        }).catch(function(error) {
             // Only close the keyboard if an error happens, we want the user to be able to send multiple
             // messages withoutthe keyboard being closed.
             $mmApp.closeKeyboard();
 
-            showError(error, 'mma.mod_chat.errorwhilesendingmessage');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhilesendingmessage', true);
+        }).finally(function() {
+            modal.dismiss();
         });
     };
 
@@ -206,10 +200,12 @@ angular.module('mm.addons.mod_chat')
         return getMessages().then(function() {
             startPolling();
         }).catch(function(error) {
-            return showError(error, 'mma.mod_chat.errorwhileretrievingmessages');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileretrievingmessages', true);
+            $ionicHistory.goBack();
+            return $q.reject();
         });
     }, function(error) {
-        showError(error, 'mma.mod_chat.errorwhileconnecting');
+        $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileconnecting', true);
         $ionicHistory.goBack();
     }).finally(function() {
         $scope.loaded = true;