[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - kit/ChildSession.cpp loleaflet/src

[Libreoffice Gerrit user]

 kit/ChildSession.cpp                  |    2 ++
 loleaflet/src/control/Signing.js      |    9 +++++++++
 loleaflet/src/layer/tile/TileLayer.js |    4 ++++
 3 files changed, 15 insertions(+)

New commits:
commit b23c4b8939b8e5245a64380f0f107a51ca310082
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Jan 17 16:58:20 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jan 18 09:40:25 2019 +0100

    send a signal that the export, sign and upload was successful
    
    Change-Id: Ic55a2d5ea452c9153945d3bc9bcbb514a46e70e9
    (cherry picked from commit fe59a510fd9347de6e72444da943e1aa6824192b)
    Reviewed-on: https://gerrit.libreoffice.org/66541
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index e4c899cca..2b8534c01 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1562,6 +1562,8 @@ bool ChildSession::exportSignAndUploadDocument(const char* buffer, int length, c
         return false;
     }
 
+    sendTextFrame("signeddocumentuploadstatus: OK");
+
     return true;
 }
 
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 17d605128..3f795686f 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -639,5 +639,14 @@ L.Map.include({
 		}
 		awaitForDocumentStatusToUpload = false;
 		currentDocumentType = null;
+	},
+	onVereignUploadStatus: function(uploadStatus) {
+		if (uploadStatus == 'OK') {
+			_map.fire('infobar', {
+				msg: _('Document uploaded.'),
+				action: null,
+				actionLabel: null
+			});
+		}
 	}
 });
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 0134298d5..32e0951e1 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -491,6 +491,10 @@ L.TileLayer = L.GridLayer.extend({
 			var signstatus = textMsg.substring('signaturestatus:'.length + 1);
 			this._map.onChangeSignStatus(signstatus);
 		}
+		else if (textMsg.startsWith('signeddocumentuploadstatus:')) {
+			var status = textMsg.substring('signeddocumentuploadstatus:'.length + 1);
+			this._map.onVereignUploadStatus(status);
+		}
 		else if (textMsg.startsWith('removesession')) {
 			var viewId = parseInt(textMsg.substring('removesession'.length + 1));
 			if (this._map._docLayer._viewId === viewId) {