[Libreoffice-commits] online.git: android/lib common/Authorization.hpp wsd/ClientSession.hpp

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 2 09:08:38 UTC 2020


 android/lib/src/main/cpp/CMakeLists.txt.in |    1 -
 common/Authorization.hpp                   |    2 +-
 wsd/ClientSession.hpp                      |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b39017c08c59766d7d12b06e1e015a00d649e8cb
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Jul 2 10:15:20 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Jul 2 11:08:19 2020 +0200

    android: Remove unneeded dependency + add some comments.
    
    Change-Id: Idbc271a398f6f0c037d478bda5ee0b149ca4f24f
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97730
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index 2e1a5fdb8..4c4e1344a 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -5,7 +5,6 @@ add_library(androidapp SHARED
             androidapp.cpp
             ../../../../../common/Authorization.cpp
             ../../../../../common/FileUtil.cpp
-            ../../../../../common/JailUtil.cpp
             ../../../../../common/Log.cpp
             ../../../../../common/MessageQueue.cpp
             ../../../../../common/Protocol.cpp
diff --git a/common/Authorization.hpp b/common/Authorization.hpp
index 14accb236..b92b0d565 100644
--- a/common/Authorization.hpp
+++ b/common/Authorization.hpp
@@ -16,7 +16,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 
-/// Class to keep the authorization data.
+/// Class to keep the authorization data, which can be either access_token or access_header.
 class Authorization
 {
 public:
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 8922b924e..cc153bdd8 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -226,6 +226,7 @@ private:
     /// URI with which client made request to us
     const Poco::URI _uriPublic;
 
+    /// Authorization data - either access_token or access_header.
     const Authorization _auth;
 
     /// The cookies we should pass on to the storage on saving.


More information about the Libreoffice-commits mailing list