[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-5' - 2 commits - debian/changelog loleaflet/src loolwsd.spec.in wsd/DocumentBroker.cpp

[Andras Timar (via logerrit)]

 debian/changelog         |    6 ++++++
 loleaflet/src/map/Map.js |    5 +++++
 loolwsd.spec.in          |    2 +-
 wsd/DocumentBroker.cpp   |    4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 26fd0c8291b4732f9a17d111948ee4c13e1b6665
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jun 26 21:21:08 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 21:21:08 2020 +0200

    Bump package version to 4.2.5-2
    
    Change-Id: I39b764a51c0906bef5220e002a6257b0155da335

diff --git a/debian/changelog b/debian/changelog
index cd14bc63b..fe47f9f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.5-2) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-1
+
+ -- Andras Timar <andras.timar at collabora.com>  Fri, 26 Jun 2020 21:20:00 +0200
+
 loolwsd (4.2.5-1) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-1
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index b9667a7a8..2da566289 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        1%{?dist}
+Release:        2%{?dist}
 Vendor:         %{vendor}
 Summary:        LibreOffice Online WebSocket Daemon
 License:        EULA
commit d8422e17e1d30962229de76224cb7fcd13a881b4
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jun 26 14:47:37 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 21:17:50 2020 +0200

    Don't show last modification indicator when data is unavailable
    
    E.g., SharePoint 2013 and 2016 don't support LastModifiedTime field
    in CheckFileInfo [1].
    
    [1] https://docs.microsoft.com/en-us/openspecs/office_protocols/ms-wopi/e2e91eab-4c6d-4f00-9c3f-3a1962135626#Appendix_A_30
    
    Change-Id: Icdcf9f82758b4bd34be25f553e9d756ab76b8bfa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97221
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit ec1bc5807090dea9f28ef25c6211785c7fa1a00f)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97144

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 67bac9bfd..5f9882a53 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -386,6 +386,11 @@ L.Map = L.Evented.extend({
 		if (lastModButton !== null && lastModButton !== undefined
 			&& lastModButton.firstChild.innerHTML !== null
 			&& lastModButton.firstChild.childElementCount == 0) {
+			if (this._lastmodtime == null) {
+				// No modification time -> hide the indicator
+				lastModButton.innerHTML = '';
+				return;
+			}
 			var mainSpan = document.createElement('span');
 			var label = document.createTextNode(_('Last modification'));
 			var separator = document.createTextNode(': ');
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 55e921295..5e647ec76 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -74,6 +74,10 @@ void sendLastModificationTime(const std::shared_ptr<Session>& session,
     if (!session)
         return;
 
+    if (documentLastModifiedTime == std::chrono::system_clock::time_point())
+        // No time from the storage (e.g., SharePoint 2013 and 2016) -> don't send
+        return;
+
     std::stringstream stream;
     stream << "lastmodtime: " << documentLastModifiedTime;
     const std::string message = stream.str();