From 40c8fd11a76dd503068fc8739d2a8a650e089fea Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Thu, 19 Mar 2015 16:17:34 +0300 Subject: [PATCH] Fixed invalid dimensions problem Now sending as document if fails as photo Closes #726 --- app/js/services.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/js/services.js b/app/js/services.js index 67cae4cc..88a36522 100755 --- a/app/js/services.js +++ b/app/js/services.js @@ -1569,12 +1569,17 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) $rootScope.$broadcast('messages_pending'); } + var uploaded = false, + uploadPromise; + message.send = function () { var sendFileDeferred = $q.defer(); sendFilePromise.then(function () { - var uploaded = false, - uploadPromise = MtpApiFileManager.uploadFile(file); + if (!uploaded || message.error) { + uploaded = false; + uploadPromise = MtpApiFileManager.uploadFile(file); + } uploadPromise.then(function (inputFile) { inputFile.name = apiFileName; @@ -1626,6 +1631,14 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) }] }); }, function (error) { + if (attachType == 'photo' && + error.code == 400 && + error.type == 'PHOTO_INVALID_DIMENSIONS') { + error.handled = true; + attachType = 'document'; + message.send(); + return; + } toggleError(true); }); }, function (error) {