diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js index d5f0cddb..b7a63c67 100644 --- a/app/js/messages_manager.js +++ b/app/js/messages_manager.js @@ -3109,7 +3109,6 @@ angular.module('myApp.services') var channelID = AppPeersManager.isChannel(peerID) ? -peerID : 0 var mid = AppMessagesIDsManager.getFullMessageID(update.id, channelID) var message = messagesStorage[mid] - console.warn(dT(), update, pendingData, message) if (message) { var historyStorage = historiesStorage[peerID] var pos = historyStorage.pending.indexOf(tempID) diff --git a/app/js/services.js b/app/js/services.js index f253f63e..9315eccc 100755 --- a/app/js/services.js +++ b/app/js/services.js @@ -3419,7 +3419,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) filter: {_: 'channelMessagesFilterEmpty'}, pts: channelState.pts, limit: 30 - }).then(function (differenceResult) { + }, {timeout: 0x7fffffff}).then(function (differenceResult) { // console.log(dT(), 'channel diff result', differenceResult) channelState.pts = differenceResult.pts @@ -3467,6 +3467,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) $rootScope.$broadcast('stateSynchronized') channelState.syncLoading = false } + }, function () { + channelState.syncLoading = false }) }