jsdialog: move About dialog to separate file

- converted to TS
- will be later extended with additional functionality

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I883da61018808d79d616d7346e86dadf9fa7079e

.cirrus.yml

@@ -1,31 +0,0 @@
-task:
-  name: "FreeBSD 13"
-  freebsd_instance:
-    matrix:
-      - image_family: freebsd-13-0-snap
-  deps_script:
-    - sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
-    - env ASSUME_ALWAYS_YES=yes pkg update -f
-    - env ASSUME_ALWAYS_YES=yes pkg remove -y python27 python2 python37
-    - env ASSUME_ALWAYS_YES=yes pkg install -y python3 python38 py38-polib py38-lxml
-    - env ASSUME_ALWAYS_YES=yes pkg install -y gmake pkgconf poco cppunit autotools coreutils git bash npm png pango
-    - mkdir libreoffice-src
-    - cd libreoffice-src
-    - fetch https://github.com/CollaboraOnline/online/releases/download/for-code-assets/LibreOfficeKit-includes-co-2021.tar.gz
-    - tar -xzf LibreOfficeKit-includes-co-2021.tar.gz
-  build_script:
-    - mkdir .git/hooks
-    - pw useradd -n cool -d /tmp/coolhome -m
-    - chmod -R o+rwx ./
-    - su -m cool -c './autogen.sh'
-    - 'su -m cool -c ''env HOME=/tmp/coolhome MAKE=gmake
-        CPPFLAGS="-isystem /usr/local/include" CFLAGS="-I/usr/local/include"
-        CXXFLAGS="-I/usr/local/include" LDFLAGS=-L/usr/local/lib ./configure
-        --with-lo-path=/usr/local/lib/libreoffice/
-        --with-lokit-path=./libreoffice-src/include
-        --disable-seccomp --disable-setcap --enable-debug'' '
-    - su -m cool -c 'env HOME=/tmp/coolhome gmake -j`sysctl -n hw.ncpu`'
-    - chown root ./coolmount
-    - chmod +s ./coolmount
-  test_script:
-#    - su -m cool -c 'env HOME=/tmp/coolhome gmake check'

.cirrus.yml.disabled

@@ -0,0 +1,31 @@
+task:
+  name: "FreeBSD 13"
+  freebsd_instance:
+    matrix:
+      - image_family: freebsd-13-1-snap
+  deps_script:
+    - sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
+    - env ASSUME_ALWAYS_YES=yes pkg update -f
+    - env ASSUME_ALWAYS_YES=yes pkg remove -y python27 python2 python37
+    - env ASSUME_ALWAYS_YES=yes pkg install -y python3 python39 py39-polib py39-lxml
+    - env ASSUME_ALWAYS_YES=yes pkg install -y gmake pkgconf poco cppunit autotools coreutils git bash npm png pango zstd openssl
+    - mkdir libreoffice-src
+    - cd libreoffice-src
+    - fetch https://github.com/CollaboraOnline/online/releases/download/for-code-assets/LibreOfficeKit-includes-co-23.05.tar.gz
+    - tar -xzf LibreOfficeKit-includes-co-23.05.tar.gz
+  build_script:
+    - mkdir .git/hooks
+    - pw useradd -n cool -d /tmp/coolhome -m
+    - chmod -R o+rwx ./
+    - su -m cool -c './autogen.sh'
+    - 'su -m cool -c ''env HOME=/tmp/coolhome MAKE=gmake
+        CPPFLAGS="-isystem /usr/local/include" CFLAGS="-I/usr/local/include"
+        CXXFLAGS="-I/usr/local/include" LDFLAGS=-L/usr/local/lib ./configure
+        --with-lo-path=/usr/local/lib/libreoffice/
+        --with-lokit-path=./libreoffice-src/include
+        --disable-seccomp --disable-werror --disable-setcap --enable-debug'' '
+    - su -m cool -c 'env HOME=/tmp/coolhome gmake -j`sysctl -n hw.ncpu`'
+    - chown root ./coolmount
+    - chmod +s ./coolmount
+  test_script:
+#    - su -m cool -c 'env HOME=/tmp/coolhome gmake check'

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,ts}]
+charset = utf-8
+indent_style = tab

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,35 +7,35 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+### Describe the Bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+### Steps to Reproduce
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+### Expected Behavior
 A clear and concise description of what you expected to happen.
 
-**Actual behavior**
+### Actual Behavior
 A clear and concise description of what actually happens.
 
-**Screenshots**
+### Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information)**
- - OS: [e.g. iOS]
- - Browser: [e.g. chrome, safari]
- - Version: [e.g. 22]
+### Desktop
+(Please complete the following information)
+ - **Collabora version:** [e.g. 23.05.5.3]
+ - **OS and version:** [e.g. Windows 11]
+ - **Browser and version:** [e.g. Chrome 114.0]
 
-**Smartphone (please complete the following information)**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser: [e.g. stock browser, safari]
- - Version: [e.g. 22]
+### Smartphone
+(Please complete the following information)
+ - **Device:** [e.g. iPhone 14]
+ - **OS:** [e.g. iOS 16.5]
+ - **Browser and version:** [e.g. Safari 16.4]
 
-**Additional context**
+### Additional Context
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report_smoke-test.md

@@ -7,36 +7,42 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+### Describe the Bug
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+### Steps to Reproduce
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+### Expected Behavior
 A clear and concise description of what you expected to happen.
 
-**Actual behavior**
+### Actual Behavior
+
 A clear and concise description of what actually happens.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+### Screenshots
 
-**Desktop (please complete the following information)**
- - OS: [e.g. iOS]
- - Browser: [e.g. chrome, safari]
- - Version: [e.g. 22]
+### Desktop
 
-**Smartphone (please complete the following information)**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser: [e.g. stock browser, safari]
- - Version: [e.g. 22]
+(Please complete the following information)
+ - **OS:** [e.g. Windows 11]
+ - **Browser:** [e.g. Chrome]
+ - **Version:** [e.g. 114.0]
+
+### Smartphone
+
+(Please complete the following information)
+ - **Device:** [e.g. iPhone14]
+ - **OS:** [e.g. iOS16.5]
+ - **Browser:** [e.g. Safari]
+ - **Version:** [e.g. 16.4]
+
+### Additional Context
 
-**Additional context**
 https://github.com/CollaboraOnline/online/discussions/3461
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,22 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+### Is your feature request related to a problem?
+
+A clear and concise description of what the problem is.
+
+[Example: I want to do X, but because of PROBLEM, it takes 5 extra steps instead of 1.]
+
+### Describe the solution you'd like
 
-**Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+[Example: When I press on X, I think Y should happen. In other software, this exists under the "Help" tab.]
+
+### Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+### Additional context
+
 Add any other context or screenshots about the feature request here.

.github/codeql/codeql-config.yml

@@ -2,8 +2,3 @@ name: "CodeQL config"
 
 queries:
   - uses: security-and-quality
-
-# Ignore these from being scanned
-paths-ignore:
-  - '**/*w2ui-1.5.rc1.js'
-  - '/loleaflet/'

.github/workflows/codeql-analysis.yml

@@ -11,13 +11,6 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [master]
-    # The paths-ignore here only defines that changes in these will not trigger
-    # the action at all; but to actually avoid scanning the content of these,
-    # see the .github/codeql/codeql-config.yml configuration file
-    paths-ignore:
-      - '**/*w2ui-1.5.rc1.js'
-      - 'loleaflet/'
-
   schedule:
     - cron: '0 22 * * 3'
 
@@ -45,7 +38,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
@@ -63,7 +56,8 @@ jobs:
         sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security universe >> /etc/apt/sources.list"
         sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security multiverse >> /etc/apt/sources.list"
         sudo apt-get update
-        sudo apt-get install -y build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev python3-lxml libpam-dev
+        sudo apt install -y libunwind-dev
+        sudo apt-get install -y build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev python3-lxml libpam-dev libzstd-dev
         sudo apt-get build-dep -y libreoffice
 
     - if: matrix.language == 'python'
@@ -75,8 +69,8 @@ jobs:
     - if: matrix.language == 'cpp'
       name: Configure
       run: |
-        cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
-        tar xvf core-co-2021-assets.tar.gz && rm core-co-2021-assets.tar.gz && export LOCOREPATH=$(pwd)
+        cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-24.04-assets.tar.gz
+        tar xvf core-co-24.04-assets.tar.gz && rm core-co-24.04-assets.tar.gz && export LOCOREPATH=$(pwd)
         cd online && ./autogen.sh
         ./configure --enable-silent-rules --with-lokit-path=${LOCOREPATH}/include --with-lo-path=${LOCOREPATH}/instdir --enable-debug --disable-setcap
         cd browser && npm update
@@ -86,4 +80,4 @@ jobs:
       run: make -j `nproc`
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/helm-release.yml

@@ -0,0 +1,106 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - main
+      # legacy support
+      - master
+
+jobs:
+  release:
+    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
+    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
+    permissions:
+      contents: write
+      packages: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.12.1
+
+      - name: Import GPG key
+        run: |
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --dearmor --output keyring.gpg
+          echo "${{ secrets.GPG_PASSPHRASE }}" > passphrase-file.txt
+
+      - name: Run chart-releaser
+        # for use with make-release-latest
+        uses: helm/chart-releaser-action@v1.6.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_SKIP_EXISTING: true
+          CR_KEY: Collabora Productivity
+          CR_KEYRING: keyring.gpg
+          CR_PASSPHRASE_FILE: passphrase-file.txt
+          CR_SIGN: true
+        with:
+          charts_dir: "kubernetes/helm"
+          config: kubernetes/helm/cr.yaml
+
+      # see https://github.com/helm/chart-releaser/issues/183
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push charts to GHCR
+        run: |
+          shopt -s nullglob
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+
+            # Check if the package has a ".prov" extension and skip if true
+            # prov doesn't need to be pushed they are already pushed as layer in manifest
+            if [[ "${pkg}" == *.prov ]]; then
+              echo "Skipping package - ${pkg} with '.prov' extension"
+              continue
+            fi
+
+            # convert uppercase->lowercase to make sure it follows oci rules
+            lowercase=$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')
+            
+            echo "Pushing package - ${pkg} to ghcr.io repository - ${lowercase}"
+            helm push "${pkg}" "oci://ghcr.io/${lowercase}/charts"
+          done
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push charts to Docker Hub
+        run: |
+          shopt -s nullglob
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+
+            # Check if the package has a ".prov" extension and skip if true
+            # prov doesn't need to be pushed they are already pushed as layer in manifest
+            if [[ "${pkg}" == *.prov ]]; then
+              echo "Skipping package - ${pkg} with '.prov' extension"
+              continue
+            fi
+
+            echo "Pushing package - ${pkg} to docker.io repository - collabora"
+            helm push "${pkg}" "oci://registry-1.docker.io/collabora"
+          done

.gitignore

@@ -14,13 +14,14 @@
 **/.cache
 Makefile
 Makefile.in
-coolkitconfig.xcu
 coolwsd.spec
 coolwsd.xml
 aclocal.m4
 autom4te.cache
 config.h
-config.h.in
+config_unused.h
+config_unused.h.in
+config_version.h
 ios/config.h
 config.log
 config.guess
@@ -34,6 +35,8 @@ libtool
 ltmain.sh
 missing
 stamp-h1
+stamp-h2
+stamp-h3
 m4
 debian/coolwsd.postinst
 common/support-public-key.hpp
@@ -60,9 +63,15 @@ cscope*
 *.orig
 coolwsd.log
 *.log.*.gz
+.log
 *.lo
 *.mo
 
+gcov/*
+*.gcno
+*.gcda
+*.gcov
+
 # browser
 browser/debug
 browser/release
@@ -88,8 +97,10 @@ loolconfig
 coolforkit-nocaps
 loadtest
 unittest
-coolwsd_fuzzer
 clientnb
+libsimd.a
+coolwsd-inproc
+coolbench
 
 # Fuzzer
 *_fuzzer
@@ -112,11 +123,14 @@ ios/Mobile/Info.plist
 ios/Mobile/Fonts
 ios/Mobile/Branding
 ios/Mobile/Resources/Settings.bundle/Root.plist
+ios/Mobile/coolkitconfig.xcu
 
 # symlinks created by configure for the iOS app Xcode project
 lobuilddir-symlink
 pocoinclude-symlink
 pocolib-symlink
+zstdinclude-symlink
+zstdlib-symlink
 ICU.dat
 ios/Mobile/Assets.xcassets/AppIcon.appiconset
 

.gitpod-files/coolwsd-gitpod.xml

@@ -1,8 +1,15 @@
 <config>
 
+    <!-- For more detailed documentation on typical configuration options please see:
+         https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
+
     <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
     <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
 
+    <accessibility desc="Accessibility settings">
+        <enable type="bool" desc="Controls whether accessibility support should be enabled or not." default="false">false</enable>
+    </accessibility>
+
     <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
 
     <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
@@ -17,7 +24,6 @@
     <per_document desc="Document-specific settings, including LO Core settings.">
         <max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
         <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
-        <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
         <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
         <idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
         <!-- Idle save and auto save are checked every 30 seconds -->
@@ -128,12 +134,11 @@
 
     <welcome>
       <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="false">false</enable>
-      <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
-      <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="browser/welcome"></path>
     </welcome>
 
     <user_interface>
-      <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
+      <mode type="string" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of compact or tabbed (default|compact|tabbed)" default="default">default</mode>
+      <use_integration_theme desc="Use theme from the integrator" type="bool" default="true">true</use_integration_theme>
     </user_interface>
 
     <storage desc="Backend storage">
@@ -167,8 +172,6 @@
         </ssl>
     </storage>
 
-    <tile_cache_persistent desc="Should the tiles persist between two editing sessions of the given document?" type="bool" default="true">true</tile_cache_persistent>
-
     <admin_console desc="Web admin console settings.">
         <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
         <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
@@ -179,4 +182,16 @@
     <monitors desc="Addresses of servers we connect to on start for monitoring">
     </monitors>
 
+    <fonts_missing>
+        <handling desc="How to handle fonts mising in a document: 'report', 'log', 'both', or 'ignore'" type="string" default="log">both</handling>
+    </fonts_missing>
+
+    <zotero desc="Zotero plugin configuration. For more details about Zotero visit https://www.zotero.org/">
+        <enable desc="Enable Zotero plugin." type="bool" default="true">true</enable>
+    </zotero>
+
+   <overwrite_mode>
+        <enable desc="Enable overwrite mode (user can use insert key)" type="bool" default="true">true</enable>
+    </overwrite_mode>
+
 </config>

.gitpod.dockerfile

@@ -7,7 +7,7 @@ RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ focal main restri
  && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security multiverse >> /etc/apt/sources.list" \
  && sudo apt-get update \
  && sudo apt-get install -y \
-    build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev python3-lxml libpam-dev firefox chromium-browser\
+    build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev libzstd-dev python3-lxml libpam-dev firefox chromium-browser \
  && sudo apt-get build-dep -y libreoffice \
  && pip install lxml \
  && pip install polib \

.gitpod.yml

@@ -36,9 +36,9 @@ tasks:
   - name: Get Core & Configure
     before: |
       cd ..
-      wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
-      tar xvf core-co-2021-assets.tar.gz
-      rm core-co-2021-assets.tar.gz
+      wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-24.04-assets.tar.gz
+      tar xvf core-co-24.04-assets.tar.gz
+      rm core-co-24.04-assets.tar.gz
       cd online
     init: |
       ./autogen.sh

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Thanks for wanting to contribute source code to Collabora Online. You rock!
 3. Grab one of our newcomer-friendly [easy hacks](https://collaboraonline.github.io/post/easyhacks/)
 4. Send your [first pull request](https://forum.collaboraonline.com/t/your-first-pull-request/41)
 5. Check master branch [current status](https://github.com/CollaboraOnline/online#readme)
-  - ![Master: Pull request policy](https://img.shields.io/badge/Master-PRs%20can%20be%20merge%20without%20approval-42BC00?logoColor=42BC00&logo=git "Main release is still distant. Thanks for your support and contributions! :)") Try to get at least one +1 as a reaction, comment or approval from someone else before merging it
+  - ![Master: Pull request policy](https://img.shields.io/badge/Master-PRs%20can%20be%20merged%20without%20approval-42BC00?logoColor=42BC00&logo=git "Main release is still distant. Thanks for your support and contributions! :)") Try to get at least one +1 as a reaction, comment or approval from someone else before merging it
   - ![Master: Pull request policy](https://img.shields.io/badge/Master-protected%2C%20PRs%20need%20approval-red?logoColor=lightred&logo=git "Collabora Team is preparing for the next release, therefore 'master' branch is protected now, PRs need 1 review before merging. Thanks for your support and contributions! :)") It's required to have approval from someone before your PR can be merged
 
 And if you get stuck at any point, just drop by one of our [communication channels](https://collaboraonline.github.io/post/communicate/).

Makefile.am

@@ -5,7 +5,11 @@ if ENABLE_MOBILEAPP
 if ENABLE_GTKAPP
 SUBDIRS = gtk browser
 else
+if ENABLE_WASM
+SUBDIRS = wasm browser
+else !ENABLE_WASM
 SUBDIRS = browser
+endif !ENABLE_WASM
 endif
 
 else
@@ -17,30 +21,34 @@ export ENABLE_DEBUG
 bin_PROGRAMS = \
 	coolforkit \
 	coolmount \
+        coolstress \
 	coolconvert coolconfig
 
 if ENABLE_LIBFUZZER
 else
 bin_PROGRAMS += coolwsd
+if ENABLE_DEBUG
+bin_PROGRAMS += coolwsd-inproc
+endif
 endif
 
-dist_bin_SCRIPTS = coolwsd-systemplate-setup \
-                   coolwsd-generate-proof-key
+dist_bin_SCRIPTS = coolwsd-systemplate-setup
 
 man_MANS = man/coolwsd.1 \
            man/coolforkit.1 \
            man/coolconvert.1 \
            man/coolconfig.1 \
+           man/coolstress.1 \
            man/coolwsd-systemplate-setup.1 \
-           man/coolwsd-generate-proof-key.1 \
            man/coolmount.1
 
 
-dist_doc_DATA = wsd/README \
+dist_doc_DATA = wsd/README.md \
                 wsd/README.vars \
                 wsd/protocol.txt \
                 wsd/reference.md \
-                wsd/metrics.txt
+                wsd/metrics.txt \
+                THIRDPARTYLICENSES
 
 coolwsddatadir = @COOLWSD_DATADIR@
 
@@ -63,7 +71,10 @@ nginxconfig_DATA = etc/nginx/coolwsd.conf
 ACLOCAL_AMFLAGS = -I m4
 
 # quick and easy for now.
-include_paths = -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit ${ZLIB_CFLAGS}
+include_paths = -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit ${ZLIB_CFLAGS} ${ZSTD_CFLAGS} ${PNG_CFLAGS}
+if ENABLE_SSL
+include_paths += ${OPENSSL_CFLAGS}
+endif
 
 AM_CPPFLAGS = -pthread -DCOOLWSD_DATADIR='"@COOLWSD_DATADIR@"' \
 	      -DCOOLWSD_CONFIGDIR='"@COOLWSD_CONFIGDIR@"' \
@@ -74,17 +85,19 @@ if !ENABLE_DEBUG
 AM_CPPFLAGS += -DNDEBUG
 endif
 
-AM_LDFLAGS = -pthread -Wl,-E -lpam $(ZLIB_LIBS)
+AM_LDFLAGS = -Wl,-E -lpam $(ZLIB_LIBS) $(ZSTD_LIBS) ${PNG_LIBS}
 
-if ENABLE_SSL
-AM_LDFLAGS += -lssl -lcrypto
-else
-coolwsd_fuzzer_LDADD = -lssl -lcrypto
-coolwsd_LDADD = -lssl -lcrypto
-coolconfig_LDADD = -lssl -lcrypto
+# Clang's linker doesn't like -pthread.
+if !HAVE_CLANG
+AM_LDFLAGS += -pthread
 endif
 
-coolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 -DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
+if ENABLE_SSL
+AM_LDFLAGS += ${OPENSSL_LIBS}
+else
+coolwsd_LDADD = ${OPENSSL_LIBS}
+coolconfig_LDADD = ${OPENSSL_LIBS}
+endif
 
 AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes --exclude=browser *
 AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
@@ -96,16 +109,18 @@ shared_sources = common/FileUtil.cpp \
                  common/StringVector.cpp \
                  common/Session.cpp \
                  common/Seccomp.cpp \
-                 common/MessageQueue.cpp \
                  common/MobileApp.cpp \
                  common/TraceEvent.cpp \
                  common/SigUtil.cpp \
                  common/SpookyV2.cpp \
                  common/Unit.cpp \
                  common/Util.cpp \
+                 common/Util-desktop.cpp \
                  common/ConfigUtil.cpp \
                  common/Authorization.cpp \
                  common/CommandControl.cpp \
+                 common/Simd.cpp \
+                 kit/KitQueue.cpp \
                  net/DelaySocket.cpp \
                  net/HttpRequest.cpp \
                  net/HttpHelper.cpp \
@@ -116,8 +131,6 @@ if ENABLE_SSL
 shared_sources += net/Ssl.cpp
 endif
 
-shared_json = $(patsubst %.cpp,%.cmd,$(shared_sources))
-
 coolwsd_sources = common/Crypto.cpp \
                   wsd/Admin.cpp \
                   wsd/AdminModel.cpp \
@@ -125,19 +138,26 @@ coolwsd_sources = common/Crypto.cpp \
                   wsd/DocumentBroker.cpp \
                   wsd/ProxyProtocol.cpp \
                   wsd/COOLWSD.cpp \
+                  wsd/ClientRequestDispatcher.cpp \
                   wsd/ClientSession.cpp \
                   wsd/FileServer.cpp \
+                  wsd/ProxyRequestHandler.cpp \
                   wsd/FileServerUtil.cpp \
                   wsd/RequestDetails.cpp \
+                  wsd/RequestVettingStation.cpp \
                   wsd/Storage.cpp \
+                  wsd/HostUtil.cpp \
                   wsd/TileCache.cpp \
                   wsd/ProofKey.cpp \
-                  wsd/QuarantineUtil.cpp
-
-coolwsd_json = $(patsubst %.cpp,%.cmd,$(coolwsd_sources))
+                  wsd/QuarantineUtil.cpp \
+                  wsd/wopi/CheckFileInfo.cpp \
+                  wsd/wopi/StorageConnectionManager.cpp \
+                  wsd/wopi/WopiProxy.cpp \
+                  wsd/wopi/WopiStorage.cpp
 
 coolwsd_SOURCES = $(coolwsd_sources) \
-                  $(shared_sources)
+                  $(shared_sources) \
+                  wsd/coolwsd-fork.cpp
 
 EXTRA_coolwsd_DEPENDENCIES = browser/node_modules
 
@@ -145,16 +165,15 @@ noinst_PROGRAMS = clientnb \
                   connect \
                   lokitclient \
                   coolmap \
-                  coolstress \
+                  coolbench \
                   coolsocketdump
 
 if ENABLE_LIBFUZZER
 noinst_PROGRAMS += \
 		   admin_fuzzer \
 		   clientsession_fuzzer \
-		   httpresponse_fuzzer
-else
-noinst_PROGRAMS += coolwsd_fuzzer
+		   httpresponse_fuzzer \
+		   httpecho_fuzzer
 endif
 
 connect_SOURCES = tools/Connect.cpp \
@@ -162,7 +181,8 @@ connect_SOURCES = tools/Connect.cpp \
                   common/Log.cpp \
                   common/Protocol.cpp \
                   common/StringVector.cpp \
-                  common/Util.cpp
+                  common/Util.cpp \
+                  common/Util-desktop.cpp
 
 lokitclient_SOURCES = common/Log.cpp \
                       common/DummyTraceEventEmitter.cpp \
@@ -170,62 +190,101 @@ lokitclient_SOURCES = common/Log.cpp \
                       common/Protocol.cpp \
                       common/StringVector.cpp \
                       common/TraceEvent.cpp \
-                      common/Util.cpp
+                      common/Util.cpp \
+                      common/Util-desktop.cpp
+
+noinst_LIBRARIES = libsimd.a
+libsimd_a_SOURCES = kit/DeltaSimd.c
+libsimd_a_CFLAGS = @SIMD_CFLAGS@
 
 coolforkit_sources = kit/ChildSession.cpp \
                      kit/ForKit.cpp \
-                     kit/Kit.cpp
-
-coolforkit_json = $(patsubst %.cpp,%.cmd,$(coolforkit_sources))
+                     kit/Kit.cpp \
+                     kit/KitWebSocket.cpp
 
 coolforkit_SOURCES = $(coolforkit_sources) \
-                     $(shared_sources)
+                     $(shared_sources) \
+                     kit/forkit-main.cpp
 
-coolwsd_fuzzer_SOURCES = $(coolwsd_sources) \
-                         $(coolforkit_sources) \
+coolforkit_LDADD = libsimd.a
+
+if ENABLE_DEBUG
+coolwsd_inproc_SOURCES = $(coolwsd_sources) \
                          $(shared_sources) \
-                         kit/DummyLibreOfficeKit.cpp
+                         $(coolforkit_sources) \
+                         wsd/coolwsd-inproc.cpp
+
+coolwsd_inproc_LDADD = ${coolwsd_LDADD} \
+                       ${coolforkit_LDADD}
+endif
+
+if ENABLE_LIBFUZZER
+coolforkit_SOURCES += \
+		       common/DummyTraceEventEmitter.cpp
+
+common_fuzzer_sources = \
+		       fuzzer/Common.cpp \
+		       common/DummyTraceEventEmitter.cpp \
+		       $(coolwsd_sources) \
+		       wsd/coolwsd-inproc.cpp \
+		       $(coolforkit_sources) \
+		       $(shared_sources)
 
 admin_fuzzer_CPPFLAGS = \
-			-DKIT_IN_PROCESS=1 \
 			$(AM_CPPFLAGS)
 admin_fuzzer_SOURCES = \
-		       $(coolwsd_sources) \
-		       $(coolforkit_sources) \
-		       $(shared_sources) \
+		       $(common_fuzzer_sources) \
 		       fuzzer/Admin.cpp
 admin_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS)
+admin_fuzzer_LDADD = libsimd.a
 
 clientsession_fuzzer_CPPFLAGS = \
-				-DKIT_IN_PROCESS=1 \
 				$(AM_CPPFLAGS)
 clientsession_fuzzer_SOURCES = \
-			       $(coolwsd_sources) \
-			       $(coolforkit_sources) \
-			       $(shared_sources) \
+			       $(common_fuzzer_sources) \
 			       fuzzer/ClientSession.cpp
 clientsession_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS)
+clientsession_fuzzer_LDADD = libsimd.a
 
 httpresponse_fuzzer_CPPFLAGS = \
-				-DKIT_IN_PROCESS=1 \
 				$(AM_CPPFLAGS)
 httpresponse_fuzzer_SOURCES = \
-			       $(coolwsd_sources) \
-			       $(coolforkit_sources) \
-			       $(shared_sources) \
+			       $(common_fuzzer_sources) \
 			       fuzzer/HttpResponse.cpp
 httpresponse_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS)
+httpresponse_fuzzer_LDADD = libsimd.a
+
+httpecho_fuzzer_CPPFLAGS = \
+				$(AM_CPPFLAGS) \
+        -I${top_srcdir}/test
+httpecho_fuzzer_SOURCES = \
+			       $(common_fuzzer_sources) \
+			       fuzzer/HttpEcho.cpp
+httpecho_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS)
+httpecho_fuzzer_LDADD = libsimd.a
+
+endif # ENABLE_LIBFUZZER
 
 clientnb_SOURCES = net/clientnb.cpp \
                    common/DummyTraceEventEmitter.cpp \
                    common/Log.cpp \
                    common/StringVector.cpp \
-                   common/Util.cpp
+                   common/Util.cpp \
+                   common/Util-desktop.cpp
 
 coolmount_SOURCES = tools/mount.cpp
 
 coolmap_SOURCES = tools/map.cpp
 
+coolbench_SOURCES = tools/Benchmark.cpp \
+                    common/DummyTraceEventEmitter.cpp \
+		    common/Log.cpp \
+                    common/StringVector.cpp \
+                    common/Util.cpp \
+                    common/Util-desktop.cpp \
+                    common/Simd.cpp
+coolbench_LDADD = libsimd.a
+
 coolconvert_SOURCES = tools/Tool.cpp
 
 coolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" ${include_paths}
@@ -236,10 +295,12 @@ coolstress_SOURCES = tools/Stress.cpp \
 coolconfig_SOURCES = tools/Config.cpp \
 		     tools/ConfigMigrationAssistant.cpp \
 		     common/DummyTraceEventEmitter.cpp \
+		     common/ConfigUtil.cpp \
 		     common/Crypto.cpp \
 		     common/Log.cpp \
 		     common/StringVector.cpp \
-		     common/Util.cpp
+		     common/Util.cpp \
+		     common/Util-desktop.cpp
 
 coolsocketdump_SOURCES = tools/WebSocketDump.cpp \
 			 common/DummyTraceEventEmitter.cpp \
@@ -249,13 +310,17 @@ wsd_headers = wsd/Admin.hpp \
               wsd/AdminModel.hpp \
               wsd/Auth.hpp \
               wsd/ClientSession.hpp \
+              wsd/ContentSecurityPolicy.hpp \
               wsd/DocumentBroker.hpp \
               wsd/ProxyProtocol.hpp \
               wsd/Exceptions.hpp \
               wsd/FileServer.hpp \
+              wsd/ProxyRequestHandler.hpp \
               wsd/COOLWSD.hpp \
+              wsd/ClientRequestDispatcher.hpp \
               wsd/ProofKey.hpp \
               wsd/RequestDetails.hpp \
+              wsd/RequestVettingStation.hpp \
               wsd/SenderQueue.hpp \
               wsd/ServerURL.hpp \
               wsd/Storage.hpp \
@@ -263,7 +328,12 @@ wsd_headers = wsd/Admin.hpp \
               wsd/TileDesc.hpp \
               wsd/TraceFile.hpp \
               wsd/UserMessages.hpp \
-              wsd/QuarantineUtil.hpp
+              wsd/QuarantineUtil.hpp \
+              wsd/HostUtil.hpp \
+              wsd/wopi/CheckFileInfo.hpp \
+              wsd/wopi/StorageConnectionManager.hpp \
+              wsd/wopi/WopiProxy.hpp \
+              wsd/wopi/WopiStorage.hpp
 
 shared_headers = common/Common.hpp \
                  common/Clipboard.hpp \
@@ -271,8 +341,10 @@ shared_headers = common/Common.hpp \
                  common/JsonUtil.hpp \
                  common/FileUtil.hpp \
                  common/JailUtil.hpp \
+                 common/LangUtil.hpp \
                  common/Log.hpp \
                  common/Protocol.hpp \
+                 common/StateEnum.hpp \
                  common/StringVector.hpp \
                  common/Seccomp.hpp \
                  common/Session.hpp \
@@ -280,7 +352,6 @@ shared_headers = common/Common.hpp \
                  common/Util.hpp \
                  common/ConfigUtil.hpp \
                  common/Authorization.hpp \
-                 common/MessageQueue.hpp \
                  common/Message.hpp \
                  common/MobileApp.hpp \
                  common/Png.hpp \
@@ -291,6 +362,11 @@ shared_headers = common/Common.hpp \
                  common/security.h \
                  common/SpookyV2.h \
                  common/CommandControl.hpp \
+                 common/Simd.hpp \
+                 common/ThreadPool.hpp \
+                 common/Watchdog.hpp \
+                 kit/KitQueue.hpp \
+                 net/AsyncDNS.hpp \
                  net/Buffer.hpp \
                  net/DelaySocket.hpp \
                  net/FakeSocket.hpp \
@@ -300,8 +376,8 @@ shared_headers = common/Common.hpp \
                  net/ServerSocket.hpp \
                  net/Socket.hpp \
                  net/WebSocketHandler.hpp \
-                 net/WebSocketSession.hpp \
-                 tools/Replay.hpp
+                 tools/Replay.hpp \
+		 wasm/base64.hpp
 if ENABLE_SSL
 shared_headers += net/Ssl.hpp \
                   net/SslSocket.hpp
@@ -309,10 +385,13 @@ endif
 
 kit_headers = kit/ChildSession.hpp \
               kit/Delta.hpp \
+              kit/DeltaSimd.h \
               kit/DummyLibreOfficeKit.hpp \
               kit/Kit.hpp \
               kit/KitHelper.hpp \
+              kit/KitWebSocket.hpp \
               kit/SetupKitEnvironment.hpp \
+              kit/StateRecorder.hpp \
               kit/Watermark.hpp
 
 noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
@@ -320,14 +399,18 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
                  test/UnitHTTP.hpp \
                  test/HttpTestServer.hpp \
                  test/WopiTestServer.hpp \
-                 test/countcoolkits.hpp \
+                 test/KitPidHelpers.hpp \
                  test/lokassert.hpp \
                  test/test.hpp \
                  test/testlog.hpp \
                  test/HttpTestServer.hpp \
                  test/WOPIUploadConflictCommon.hpp \
+                 test/UnitWSDClient.hpp \
                  test/helpers.hpp
 
+GIT_BRANCH := $(shell git symbolic-ref --short HEAD)
+GIT_HASH := $(shell git log -1 --format=%h)
+
 dist-hook:
 	git log -1 --format=%h > $(distdir)/dist_git_hash 2> /dev/null || rm $(distdir)/dist_git_hash
 	mkdir -p $(distdir)/bundled/include/LibreOfficeKit/
@@ -341,11 +424,9 @@ dist-hook:
 EXTRA_DIST = discovery.xml \
              favicon.ico \
              coolkitconfig.xcu \
-             coolwsd.init.rhel6 \
              coolwsd.spec \
              coolwsd.xml.in \
              coolwsd.service \
-             sysconfig.coolwsd \
              debian/compat \
              debian/copyright \
              debian/coolwsd.preinst \
@@ -364,6 +445,7 @@ EXTRA_DIST = discovery.xml \
              scripts/unocommands.py \
              scripts/refresh-git-hooks \
              README.md \
+             THIRDPARTYLICENSES \
              $(man_MANS)
 
 if ENABLE_LIBFUZZER
@@ -372,9 +454,11 @@ else
 # Use coolwsd to cleanup jails, if any. If it fails, we may have a broken/old coolwsd binary, remove it to rebuild.
 # A CI box may switch branches without cleaning up the binaries, if coolwsd from a broken branch is used here
 # it will fail all subsequent builds, until it's rebuilt from the new branch. So removing coolwsd after failing is needed.
-CLEANUP_COMMAND=if test -s ./coolwsd; then echo "Cleaning up..." && ./coolwsd --disable-cool-user-checking --cleanup --o:logging.level=trace || rm ./coolwsd; fi
+CLEANUP_COMMAND=if test -s ./coolwsd; then echo "Cleaning up..." && ./coolwsd --disable-cool-user-checking --cleanup --o:logging.level=trace || rm -f ./coolwsd; fi
 endif
 
+CLEANUP_COVERAGE=rm -rf ${abs_top_srcdir}/gcov; find . -iname "*.gc??" -delete
+
 if HAVE_LO_PATH
 
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -382,7 +466,7 @@ CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
 RUN_GDB = $(if $(GDB_FRONTEND),$(GDB_FRONTEND),gdb --tui --args)
 
 if ENABLE_SETCAP
-SET_CAPS_COMMAND=sudo @SETCAP@ cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep coolforkit && sudo @SETCAP@ cap_sys_admin=ep coolmount
+SET_CAPS_COMMAND=sudo @SETCAP@ cap_fowner,cap_chown,cap_sys_chroot=ep coolforkit && sudo @SETCAP@ cap_sys_admin=ep coolmount
 else
 SET_CAPS_COMMAND=echo "Skipping capability setting"
 endif
@@ -414,11 +498,12 @@ clean-am: cleanup clean-binPROGRAMS clean-generic clean-libtool clean-local clea
 
 clean-local:
 	$(CLEANUP_COMMAND)
-	if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
-	if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; fi
+	if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@" || echo "WARNING: failed to remove the systemplate"; fi
+	if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@" || echo "WARNING: failed to remove all jails cleanly"; fi
 	rm -rf "${top_srcdir}/loleaflet"
 	rm -rf loolconfig loolconvert loolforkit loolmap loolmount # kill old binaries
-	rm -rf loolwsd loolwsd_fuzzer loolstress loolsocketdump
+	rm -rf loolwsd loolwsd_fuzzer coolwsd_fuzzer loolstress loolsocketdump
+	$(CLEANUP_COVERAGE)
 
 if ENABLE_DEBUG
 # can write to /tmp/coolwsd.log
@@ -434,30 +519,46 @@ setup-wsd: all @JAILS_PATH@
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
 	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
+	@cp $(abs_top_srcdir)/test/data/hello.odg $(abs_top_srcdir)/test/data/hello-world.odg
 	@echo
 
+COMMON_PARAMS = \
+	--o:sys_template_path="@SYSTEMPLATE_PATH@" \
+	--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
+	--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
+	--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
+	--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
+	--o:admin_console.username=admin --o:admin_console.password=admin
+
 run: setup-wsd
-	./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:security.capabilities="$(CAPABILITIES)" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=${OUTPUT_TO_FILE} --o:logging.level=trace \
-			  --o:trace_event[@enable]=true
+	./coolwsd $(COMMON_PARAMS) \
+			--o:security.capabilities="$(CAPABILITIES)" \
+			--o:logging.file[@enable]=${OUTPUT_TO_FILE} --o:logging.level=trace \
+			--o:trace_event[@enable]=true
 
 if ENABLE_DEBUG
 run-one: setup-wsd
-	./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:security.capabilities="$(CAPABILITIES)" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=true --o:logging.level=trace \
-			  --singlekit
+	./coolwsd $(COMMON_PARAMS) \
+			--o:security.capabilities="$(CAPABILITIES)" \
+			--o:logging.file[@enable]=true --o:logging.level=trace \
+			--singlekit
+
+run-inproc: setup-wsd
+	@echo "Launching coolwsd-inproc"
+	./coolwsd-inproc $(COMMON_PARAMS) \
+			--o:logging.file[@enable]=true --o:logging.level=trace
+
+run-massif-inproc: setup-wsd
+	@echo "Launching coolwsd under valgrind for single process"
+	valgrind --tool=massif --num-callers=64 --trace-children=no -v \
+		./coolwsd-inproc $(COMMON_PARAMS) \
+			--o:logging.file[@enable]=false --o:logging.level=trace
+
+run-heaptrack-inproc: setup-wsd
+	@echo "Launching coolwsd under heaptrack for single process"
+	heaptrack \
+		./coolwsd-inproc $(COMMON_PARAMS) \
+			--o:logging.file[@enable]=false --o:logging.level=trace
 endif
 
 sync-writer:
@@ -470,62 +571,37 @@ sync-impress:
 	browser-sync start --config browsersync-config.js --startPath "browser/96c23f663/cool.html?file_path=file://$(abs_top_srcdir)/test/data/hello-world.odp"
 
 run-trace: setup-wsd
-	./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=false --o:logging.level=trace \
-                          --o:trace[@enable]=true --o:trace.path=${builddir}/trace.txt.gz \
-                          --o:trace.outgoing.record=false
+	./coolwsd $(COMMON_PARAMS) \
+			--o:logging.file[@enable]=false --o:logging.level=trace \
+			--o:trace[@enable]=true --o:trace.path=${builddir}/trace.txt.gz \
+			--o:trace.outgoing.record=false
 
 run-valgrind: setup-wsd
 	@echo "Launching coolwsd under valgrind (but not forkit/coolkit, yet)"
 	valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
-		./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=false --o:logging.level=trace
+		./coolwsd $(COMMON_PARAMS) \
+			--o:logging.file[@enable]=false --o:logging.level=trace
 
 run-gdb: setup-wsd
 	@echo "Launching coolwsd under gdb"
 	$(RUN_GDB) \
-		./coolwsd --o:security.capabilities="false" \
-			  --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=false --o:logging.level=error
+		./coolwsd $(COMMON_PARAMS) \
+			--o:security.capabilities="false" \
+			--o:logging.file[@enable]=false --o:logging.level=error
 
 run-callgrind: setup-wsd
 	@echo "Launching coolwsd under valgrind's callgrind"
 	valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no --trace-children=yes \
-		./coolwsd --o:security.capabilities="false" \
-			  --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=false --o:logging.level=error
+		./coolwsd $(COMMON_PARAMS) \
+			--o:security.capabilities="false" \
+			--o:logging.file[@enable]=false --o:logging.level=error
 
 run-strace: setup-wsd
 	@echo "Launching coolwsd under strace"
 	strace -o strace.log -f -tt -s 256 \
-		./coolwsd --o:security.capabilities="false" \
-			  --o:sys_template_path="@SYSTEMPLATE_PATH@" \
-			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
-			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
-			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
-			  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
-			  --o:admin_console.username=admin --o:admin_console.password=admin \
-			  --o:logging.file[@enable]=false --o:logging.level=error
+		./coolwsd $(COMMON_PARAMS) \
+			--o:security.capabilities="false" \
+			--o:logging.file[@enable]=false --o:logging.level=error
 
 else
 
@@ -569,7 +645,7 @@ CLANGXX_COMPILE_FLAGS=clang++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 
 JSON_COMPILE_FLAGS=$(subst ",\",$(subst \,\\,$(CLANGXX_COMPILE_FLAGS)))
 
-JSON_COMPILE_SRC = $(coolwsd_json) $(coolforkit_json) $(shared_json)
+JSON_COMPILE_SRC = $(patsubst %.cpp,%.cmd,$(wildcard **/*.cpp))
 
 $(eval $(call file_targets,$(JSON_COMPILE_SRC)))
 
@@ -593,6 +669,15 @@ compile_commands: $(abs_srcdir)/compile_commands.json
 browser/node_modules: browser/package.json browser/archived-packages
 	@cd browser && npm install
 
+eslint: browser/node_modules
+	@make -C browser eslint
+
+prettier: browser/node_modules
+	@make -C browser prettier
+
+prettier-write: browser/node_modules
+	@make -C browser prettier-write
+
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && \
 	$(LN_S) coolconfig loolconfig && \
@@ -613,3 +698,37 @@ stress:
 		$(stress_file) $(trace_dir)/writer-hello-shape.txt \
 		$(stress_file) $(trace_dir)/writer-quick.txt
 
+if ENABLE_CODE_COVERAGE
+GEN_COVERAGE_COMMAND=mkdir -p ${abs_top_srcdir}/gcov && \
+lcov --no-external --capture --rc 'lcov_excl_line=' --rc 'lcov_excl_br_line=LOG_|TST_|LOK_|WSD_|TRANSITION|assert' \
+--compat libtool=on --directory ${abs_top_srcdir}/. --output-file ${abs_top_srcdir}/gcov/cool.coverage.test.info && \
+genhtml --prefix ${abs_top_srcdir}/. --ignore-errors source ${abs_top_srcdir}/gcov/cool.coverage.test.info \
+--legend --title "${GIT_BRANCH} @ ${GIT_HASH}" --output-directory=${abs_top_srcdir}/gcov/html && \
+echo "Code-Coverage report generated in ${abs_top_srcdir}/gcov/html"
+else
+GEN_COVERAGE_COMMAND=true
+endif
+
+# typically the system nss won't work in a jail and fail to init which is fatal for
+# exporting to pdf, which is something that gets tested
+check-for-system-nss:
+	@if test -e "@LO_PATH@/../config_host.mk"; then \
+		if grep -q SYSTEM_NSS=TRUE "@LO_PATH@/../config_host.mk"; then \
+			echo make check will fail unless core is configured using --without-system-nss; \
+			exit 1; \
+		fi \
+	fi
+
+check-recursive: eslint
+
+check: check-for-system-nss prettier eslint check-recursive
+	$(GEN_COVERAGE_COMMAND)
+
+coverage-report:
+	$(GEN_COVERAGE_COMMAND)
+
+coverage-clean:
+	$(CLEANUP_COVERAGE)
+
+czech: check
+	@echo "This should do something much cooler"

PROBLEMS

@@ -35,13 +35,12 @@
   poll() calls to be without timeout. Or something similar, depending
   on case.
 
-- Recursive mutexes are evil. The last remaining instances should be
-  removed from the Kit/ChildSession.cppp as/when we move to a single
-  threaded Kit process.
-
 - Occasionally Control-C (SIGINT) doesn't shut down coolwsd. One has
   to kill it with SIGKILL. Which of course leaves all the chroot jails
-  around.
+  around. Hitting Control-C a second time will attempt a faster, and
+  ruder, termination of connections, without waiting for a response.
+  A third Control-C will issue SIGKILL, which will kill immediately.
+  To cleanup the jails manually, simply run coolwsd --cleanup.
 
 - There are lots of places where a std::string variable is defined,
   initialised with a value, that is never changed. (In many cases it

README.CONTRIBUTING.md

@@ -34,3 +34,33 @@ Signed-off-by: Random J Developer <random@developer.example.org>
 
 using your real name and the email address (sorry, no pseudonyms
 or anonymous contributions.)
+
+## Other information to put into your commit message
+
+When reviewing a patch, we look for the following information in the commit message:
+
+- Title: a single line, short and to the point summary of what the patch does.
+
+  - The reason is to be able to do `git log --pretty=oneline` and have a usable result.
+
+- Intro: observation of the current state
+
+  - Rationale: the problem to be solved is obvious to you, but not to the reviewer. It's good to
+    have a list of steps to reproduce the problem.
+
+- Problem description: pros and cons of the current state
+
+  - Rationale: when some feature doesn't work the way expected, frequently there is some other
+    use-case that motivated the current behavior. It's easier to not break the old use-case with
+    your change if you're aware of the old use-case.
+
+  - If there was an old use-case and you found it by research, please document it, so the person
+    reading the commit message finds it easily.
+
+- Solution: give orders to the codebase
+
+  - A short description of how you introduce new behavior while not breaking old behavior is useful,
+    because it may not be too obvious just by looking at what you changed.
+
+An alternative is to have much of this information in a (public) issue, refer to that issue and have
+a short commit message. That works better e.g. when using images to demonstrate the problem.

README.FILENOTICES.md

@@ -0,0 +1,32 @@
+# File Notices
+
+For new files created in this repository, please use the following File
+Notices (ie. header in the file describing the Copyright and License):
+
+## C++, JavaScript, TypeScript
+
+```
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+```
+
+## Makefiles, scripts
+
+```
+#
+# Copyright the Collabora Online contributors.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+```

README.md

@@ -1,15 +1,13 @@
-[![Build Status](https://cpci.cbg.collabora.co.uk:8080/view/Tinderbox/job/Tinderbox%20for%20online%20master/badge/icon?subject=master)](https://cpci.cbg.collabora.co.uk:8080/view/Tinderbox/job/Tinderbox%20for%20online%20master/) [![Build Status](https://cpci.cbg.collabora.co.uk:8080/job/Github%20for%20core%20side%20of%20online%20master/badge/icon?subject=GH+core "GitHub core side for online master")](https://cpci.cbg.collabora.co.uk:8080/job/Github%20for%20core%20side%20of%20online%20master/)
-
 <p align="right"><a href="#gitpod"><img alt="Open in Gitpod" src="https://gitpod.io/button/open-in-gitpod.svg"></a></p>
 
 # Collabora Online
-
-[![Master: Pull request policy](https://img.shields.io/badge/Master-PRs%20can%20be%20merge%20without%20approval-42BC00?logoColor=42BC00&logo=git "Main release is still distant. Thanks for your support and contributions! :)")](https://github.com/CollaboraOnline/online/blob/master/CONTRIBUTING.md#contributing-to-source-code)
 <!--
-[![Master: Pull request policy](https://img.shields.io/badge/Master-protected%2C%20PRs%20need%20approval-red?logoColor=lightred&logo=git "Collabora Team is preparing for the next release, therefore 'master' branch is protected now, PRs need 1 review before merging. Thanks for your support and contributions! :)")](https://github.com/CollaboraOnline/online/blob/master/CONTRIBUTING.md#contributing-to-source-code)
+[![Master: Pull request policy](https://img.shields.io/badge/Master-PRs%20can%20be%20merge%20without%20approval-42BC00?logoColor=42BC00&logo=git "Main release is still distant. Thanks for your support and contributions! :)")](https://github.com/CollaboraOnline/online/blob/master/CONTRIBUTING.md#contributing-to-source-code)
 -->
+[![Master: Pull request policy](https://img.shields.io/badge/Master-protected%2C%20PRs%20need%20approval-red?logoColor=lightred&logo=git "Collabora Team is preparing for the next release, therefore 'master' branch is protected now, PRs need 1 review before merging. Thanks for your support and contributions! :)")](https://github.com/CollaboraOnline/online/blob/master/CONTRIBUTING.md#contributing-to-source-code)
 
-[![irc](https://img.shields.io/badge/IRC-%23cool--dev%20on%20libera-orange.svg)](https://web.libera.chat/?channels=cool-dev)
+
+[![Matrix](https://img.shields.io/badge/Matrix-%23cool--dev-turquoise.svg)](https://matrix.to/#/#cool-dev:matrix.org)
 [![Telegram](https://img.shields.io/badge/Telegram-Collabora%20Online-green.svg)](https://t.me/CollaboraOnline)
 [![Forum](https://img.shields.io/badge/Forum-Discourse-blue.svg)](https://forum.collaboraonline.com/)
 [![Website](https://img.shields.io/badge/Website-collaboraonline.github.io-blueviolet.svg)](https://collaboraonline.github.io/)
@@ -17,9 +15,17 @@
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/CollaboraOnline/online)
 
 
-**LibreOffice in the Cloud on your own Terms**
+**Your own private Office in the Cloud**
 
-![](https://raw.githubusercontent.com/CollaboraOnline/CollaboraOnline.github.io/source/static/images/homepage-image.jpg)
+![](https://raw.githubusercontent.com/CollaboraOnline/CollaboraOnline.github.io/master/static/images/homepage-image.png)
+
+
+## Get in touch 💬
+
+* [📋 Forum](https://forum.collaboraonline.com/)
+* [👥 Facebook](https://www.facebook.com/collaboraoffice/)
+* [🐣 𝕏(Twitter)](https://twitter.com/CollaboraOffice)
+* [🐘 Mastodon](https://mastodon.social/@CollaboraOffice)
 
 ## Key features
 * View and edit text documents, spreadsheets, presentations & more
@@ -29,15 +35,17 @@
 
 ## Website
 
-For many more details, build instructions, downloads and more please visit https://collaboraonline.github.io/
+For many more details, build instructions, downloads and more please visit https://collaboraonline.github.io/ and also you can check out the [SDK Documentation](https://sdk.collaboraonline.com/contents.html).
 
 ## Developer assistance
-Please ask your questions on `irc.libera.chat` in our `#cool-dev` channel
+Please ask your questions on any of the bridged Matrix/Telegram rooms
+* Matrix: [#cool-dev:matrix.org](https://matrix.to/#/#cool-dev:matrix.org)
+* Telegram: [CollaboraOnline](https://t.me/CollaboraOnline)
 
 Join the conversation on our Discourse server at https://forum.collaboraonline.com/
 
 Watch the tinderbox status (if it's green) at
-https://cpci.cbg.collabora.co.uk:8080/view/Tinderbox/job/Tinderbox%20for%20online%20master/
+https://cpci.cbg.collabora.co.uk:8080/job/Tinderbox%20for%20online%20master%20against%20co-22.05/
 
 ## Development bits
 
@@ -58,26 +66,21 @@ This project has several components:
 ## Further recommended reading with build details
 
 Please consult the README files in the component's directory for more details:
-- wsd/README
-- browser/README
+- **[wsd/README](wsd)**
+- **[browser/README](browser)**
 
 ## iOS and Android apps
 
 See the corresponding READMEs:
-* **ios/README**
-* **android/README**
+* **[ios/README](ios)**
+* **[android/README](android)**
 
 ## GitPod
 
-Head over to https://collaboraonline.github.io/post/build-code/ select gitpod from the dropdown and follow the steps.
+Head over to https://collaboraonline.github.io/post/build-code/#build-code-on-gitpod and follow the steps.
 
-Interesting things to keep in mind:
-- Make sure your browser is not blocking windows/tabs from opening from the gitpod workspace URL (maybe add `*.gitpod.io` to your browser's whitelist)
-  - The GitPod tasks will run automatically and further instructions will be printed out right in the terminal
-  - VNC tab will open automatically if not just click in the left icon `Remote explorer` and click `6080`. You will see a tab completly black, that's normal.
-  - As mentioned in those instructions if you are not using the VS Code desktop and if you are only relying on your browser please:
-    - Do not try to click the URL from the make run out put instead copy that URL and execute `firefox [paste URL here]`
-    - Head over to the tab where the VNC is opened (black page), you will see Firefox opening there, maximize and have fun.
-    - You can also run cypress tests via GitPod but you will need to use Firefox, for that just prepend `CYPRESS_BROWSER="firefox"` to the desired command. Example: `CYPRESS_BROWSER="firefox" make check` for every test or `CYPRESS_BROWSER="firefox" make check-desktop spec=impress/scrolling_spec.js` for one specific test on desktop
+## Integrating
+
+To [integrate](https://sdk.collaboraonline.com/docs/why_integrate.html) Collabora Online into your own solution, you can see our [step-by-step tutorial](https://sdk.collaboraonline.com/docs/Step_by_step_tutorial.html), view the [available integrations](https://sdk.collaboraonline.com/docs/available_integrations.html), understand the [post message API](https://sdk.collaboraonline.com/docs/postmessage_api.html) used to customize and interact with Collabora Online, and a lot more.
 
 ## Enjoy!

SECURITY.md

@@ -6,10 +6,11 @@ Currently the following Collabora Online versions are supported with security up
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 6.4.x   | :white_check_mark: |
-| 4.2.x   | :white_check_mark: |
-| 4.0.x   | :x: |
-| < 4.0   | :x:                |
+| 24.04.x   | :white_check_mark: |
+| 23.05.x   | :white_check_mark: |
+| 22.05.x   | :white_check_mark: |
+| 21.11.x   | :white_check_mark: |
+| 6.4.x or older  | :x:                |
 
 ## Reporting a Vulnerability
 

THIRDPARTYLICENSES

@@ -0,0 +1,459 @@
+Collabora Online binaries may be statically linked against POCO C++ Libraries.
+
+The POCO C++ Libraries are licensed under the Boost Software License. A very liberal license that encourages both commercial and non-commercial use.
+
+THE BOOST SOFTWARE LICENSE 1.0
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Collabora Online binaries may be statically linked against OpenSSL 3.0 Libraries.
+
+For the OpenSSL 3.0 release, and later releases derived from that, the Apache License v2 applies.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Collabora Online binaries may be statically linked against libpng, the free reference library for reading and writing PNGs.
+
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+ * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2024 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+Collabora Online binaries may be statically linked against Zstandard library.
+
+BSD License
+
+For Zstandard software
+
+Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook, nor Meta, nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Collabora Online client side JavaScript code uses the following 3rd party modules.
+
+Autolinker.js
+Copyright(c) 2020 Gregory Jacobs <greg@greg-jacobs.com>
+MIT License
+
+braintee/sanitize-url
+Copyright (c) 2017 Braintree
+MIT License
+
+Bulma: the modern CSS framework that just works
+Copyright (c) 2023 Jeremy Thomas
+MIT License
+
+fzstd – High performance Zstandard decompression in a pure JavaScript
+Copyright (c) 2020 Arjun Barrett
+MIT License
+
+hammer.js – A javascript library for multi-touch gestures
+Copyright (C) 2011-2017 by Jorik Tangelder (Eight Media)
+MIT License
+
+jQuery JavaScript Library
+Includes Sizzle.js https://sizzlejs.com/
+Copyright JS Foundation and other contributors
+MIT License
+
+jQuery contextMenu - Plugin for simple contextMenu handling
+Copyright (c) 2011-2020 SWIS BV and contributors
+MIT License
+
+jQuery Mousewheel
+Copyright jQuery Foundation and other contributors
+MIT License
+
+jQuery UI
+Copyright jQuery Foundation and other contributors
+MIT License
+
+Leaflet – an open-source JavaScript library for mobile-friendly interactive maps
+Copyright (c) 2010-2015, Vladimir Agafonkin
+Copyright (c) 2010-2011, CloudMade
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ResizeObserverPolyfill.js – A polyfill for the Resize Observer API
+Copyright (c) 2016 Denis Rul
+MIT License
+
+Select2 – The jQuery replacement for select boxes
+Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors
+MIT License
+
+SmartMenus jQuery Plugin
+Copyright Vasil Dinkov, Vadikom Web Ltd.
+MIT License
+
+w2ui – JavaScript UI Library for the Modern Web
+Copyright (C) 2014 (vitmalina@gmail.com)
+MIT License
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Montserraft Regular Font
+Copyright 2011 The Montserrat Project Authors
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+

android/README

@@ -15,6 +15,31 @@ build the native parts on Windows.
 
   Run ./autogen.sh && make
 
+* Build zstd for Android
+
+git clone https://android.googlesource.com/platform/external/zstd/ android-zstd
+cd android-zstd
+mkdir -p install/armeabi-v7a
+cd install/armeabi-v7a
+
+NDK_PATH=~/Android/Sdk/ndk-bundle
+cmake \
+  -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake \
+  -DANDROID_ABI=armeabi-v7a \
+  -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a \
+  -DANDROID_NDK=${NDK_PATH} \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_SYSTEM_NAME=Android \
+  -DCMAKE_SYSTEM_VERSION=21 \
+  ../../build/cmake
+make
+
+* Build zstd for several platforms:
+
+  scripts/build-zstd.sh ~/Android/Sdk/ndk-bundle /opt/libreoffice
+
+This will create a set of folders in install/ that you can configure with.
+
 * Build the POCO for Android
 
   # clone the poco repository in the same folder where LibreOffice core and online folders are placed.
@@ -125,7 +150,7 @@ build the native parts on Windows.
 
   Don't forget to change --with-lo-builddir in the following:
 
-  ./autogen.sh && ./configure CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ --host=arm-linux-androideabi --enable-androidapp --with-lo-builddir=/local/libreoffice/master-android --with-poco-includes=/opt/poco-android/include --with-poco-libs=/opt/poco-android/lib --disable-setcap --enable-silent-rules --enable-debug
+  ./autogen.sh && ./configure CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ --host=arm-linux-androideabi --enable-androidapp --with-lo-builddir=/local/libreoffice/master-android --with-poco-includes=/opt/poco-android/include --with-poco-libs=/opt/poco-android/lib --with-zstd-includes=/opt/libreoffice/android-zstd/lib --with-zstd-libs=/opt/libreoffice/android-zstd/install/armeabi-v7a/lib --disable-setcap --enable-silent-rules --enable-debug
 
 * Build the JavaScript, HTML and CSS files also in the online-android folder
 

android/app/build.gradle.in

@@ -4,13 +4,14 @@ apply plugin: 'com.android.application'
 apply from: 'appSettings.gradle'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     buildDir = "${rootProject.getBuildDir()}/app"
+    ndkVersion "22.1.7171670"
 
     defaultConfig {
         // applicationId, versionCode and versionName are defined in appSettings.gradle
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 33
 
         resValue "string", "app_name", "${liboAppName}"
         resValue "string", "vendor", "${liboVendor}"
@@ -61,21 +62,30 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha04'
-    implementation 'com.google.android.play:core:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.play:core:1.10.3'
 
-    //before changing the version please see https://issuetracker.google.com/issues/111662669
-    implementation 'androidx.preference:preference:1.1.0-alpha01'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation project(path: ':lib')
+
+    // https://stackoverflow.com/questions/75263047/duplicate-class-in-kotlin-android
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }
 
-task copyBrandFiles(type: Copy) {
-	from "${liboBrandingDir}/android"
-	into "src/main/res"
+tasks.register('copyBrandFiles', Copy) {
+    from "${liboBrandingDir}/android"
+    into "src/main/res"
 }
 
 afterEvaluate {

android/app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         <activity
             android:name=".ui.LibreOfficeUIActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|uiMode"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -51,7 +51,8 @@
         <activity
             android:name="org.libreoffice.androidlib.LOActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -93,6 +94,7 @@
                 <data android:mimeType="application/vnd.visio.xml" />
                 <data android:mimeType="application/x-mspublisher" />
                 <data android:mimeType="application/vnd.ms-excel.sheet.binary.macroenabled.12" />
+                <data android:mimeType="application/vnd.ms-excel.sheet.macroenabled.12" />
 
                 <!-- OOXML -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />

android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java

@@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import org.libreoffice.androidapp.ui.LibreOfficeUIActivity;
+import org.libreoffice.androidlib.LOActivity;
 
 public class SettingsActivity extends AppCompatActivity {
 
@@ -86,6 +87,7 @@ public class SettingsActivity extends AppCompatActivity {
                             }
                             AppCompatDelegate.setDefaultNightMode(dayNightMode);
                             prefs.edit().putInt(LibreOfficeUIActivity.NIGHT_MODE_KEY, dayNightMode).commit();
+                            prefs.edit().putInt(LOActivity.NIGHT_MODE_KEY, dayNightMode).commit();
                             getActivity().recreate();
 
                         }

android/app/src/main/java/org/libreoffice/androidapp/ui/FileUtilities.java

@@ -81,6 +81,7 @@ public class FileUtilities {
         // mExtnMap.put(".pps",  IMPRESS);
         mExtnMap.put(".xls",  CALC);
         mExtnMap.put(".xlsb",  CALC);
+        mExtnMap.put(".xlsm",  CALC);
 
         // MS templates
         mExtnMap.put(".dot",  DOC);

android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java

@@ -743,6 +743,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
                 "application/vnd.visio.xml",
                 "application/x-mspublisher",
                 "application/vnd.ms-excel.sheet.binary.macroenabled.12",
+                "application/vnd.ms-excel.sheet.macroenabled.12",
 
                 // OOXML
                 "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
@@ -948,7 +949,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
     @Override
     protected void onStart() {
         super.onStart();
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU && ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             Log.i(LOGTAG, "no permission to read external storage - asking for permission");
             ActivityCompat.requestPermissions(this,
                     new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},

android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java

@@ -73,7 +73,7 @@ class RecentFilesAdapter extends RecyclerView.Adapter<RecentFilesAdapter.ViewHol
         try {
             cursor = activity.getContentResolver().query(uri, null, null, null, null);
             if (cursor != null && cursor.moveToFirst())
-                filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+                filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
         } catch (Exception e) {
             return null;
         } finally {
@@ -94,7 +94,7 @@ class RecentFilesAdapter extends RecyclerView.Adapter<RecentFilesAdapter.ViewHol
         try {
             cursor = activity.getContentResolver().query(uri, null, null, null, null);
             if (cursor != null && cursor.moveToFirst())
-                length = cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE));
+                length = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE));
         } catch (Exception e) {
             return 0;
         } finally {

android/app/src/main/res/layout/file_explorer_grid_item.xml

@@ -37,7 +37,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:ellipsize="end"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:maxLines="2"
             android:textAlignment="center"
             android:textColor="?android:attr/textColorPrimary"
@@ -52,8 +52,8 @@
             android:layout_gravity="center"
             android:contentDescription="@string/file_actions_icon_desc"
             android:scaleType="fitStart"
-            android:tint="?android:attr/textColorPrimary"
-            app:srcCompat="@drawable/ic_more_vert_black_24dp" />
+            app:srcCompat="@drawable/ic_more_vert_black_24dp"
+            app:tint="?android:attr/textColorPrimary" />
     </LinearLayout>
 
 </LinearLayout>

android/app/src/main/res/values-an/strings.xml

@@ -3,7 +3,7 @@
     <string name="action_about">Arredol de</string>
     <string name="title_activity_show_html">Arredol de</string>
     <string name="open">Ubrir</string>
-    <string name="share">Compartir</string>
+    <string name="share">Fer partache</string>
     <string name="title_recents">Fichers recients</string>
     <string name="title_browser">Totz os fichers</string>
     <string name="app_name_settings">Achustes</string>
@@ -24,4 +24,12 @@
     <string name="action_cancel">Cancelar</string>
     <string name="negative_cancel">Cancelar</string>
     <string name="positive_ok">Acceptar</string>
+    <string name="failed_to_load_file">No s\'ha puesto determinar o fichero a cargar</string>
+    <string name="pref_sort_title">Orden d\'os fichers</string>
+    <string name="list_view">Lista</string>
+    <string name="share_via">Fer partache vía</string>
+    <string name="storage_permission_required">Se requiere permiso d\'almacenache</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_az">A-Z</string>
+    <string name="temp_file_saving_disabled">Iste fichero ye solo que de lectura; o alzau ye desactivau.</string>
 </resources>

android/app/src/main/res/values-ar/strings.xml

@@ -28,10 +28,88 @@
     <string name="pref_user_name">اسم المستخدم</string>
     <string name="pref_user_name_info">يُستخدَم عند إضافة تعليق</string>
     <string name="app_version_and_hash">الإصدار: %1$s
-\nتشفير البعثرة لـ غِت online : %2$s
-\nتشفير البعثرة لـ غِت core : %3$s</string>
+\nتشفير البعثرة على الخط من قِت: %2$s
+\nتشفير البعثرة الأساسي من قِت: %3$s</string>
     <string name="app_description">$APP_NAME هو حزمة إنتاجية حديثة سهلة الإستخدام لمعالجة الكلمات والأوراق الممتدة والعروض التقديمية والمزيد.</string>
     <string name="no_items">لا عناصر</string>
     <string name="pref_sort_summary">حدد كيفية تنظيم الملفات: أبجديا أو بالحجم أو بالتأريخ.</string>
     <string name="pref_user_name_guest">مستخدم ضيف</string>
+    <string name="filter_documents">المستندات</string>
+    <string name="default_document_name">بلا عنوان</string>
+    <string name="new_textdocument">مستند نصي جديد</string>
+    <string name="sort_largest">الأكبر أولا</string>
+    <string name="title_browser">جميع الملفات</string>
+    <string name="new_presentation">عرض تقديمي جديد</string>
+    <string name="sort">ترتيب حسب</string>
+    <string name="sort_newest">الأحدث أولاً</string>
+    <string name="open">افتح</string>
+    <string name="share">شارك</string>
+    <string name="about_moreinfo">مزيد من المعلومات</string>
+    <string name="new_spreadsheet">جدول بيانات جديد</string>
+    <string name="filter">فلترة بحسب</string>
+    <string name="sort_oldest">الأقدم أولا</string>
+    <string name="title_recents">الملفات الحديثة</string>
+    <string name="sort_smallest">الأصغر أولاً</string>
+    <string name="file_icon_desc">أيقونة الملف</string>
+    <string name="action_about">عن</string>
+    <string name="action_settings">اﻹعدادات</string>
+    <string name="share_via">شارك عبر</string>
+    <string name="remove_from_list">إزالة من القائمة</string>
+    <string name="filter_presentations">العروض التقديمية</string>
+    <string name="document_locations">مواقع المستندات</string>
+    <string name="local_file_system">نظام الملفات المحلي</string>
+    <string name="external_sd_file_system">بطاقة SD خارجية</string>
+    <string name="action_create">إنشاء</string>
+    <string name="title_activity_show_html">عنْ</string>
+    <string name="remote_server">الخادم عن بُعد</string>
+    <string name="theme">السِّمة</string>
+    <string name="choose_theme">اختر حُلّة</string>
+    <string name="filter_spreadsheets">جداول البيانات</string>
+    <string name="share_document">مُشارَكة المستنَد</string>
+    <string name="about_notice">عرض الملاحظة</string>
+    <string name="sort_az">من الألف إلى الياء</string>
+    <string name="sort_za">من الياء إلى الألف</string>
+    <string name="file_actions_icon_desc">إجراءات الملفات</string>
+    <string name="filter_everything">الكل</string>
+    <string name="close_document_locations">إغلاق مواقع المستندات</string>
+    <string name="local_documents">دليل المستندات</string>
+    <string name="otg_file_system">ذاكرة فلاش OTG (تجريبي)</string>
+    <string name="usb_connected_configure">الـ USB موصول. قم بتهيئة جهازك.</string>
+    <string name="owncloud_unauthorized">يتعذّر التسجيل في الخادوم السحابي. تحقّق من إعداداتك.</string>
+    <string name="owncloud_wrong_connection">يتعذر الاتصال بالخادوم السحابي. تحقَّق من الإعدادات.</string>
+    <string name="owncloud_unspecified_error">حدث خطأ غير محدد عند محاولة الاتصال بالخادوم السحابي. تحقّق من إعداداتك أو حاول مجدداً لاحقاً.</string>
+    <string name="ext_document_provider_error">الملف الجذري غير صحيح. تحقق من إعداداتك لبطاقة sd.</string>
+    <string name="otg_missing_error">الملف الجذري غير صحيح. تحقَّق من الجهاز OTG أو من إعداداتك.</string>
+    <string name="server_url">عنوان URL للخادوم</string>
+    <string name="server_url_and_port">عنوان URL و رقم بوابة الخادوم السحابي.</string>
+    <string name="user_name">اسم المستخدِم</string>
+    <string name="password">كلمة المرور</string>
+    <string name="up_description">الدليل الأب</string>
+    <string name="cancel_label">إلغاء</string>
+    <string name="search_label">إذهب إلى</string>
+    <string name="directory_browser_label">إختَر الدليل</string>
+    <string name="enter_filename">من فضلك، أدخِل اسم الملف:</string>
+    <string name="action_overwrite">استبدال</string>
+    <string name="directory_not_saved">لم يتم حفظ الدليل.</string>
+    <string name="theme_dark">داكن</string>
+    <string name="theme_system_default">افتراضية النظام</string>
+    <string name="theme_light">فاتح</string>
+    <string name="positive_ok">تمام</string>
+    <string name="owncloud_settings">إعدادات الخادوم السحابي</string>
+    <string name="physical_storage_settings">إعدادات عتاد التخزين</string>
+    <string name="external_sd_path">مسار وحدة SD خارجية</string>
+    <string name="otg_warning">خاضِّية تجريبية: تستعمل فقط في حالة كان جهاز OTG قابل للكتابة عليه.</string>
+    <string name="bad_directory">مسار الدليل غير صحيح</string>
+    <string name="current_dir">الدليل الحالي: %1$s</string>
+    <string name="title_permission_required">الإذن مطلوب</string>
+    <string name="reason_required_to_read_documents">إذن التخزين مطلوب لقراءة هذه المستندات.</string>
+    <string name="create_new_document_title">إنشاء مستند جديد</string>
+    <string name="unable_to_go_further">يتعذّر الاستمرار.</string>
+    <string name="bmp_null">ملف الصورة Bmp فارغ!!</string>
+    <string name="storage_provider_settings">إعدادات مزود خدمة التخزين</string>
+    <string name="otg_device_path">مسار جهاز OTG</string>
+    <string name="confirm_label">تأكيد</string>
+    <string name="negative_im_sure">أنا متأكد</string>
+    <string name="negative_cancel">إلغاء</string>
+    <string name="action_cancel">إلغاء</string>
 </resources>

android/app/src/main/res/values-ast/strings.xml

@@ -88,9 +88,12 @@
     <string name="server_url">URL del sirvidor</string>
     <string name="external_sd_path">Camín a SD esterna</string>
     <string name="pref_user_name_guest">Usuariu invitáu</string>
-    <string name="pref_user_name_info">Utilízase al engadir comentarios</string>
+    <string name="pref_user_name_info">Utilízase al amestar comentarios</string>
     <string name="pref_user_name">Nome d\'usuariu</string>
     <string name="owncloud_settings">Axustes del sirvidor na nube</string>
     <string name="password">Conseña</string>
     <string name="physical_storage_settings">Axustes d\'almacenamientu físicu</string>
+    <string name="storage_provider_settings">Axustes del fornidor d\'almacenamientu</string>
+    <string name="theme_dark">Escuru</string>
+    <string name="choose_theme">Escueyi\'l tema</string>
 </resources>

android/app/src/main/res/values-b+be+Latn/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

android/app/src/main/res/values-ca/strings.xml

@@ -5,7 +5,7 @@
     <string name="current_dir">Directori actual: %1$s</string>
     <string name="bad_directory">El camí del directori no és vàlid</string>
     <string name="directory_browser_label">Trieu un directori</string>
-    <string name="search_label">Vés-hi</string>
+    <string name="search_label">Ves-hi</string>
     <string name="cancel_label">Cancel·la</string>
     <string name="confirm_label">Confirma</string>
     <string name="password">Contrasenya</string>
@@ -29,7 +29,7 @@
     <string name="document_locations">Ubicacions dels documents</string>
     <string name="title_activity_show_html">Quant a</string>
     <string name="directory_not_saved">No s\'ha desat el directori.</string>
-    <string name="bmp_null">El BMP és nul!</string>
+    <string name="bmp_null">El BMP no és vàlid.</string>
     <string name="unable_to_go_further">No és possible anar més enllà.</string>
     <string name="action_overwrite">Sobreescriu</string>
     <string name="action_create">Crea</string>

android/app/src/main/res/values-cy/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="owncloud_wrong_connection">Methu cysylltu a\'r gweinydd cwmwl. Gwiriwch eich ffurfweddiad.</string>
-    <string name="usb_connected_configure">USB wedi\'i gysylltu, ffurfweddwch eich dyfais</string>
+    <string name="usb_connected_configure">USB wedi\'i gysylltu, ffurfweddwch eich dyfais.</string>
     <string name="remote_server">Gweinydd pell</string>
     <string name="otg_file_system">Dyfais OTG (arbrofol)</string>
     <string name="external_sd_file_system">SD allanol</string>
@@ -38,19 +38,19 @@
     <string name="about_license">Dangos y Drwydded</string>
     <string name="pref_show_debug_info_summary">Galluogi i ddangos manylion dadfygio mewn darllenydd dogfennau</string>
     <string name="pref_show_debug_info">Dangos Manylion Dadfygio</string>
-    <string name="pref_filter_summary">Gosod pa hidl ffeiliau ddylai gael eu defnyddio drwy ragosodiad</string>
+    <string name="pref_filter_summary">Gosod pa hidl ffeiliau ddylai gael eu defnyddio drwy ragosodiad.</string>
     <string name="pref_filter_title">Hidl Ffeiliau Rhagosodedig</string>
     <string name="pref_sort_title">Trefn Ffeiliau</string>
     <string name="pref_file_explorer_title">Cynllun rheolwr ffeiliau</string>
-    <string name="pref_viewmode_summary">Gweld ffeiliau fel grid neu mewn rhestr</string>
-    <string name="pref_sort_summary">Dewiswch sut i drefnu ffeiliau: A-Z, yn ôl maint neu ddyddiad</string>
+    <string name="pref_viewmode_summary">Gweld ffeiliau fel grid neu mewn rhestr.</string>
+    <string name="pref_sort_summary">Dewiswch sut i drefnu ffeiliau: A-Z, yn ôl maint neu ddyddiad.</string>
     <string name="pref_show_hidden_files_summary">Galluogwch i ddangos ffeiliau/ffolderi cudd</string>
     <string name="pref_show_hidden_files">Ffeiliau/Ffolderi Cudd</string>
     <string name="pref_category_explorer">Gosodiadau Rheolwr Ffeiliau</string>
     <string name="grid_view">Grid</string>
     <string name="list_view">Rhestr</string>
     <string name="failed_to_load_file">Methwyd penderfynu pa ffeil i\'w chadw</string>
-    <string name="storage_permission_required">Mae angen caniatâd cadw.</string>
+    <string name="storage_permission_required">Mae angen caniatâd cadw</string>
     <string name="file_creation_failed">Methodd creu\'r ffeil</string>
     <string name="file_exists_warning">Mae ffeil o\'r enw yna\'n bodoli eisoes, a bydd yn cael ei thros ysgrifennu.</string>
     <string name="temp_file_saving_disabled">Darllen yn unig yw\'r ffeil hon, mae cadw wedi ei analluogi.</string>
@@ -62,8 +62,8 @@
     <string name="app_name_settings">Gosodiadau</string>
     <string name="owncloud_unauthorized">Methu mewngofnodi i\'r gweinydd cwmwl. Gwiriwch eich ffurfweddiad.</string>
     <string name="title_activity_show_html">Ynghylch</string>
-    <string name="directory_not_saved">Heb gadw\'r cyfeiriadur</string>
-    <string name="bmp_null">Mae bmp yn nwll</string>
+    <string name="directory_not_saved">Heb gadw\'r cyfeiriadur.</string>
+    <string name="bmp_null">Mae bmp yn nwl!</string>
     <string name="unable_to_go_further">Methu mynd ymhellach.</string>
     <string name="share_document">Rhannu Dogfen</string>
     <string name="loading">Llwytho...</string>
@@ -77,7 +77,7 @@
     <string name="positive_ok">Iawn</string>
     <string name="reason_required_to_read_documents">Mae angen caniatâd ar gyfer darllen eich dogfennau.</string>
     <string name="title_permission_required">Mae Angen Caniatâd</string>
-    <string name="current_dir">"Cyfeiriadur Cyfredol:  %1$s"</string>
+    <string name="current_dir">Cyfeiriadur Cyfredol: %1$s</string>
     <string name="bad_directory">Llwybr cyfeiriadur annilys</string>
     <string name="directory_browser_label">Dewis Gyfeiriadur</string>
     <string name="search_label">Mynd</string>
@@ -86,9 +86,9 @@
     <string name="up_description">Llinynnau porwr cyfeiriadur</string>
     <string name="password">Cyfrinair</string>
     <string name="user_name">Enw defnyddiwr</string>
-    <string name="server_url_and_port">URL a phorth y gweinydd cwmwl</string>
+    <string name="server_url_and_port">URL a phorth y gweinydd cwmwl.</string>
     <string name="server_url">URL y gweinydd</string>
-    <string name="otg_warning">Nodwedd arbrofol: Defnyddiwch yn unig os yw\'r ddyfais OTG yn ysgrifenadwy</string>
+    <string name="otg_warning">Nodwedd Arbrofol: Defnyddiwch yn unig os yw\'r ddyfais OTG yn ysgrifenadwy.</string>
     <string name="otg_device_path">Llwybr dyfais OTG</string>
     <string name="external_sd_path">Llwybr SD allanol</string>
     <string name="physical_storage_settings">Gosodiadau offer storio</string>
@@ -110,4 +110,7 @@
     <string name="theme_system_default">Rhagosodiad y system</string>
     <string name="choose_theme">Dewis thema</string>
     <string name="theme">Thema</string>
+    <string name="pref_user_name">Enw Defnyddiwr</string>
+    <string name="pref_user_name_info">Yn cael ei ddefnyddio wrth ychwanegu sylw</string>
+    <string name="pref_user_name_guest">Defnyddiwr Gwadd</string>
 </resources>

android/app/src/main/res/values-da/strings.xml

@@ -46,7 +46,7 @@
     <string name="pref_filter_title">Standard fil-filter</string>
     <string name="pref_sort_title">Fil-rækkefølge</string>
     <string name="owncloud_unauthorized">Kan ikke logge ind på cloud-serveren. Tjek din konfiguration.</string>
-    <string name="owncloud_unspecified_error">"Uspecificeret fejl ved forbindelse til  cloud-serveren. Tjek din konfiguration og/eller prøv senere."</string>
+    <string name="owncloud_unspecified_error">Uspecificeret fejl ved forbindelse til cloud-serveren. Tjek din konfiguration og/eller prøv senere.</string>
     <string name="server_url_and_port">Cloudserverens URL og port.</string>
     <string name="server_url">Serverens URL</string>
     <string name="owncloud_settings">Cloudserver-indstillinger</string>
@@ -85,11 +85,11 @@
 \nonline git-hash: %2$s
 \ncore git-hash: %3$s</string>
     <string name="loading">Indlæser…</string>
-    <string name="current_dir">Aktuel mappe: % 1$s</string>
+    <string name="current_dir">Aktuel mappe: %1$s</string>
     <string name="bad_directory">Ugyldig stil til mappe</string>
     <string name="directory_browser_label">Vælg mappe</string>
     <string name="search_label">Kør</string>
-    <string name="otg_warning">Eksperimentel funktionalitet: Anvend kun, hvis der kan kan skrives på OTG-enheden.</string>
+    <string name="otg_warning">Eksperimentel funktionalitet: Anvend kun, hvis der kan skrives på OTG-enheden.</string>
     <string name="external_sd_path">Sti til SD-kort</string>
     <string name="physical_storage_settings">Indstillinger for fysisk lager</string>
     <string name="storage_provider_settings">Indstillinger for lagerleverandør</string>
@@ -104,4 +104,12 @@
     <string name="pref_category_editor">Redigeringsindstillinger</string>
     <string name="pref_category_explorer">Filmanager-indstillinger</string>
     <string name="grid_view">Gitter</string>
+    <string name="pref_user_name">Brugernavn</string>
+    <string name="pref_user_name_info">Bruges ved tilføjelse af en kommentar</string>
+    <string name="theme_system_default">Systemstandard</string>
+    <string name="theme_dark">Mørkt</string>
+    <string name="theme_light">Lyst</string>
+    <string name="pref_user_name_guest">Gæstebruger</string>
+    <string name="theme">Tema</string>
+    <string name="choose_theme">Vælg tema</string>
 </resources>

android/app/src/main/res/values-en-rGB/strings.xml

@@ -98,7 +98,7 @@
     <string name="sort_largest">Largest first</string>
     <string name="sort_smallest">Smallest first</string>
     <string name="sort">Sort by</string>
-    <string name="filter">Filter by</string>
+    <string name="filter">Filter byy</string>
     <string name="pref_category_editor">Editor Settings</string>
     <string name="remove_from_list">Remove from the list</string>
     <string name="file_actions_icon_desc">File actions</string>

android/app/src/main/res/values-fa/strings.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name_settings">تنظیمات</string>
+    <string name="app_version_and_hash">نسخه: %1$s
+\nبرخط git-hash: %2$s
+\nهسته git-hash: %3$s</string>
+    <string name="app_description">$APP_NAME یک محصول کامل و مدرن و متن باز با کاربری آسان برای واژه پردازی، صفحات گسترده، ارائه ها و... است.</string>
+    <string name="app_vendor">این انتشار توسط $VENDOR فراهم شده است.</string>
+    <string name="no_recent_items">لطفا یک پرونده را با استفاده از آیکون پوشه از نوارابزار باز کنید.</string>
+    <string name="no_items">هیچ مورد</string>
+    <string name="temp_file_saving_disabled">این فایل فقط برای خواندن است، ذخیره غیر فعال شده است.</string>
+    <string name="file_exists_warning">فایلی با این نام موجود میباشد و (فایل شما)دوباره روی فایل موجود باز نویسی میشود.</string>
+    <string name="file_creation_failed">ساخت فایل ناموفق بود</string>
+    <string name="storage_permission_required">دسترسی به حافظه لازم است</string>
+    <string name="failed_to_load_file">تعیین کردن فایل برای خوانش فایل ناموفق بود</string>
+    <string name="list_view">لیست</string>
+    <string name="grid_view">توری</string>
+    <string name="pref_category_explorer">تنظیمات مدیر پرونده</string>
+    <string name="pref_category_editor">تنظیمات ویرایشگر</string>
+    <string name="pref_show_hidden_files">پرونده‌ها/پوشه‌های پنهان</string>
+    <string name="pref_show_hidden_files_summary">فعال کردن برای نمایش پرونده‌ها/پوشه‌های پنهان</string>
+    <string name="pref_sort_summary">انتخاب نحوه مرتب سازی: الفبایی، بر اساس اندازه یا براساس تاریخ.</string>
+    <string name="pref_viewmode_summary">نمایش پرونده‌ها به صورت فهرستی یا کنار هم.</string>
+    <string name="pref_file_explorer_title">چیدمان مدیر پرونده</string>
+    <string name="pref_sort_title">مرتب سازی پرونده</string>
+    <string name="pref_filter_title">غربال پیش‌فرض پرونده</string>
+</resources>

android/app/src/main/res/values-gl/strings.xml

@@ -106,4 +106,11 @@
 \nIdentificador da versión no repositorio Git «online»: %2$s
 \nIdentificador da versión no repositorio Git «core»: %3$s</string>
     <string name="pref_user_name">Nome de usuario</string>
+    <string name="theme">Tema</string>
+    <string name="choose_theme">Escolla o tema</string>
+    <string name="pref_user_name_guest">Usuario convidado</string>
+    <string name="theme_light">Claro</string>
+    <string name="pref_user_name_info">Úsase ao engadir un comentario</string>
+    <string name="theme_system_default">Valor predefinido do sistema</string>
+    <string name="theme_dark">Escuro</string>
 </resources>

android/app/src/main/res/values-hr/strings.xml

@@ -25,25 +25,25 @@
     <string name="app_version">Verzija: %1$s, ID gradnje: %2$s</string>
     <string name="app_description">$APP_NAME je moderan softverski paket otvorenog koda s modernim programima za obradu teksta, proračunskih tablica, prezentacija i još mnogo toga.</string>
     <string name="app_vendor">Proizvođač izdanja je $VENDOR.</string>
-    <string name="no_items">Nema elemenata</string>
+    <string name="no_items">Nema stavki</string>
     <string name="temp_file_saving_disabled">Datoteka je zaštićena, spremanje je deaktivirano.</string>
     <string name="file_exists_warning">Datoteka s tim imenom već postoji, biti će prepisana.</string>
     <string name="file_creation_failed">Neuspjelo stvaranje datoteke</string>
     <string name="storage_permission_required">Potrebna je dozvola za spremište</string>
     <string name="failed_to_load_file">Neuspjelo određivanje datoteke za učitavanje</string>
     <string name="list_view">Popis</string>
-    <string name="grid_view">Ikone</string>
+    <string name="grid_view">Mreža</string>
     <string name="pref_category_explorer">Postavke upravljača datoteka</string>
     <string name="pref_show_hidden_files">Skrivene datoteke i mape</string>
     <string name="pref_show_hidden_files_summary">Aktiviraj prikaz skrivenih datoteka i mapa</string>
     <string name="pref_sort_summary">Odaberi redoslijed datoteka: A-Z, po veličini ili po datumu.</string>
-    <string name="pref_viewmode_summary">Prikaži pločasti prikaz ili popis.</string>
-    <string name="pref_file_explorer_title">Prikaz u upravljaču datoteka</string>
+    <string name="pref_viewmode_summary">Prikaži datoteke kao mrežu ili kao popis.</string>
+    <string name="pref_file_explorer_title">Raspored upravljača datoteka</string>
     <string name="pref_sort_title">Redoslijed datoteka</string>
     <string name="pref_filter_title">Standardno filtriranje datoteka</string>
     <string name="pref_filter_summary">Postavi standardno filtriranje datoteka.</string>
     <string name="pref_show_debug_info">Prikaži podatke otklanjanje grešaka</string>
-    <string name="pref_show_debug_info_summary">Aktiviraj za prikaz podataka otklanjanje grešaka u dokumentu</string>
+    <string name="pref_show_debug_info_summary">Aktiviraj za prikaz informacija o otklanjanju grešaka u prikazivaču dokumenata</string>
     <string name="sort">Redoslijed</string>
     <string name="action_settings">Postavke</string>
     <string name="open">Otvori</string>
@@ -52,7 +52,7 @@
     <string name="close_document_locations">Zatvori lokacije dokumenata</string>
     <string name="local_documents">Mapa dokumenata</string>
     <string name="local_file_system">Lokalni datotečni sustav</string>
-    <string name="external_sd_file_system">Vanjska SD kartica</string>
+    <string name="external_sd_file_system">Eksterna SD kartica</string>
     <string name="otg_file_system">OTG uređaj (eksperimentalno)</string>
     <string name="remote_server">Udaljeni poslužitelju</string>
     <string name="usb_connected_configure">USB povezan, konfiguriraj uređaj.</string>
@@ -63,7 +63,7 @@
     <string name="otg_missing_error">Nevažeća root datoteka. Provjeri OTG uređaj i/ili konfiguraciju.</string>
     <string name="owncloud_settings">Postavke poslužitelja oblaka</string>
     <string name="physical_storage_settings">Postavke fizičkog spremišta</string>
-    <string name="external_sd_path">Staza vanjske SD kartice</string>
+    <string name="external_sd_path">Staza eksterne SD kartice</string>
     <string name="otg_device_path">Staza OTG uređaja</string>
     <string name="otg_warning">Eksperimentalna funkcija: koristi samo, ako je na OTG uređaju dozvoljeno pisanje.</string>
     <string name="server_url">URL poslužitelja</string>

android/app/src/main/res/values-ia/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name_settings">Parametros</string>
+    <string name="app_vendor">Iste version es fornite per $VENDOR.</string>
+    <string name="no_items">Necun elementos</string>
+    <string name="storage_permission_required">Es requirite un permission de immagazinage</string>
+    <string name="pref_show_hidden_files_summary">Activar pro monstrar files/dossieres celate</string>
+    <string name="title_activity_show_html">A proposito de</string>
+    <string name="theme">Thema</string>
+    <string name="choose_theme">Selige un thema</string>
+    <string name="theme_system_default">Predefinite del systema</string>
+    <string name="theme_dark">Obscur</string>
+    <string name="theme_light">Clar</string>
+    <string name="file_creation_failed">Falleva le creation del file</string>
+    <string name="pref_category_explorer">Parametros del gestor de files</string>
+    <string name="pref_show_hidden_files">Files/dossieres celate</string>
+    <string name="pref_viewmode_summary">Monstrar le files como grillia o in un lista.</string>
+    <string name="list_view">Lista</string>
+    <string name="grid_view">Grillia</string>
+</resources>

android/app/src/main/res/values-ja/strings.xml

@@ -60,4 +60,57 @@
     <string name="about_notice">お知らせを表示</string>
     <string name="owncloud_unauthorized">クラウドサーバーにログインできません。設定を確認してください。</string>
     <string name="owncloud_wrong_connection">クラウドサーバーに接続できません。設定を確認してください。</string>
+    <string name="pref_category_editor">エディタの設定</string>
+    <string name="file_exists_warning">この名前のファイルが既に存在するので、上書きされます.</string>
+    <string name="pref_show_hidden_files">ファイル/フォルダを隠す</string>
+    <string name="pref_filter_title">標準フィルター</string>
+    <string name="file_icon_desc">ファイルアイコン</string>
+    <string name="file_actions_icon_desc">ファイルアクション</string>
+    <string name="pref_user_name">ユーザー名</string>
+    <string name="default_document_name">名称未設定</string>
+    <string name="pref_user_name_guest">ゲストユーザー</string>
+    <string name="sort">ソート</string>
+    <string name="filter">フィルター</string>
+    <string name="share">共有</string>
+    <string name="document_locations">ドキュメントの場所</string>
+    <string name="close_document_locations">ドキュメントの場所を閉じる</string>
+    <string name="local_file_system">ローカルファイルシステム</string>
+    <string name="remove_from_list">リストから削除する</string>
+    <string name="share_via">共有法</string>
+    <string name="failed_to_load_file">ファイルの読み込み先が特定できませんでした</string>
+    <string name="pref_show_debug_info_summary">ドキュメント ビューアでのデバッグ情報の表示を有効にする</string>
+    <string name="pref_enable_chrome_debugger">Chromeデバッグ</string>
+    <string name="pref_enable_chrome_debugger_info">ドキュメント内で Chrome のデバッグ ツールを有効にします</string>
+    <string name="owncloud_unspecified_error">クラウドサーバーへの接続時に不明なエラーが発生しました。設定を確認し、後で再試行してください。</string>
+    <string name="ext_document_provider_error">無効なルート ファイルです。 SDカードの設定を確認してください。</string>
+    <string name="otg_missing_error">無効なルートファルです。OTGデバイスを確認、または設定を確認してください。</string>
+    <string name="storage_provider_settings">ストレージプロバイダーの設定</string>
+    <string name="owncloud_settings">クラウドサーバーの設定</string>
+    <string name="search_label">Go</string>
+    <string name="title_permission_required">許可が必要です</string>
+    <string name="negative_im_sure">確定</string>
+    <string name="pref_user_name_info">コメントを追加する際に使用します</string>
+    <string name="external_sd_file_system">外部SD</string>
+    <string name="otg_file_system">OTG デバイス (実験的)</string>
+    <string name="physical_storage_settings">物理ストレージ設定</string>
+    <string name="external_sd_path">外部SDパス</string>
+    <string name="otg_device_path">OTG デバイスのパス</string>
+    <string name="otg_warning">実験的な機能：OTGデバイスが書き込み可能な場合にのみ使用してください。</string>
+    <string name="server_url">Server URL</string>
+    <string name="unable_to_go_further">これ以上先に進むことはできません。</string>
+    <string name="bmp_null">Bmpはnullです！</string>
+    <string name="directory_not_saved">ディレクトリが保存されていません。</string>
+    <string name="title_activity_show_html">について</string>
+    <string name="choose_theme">テーマを選択してください</string>
+    <string name="theme_system_default">システムデフォルト</string>
+    <string name="theme_light">ライト</string>
+    <string name="pref_sort_summary">ファイルの並べ替え方法を選択します: A ～ Z、サイズ順、または日付順。</string>
+    <string name="remote_server">リモートサーバー</string>
+    <string name="usb_connected_configure">USB が接続されているので、デバイスを設定します。</string>
+    <string name="theme_dark">ダーク</string>
+    <string name="pref_filter_summary">デフォルトで使用するファイル フィルタを設定します。</string>
+    <string name="server_url_and_port">クラウドサーバーのURLとポート。</string>
+    <string name="bad_directory">無効なディレクトリパス</string>
+    <string name="reason_required_to_read_documents">ドキュメントを読み取るためにはストレージの許可が必要です。</string>
+    <string name="local_documents">ドキュメントディレクトリ</string>
 </resources>

android/app/src/main/res/values-ko/strings.xml

@@ -14,13 +14,103 @@
 \n핵심 git-hash : %3$s</string>
     <string name="pref_file_explorer_title">파일 관리자 레이아웃</string>
     <string name="pref_viewmode_summary">파일을 그리드 또는 리스트로 봅니다.</string>
-    <string name="pref_sort_summary">파일을 불러올 방법을 선택 하십시오 : A-Z, 크기 또는 날짜</string>
+    <string name="pref_sort_summary">파일 순서 지정 방법 선택하기: A-Z, 크기 또는 날짜순으로.</string>
     <string name="pref_show_hidden_files_summary">숨겨진 파일/폴더 표시 가능</string>
     <string name="pref_show_hidden_files">숨겨진 파일/폴더</string>
     <string name="pref_category_explorer">파일 관리자 설정</string>
     <string name="grid_view">그리드</string>
-    <string name="failed_to_load_file">로드할 파일을 결정하지 못하였습니다</string>
+    <string name="failed_to_load_file">불러올 파일을 결정하지 못하였습니다</string>
     <string name="storage_permission_required">저장 권한이 필요합니다</string>
     <string name="pref_category_editor">편집기 설정</string>
     <string name="list_view">목록</string>
+    <string name="pref_enable_chrome_debugger">크롬 디버깅</string>
+    <string name="pref_enable_chrome_debugger_info">문서에서 Chrome의 디버깅 도구를 사용하도록 활성화하기</string>
+    <string name="about_license">라이선스 표시하기</string>
+    <string name="sort_smallest">가장 작은 것부터</string>
+    <string name="sort_largest">가장 큰 것부터</string>
+    <string name="reason_required_to_read_documents">문서를 읽으려면 저장 권한이 필요합니다.</string>
+    <string name="positive_ok">확인</string>
+    <string name="negative_im_sure">확실합니다</string>
+    <string name="action_cancel">취소하기</string>
+    <string name="create_new_document_title">새 문서 만들기</string>
+    <string name="unable_to_go_further">더 이상 진행할 수 없습니다.</string>
+    <string name="bmp_null">Bmp는 null입니다!</string>
+    <string name="title_activity_show_html">정보</string>
+    <string name="theme">테마</string>
+    <string name="pref_user_name">사용자 이름</string>
+    <string name="pref_user_name_info">주석을 추가할 때 사용됨</string>
+    <string name="pref_user_name_guest">게스트 사용자</string>
+    <string name="about_notice">공지사항 표시하기</string>
+    <string name="new_presentation">새 프레젠테이션</string>
+    <string name="default_document_name">제목없음</string>
+    <string name="filter">필터링 기준</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">가장 오래된 것부터</string>
+    <string name="sort_newest">가장 최근된 것부터</string>
+    <string name="file_icon_desc">파일 아이콘</string>
+    <string name="file_actions_icon_desc">파일 작업</string>
+    <string name="title_recents">최근 파일</string>
+    <string name="title_browser">모든 파일</string>
+    <string name="action_about">정보</string>
+    <string name="action_settings">설정</string>
+    <string name="remove_from_list">목록에서 제거하기</string>
+    <string name="share_via">공유 방법</string>
+    <string name="filter_everything">모두</string>
+    <string name="filter_documents">문서</string>
+    <string name="filter_spreadsheets">스프레드시트</string>
+    <string name="remote_server">원격 서버</string>
+    <string name="usb_connected_configure">USB가 연결되고, 장치를 구성합니다.</string>
+    <string name="owncloud_wrong_connection">클라우드 서버에 연결할 수 없습니다. 구성을 확인하십시오.</string>
+    <string name="owncloud_unauthorized">클라우드 서버에 로그인할 수 없습니다. 구성을 확인하십시오.</string>
+    <string name="owncloud_unspecified_error">클라우드 서버에 연결하는 동안 지정되지 않은 오류가 발생했습니다. 구성을 확인하거나 나중에 시도하십시오.</string>
+    <string name="ext_document_provider_error">잘못된 루트 파일입니다. SD 카드 구성을 확인하십시오.</string>
+    <string name="otg_missing_error">잘못된 루트 파일입니다. OTG 장치 및/또는 구성을 확인하십시오.</string>
+    <string name="storage_provider_settings">스토리지 제공업체 설정</string>
+    <string name="owncloud_settings">클라우드 서버 설정</string>
+    <string name="physical_storage_settings">물리적 스토리지 설정</string>
+    <string name="external_sd_path">외부 SD 경로</string>
+    <string name="otg_device_path">OTG 장치 경로</string>
+    <string name="otg_warning">실험 기능: OTG 장치가 쓰기 가능한 경우에만 사용합니다.</string>
+    <string name="server_url">서버 URL</string>
+    <string name="server_url_and_port">클라우드 서버의 URL 및 포트입니다.</string>
+    <string name="user_name">사용자 이름</string>
+    <string name="password">암호</string>
+    <string name="up_description">상위 디렉터리로</string>
+    <string name="current_dir">현재 디렉터리: %1$s</string>
+    <string name="title_permission_required">권한 필요</string>
+    <string name="enter_filename">파일 이름을 입력하십시오:</string>
+    <string name="action_create">만들기</string>
+    <string name="action_overwrite">덮어쓸</string>
+    <string name="loading">불러오는 중...</string>
+    <string name="share_document">문서 공유하기</string>
+    <string name="directory_not_saved">디렉터리가 저장되지 않았습니다.</string>
+    <string name="choose_theme">테마 고르기</string>
+    <string name="theme_system_default">시스템 기본값</string>
+    <string name="theme_dark">어두운 테마</string>
+    <string name="pref_filter_title">기본 파일 필터</string>
+    <string name="pref_sort_title">파일 순서</string>
+    <string name="pref_filter_summary">기본적으로 사용할 파일 필터를 설정합니다.</string>
+    <string name="pref_show_debug_info">디버그 정보 표시하기</string>
+    <string name="close_document_locations">문서 위치 닫기</string>
+    <string name="otg_file_system">OTG 장치 (실험용)</string>
+    <string name="pref_show_debug_info_summary">문서 뷰어에서 디버그 정보 표시 활성화하기</string>
+    <string name="local_file_system">로컬 파일 시스템</string>
+    <string name="external_sd_file_system">외부 SD</string>
+    <string name="about_moreinfo">더 많은 정보</string>
+    <string name="sort">정렬 기준</string>
+    <string name="new_textdocument">새 텍스트 문서</string>
+    <string name="new_spreadsheet">새 스프레드시트</string>
+    <string name="share">공유하기</string>
+    <string name="document_locations">문서 위치</string>
+    <string name="open">열기</string>
+    <string name="directory_browser_label">디렉터리 고르기</string>
+    <string name="filter_presentations">프레젠테이션</string>
+    <string name="confirm_label">확인하기</string>
+    <string name="local_documents">문서 디렉터리</string>
+    <string name="cancel_label">취소하기</string>
+    <string name="bad_directory">잘못된 디렉터리 경로</string>
+    <string name="search_label">가기</string>
+    <string name="negative_cancel">취소하기</string>
+    <string name="theme_light">밝은 테마</string>
 </resources>

android/app/src/main/res/values-ml/strings.xml

@@ -1,2 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="about_notice">സൂചന കാണിക്കുക</string>
+    <string name="app_vendor">ഈ പ്രകാശനം $VENDOR ആണ് വിതരണം ചെയ്തത്.</string>
+    <string name="no_items">ഇനങ്ങളില്ല</string>
+    <string name="about_license">അധികാരപത്രം കാണിക്കുക</string>
+    <string name="storage_permission_required">സംഭരണ അനുമതി ആവശ്യമാണ്</string>
+    <string name="list_view">പട്ടിക</string>
+    <string name="pref_category_editor">തിരുത്തൽ ക്രമീകരണങ്ങൾ</string>
+    <string name="action_about">കുറിച്ച്</string>
+    <string name="open">തുറക്കുക</string>
+    <string name="pref_user_name">ഉപയോക്തൃനാമം</string>
+    <string name="pref_user_name_info">ഒരു അഭിപ്രായം ചേർക്കുമ്പോൾ ഉപയോഗിക്കുന്നു</string>
+    <string name="about_moreinfo">കൂടുതൽ വിവരങ്ങൾ</string>
+    <string name="new_textdocument">പുതിയ വാചക പ്രമാണം</string>
+    <string name="new_presentation">പുതിയ അവതരണം</string>
+    <string name="default_document_name">ശീർഷകമില്ലാത്ത</string>
+    <string name="sort">ഇങ്ങനെ അടുക്കുക</string>
+    <string name="sort_smallest">ആദ്യം ഏറ്റവും ചെറുത്</string>
+    <string name="sort_largest">ആദ്യം ഏറ്റവും വലുത്</string>
+    <string name="sort_oldest">ഏറ്റവും പഴയത് ആദ്യം</string>
+    <string name="action_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="user_name">ഉപയോക്തൃനാമം</string>
+    <string name="confirm_label">സ്ഥിരീകരിക്കുക</string>
+    <string name="cancel_label">റദ്ദാക്കുക</string>
+    <string name="search_label">പോകൂ</string>
+    <string name="positive_ok">ശരി</string>
+    <string name="theme_light">വെളിച്ചം</string>
+    <string name="theme_dark">ഇരുട്ട്</string>
+    <string name="pref_user_name_guest">അതിഥി ഉപയോക്താവ്</string>
+    <string name="share">പങ്കിടുക</string>
+    <string name="remove_from_list">പട്ടികയിൽ നിന്ന് നീക്കം ചെയ്യുക</string>
+    <string name="share_via">വഴി പങ്കിടുക</string>
+    <string name="filter_documents">പ്രമാണങ്ങൾ</string>
+    <string name="filter_presentations">അവതരണങ്ങൾ</string>
+    <string name="document_locations">പ്രമാണ സ്ഥാനങ്ങൾ</string>
+    <string name="close_document_locations">പ്രമാണ സ്ഥാനങ്ങൾ അടയ്ക്കുക</string>
+    <string name="negative_im_sure">എനിക്ക് ഉറപ്പാണ്</string>
+    <string name="negative_cancel">റദ്ദാക്കുക</string>
+    <string name="action_cancel">റദ്ദാക്കുക</string>
+    <string name="action_create">സൃഷ്ടിക്കുക</string>
+    <string name="action_overwrite">തിരുത്തിയെഴുതുക</string>
+    <string name="share_document">പ്രമാണം പങ്കിടുക</string>
+    <string name="sort_newest">ഏറ്റവും പുതിയത് ആദ്യം</string>
+    <string name="filter_everything">എല്ലാം</string>
+    <string name="external_sd_file_system">ബാഹ്യ എസ്ഡി</string>
+    <string name="title_permission_required">അനുമതി ആവശ്യമാണ്</string>
+    <string name="reason_required_to_read_documents">നിങ്ങളുടെ പ്രമാണങ്ങൾ വായിക്കുന്നതിന് സംഭരണ അനുമതി ആവശ്യമാണ്.</string>
+    <string name="create_new_document_title">പുതിയ പ്രമാണം സൃഷ്ടിക്കുക</string>
+    <string name="unable_to_go_further">കൂടുതൽ മുന്നോട്ട് പോകാൻ കഴിയുന്നില്ല.</string>
+    <string name="title_activity_show_html">കുറിച്ച്</string>
+    <string name="choose_theme">പ്രതിപാദ്യം തിരഞ്ഞെടുക്കുക</string>
+    <string name="theme">പ്രതിപാദ്യം</string>
+</resources>

android/app/src/main/res/values-ne/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="failed_to_load_file">लोड गर्न फाइल निर्धारण गर्न असफल</string>
+    <string name="loading">लोडहुँदै छ...</string>
+    <string name="storage_permission_required">भण्डारण अनुमति आवश्यक छ</string>
+    <string name="temp_file_saving_disabled">यो फाइल पढ्ने मात्र हो, बचत अक्षम छ।</string>
+</resources>

android/app/src/main/res/values-nl/strings.xml

@@ -35,8 +35,8 @@
     <string name="otg_missing_error">Ongeldig rootbestand. Controleer uw OTG-apparaat en/of configuratie.</string>
     <string name="ext_document_provider_error">Ongeldig rootbestand. Controleer uw sd-kaartconfiguratie.</string>
     <string name="owncloud_unspecified_error">Onbekende fout bij het verbinden met de cloud-server. Controleer uw configuratie en/of probeer het later.</string>
-    <string name="owncloud_unauthorized">Kan geen verbinding maken met de cloud-server. Controleer uw configuratie.</string>
-    <string name="owncloud_wrong_connection">Kan geen verbinding maken met de cloud-server. Controleer uw configuratie.</string>
+    <string name="owncloud_unauthorized">Kan niet aanmelden op de cloud-server. Controleer uw configuratie.</string>
+    <string name="owncloud_wrong_connection">Kan geen verbinding met de cloud-server maken. Controleer uw configuratie.</string>
     <string name="usb_connected_configure">USB aangesloten, stel uw apparaat in.</string>
     <string name="remote_server">Externe server</string>
     <string name="otg_file_system">OTG-apparaat (experimenteel)</string>
@@ -69,7 +69,7 @@
     <string name="new_spreadsheet">Nieuw werkblad</string>
     <string name="new_presentation">Nieuwe presentatie</string>
     <string name="new_textdocument">Nieuw tekstdocument</string>
-    <string name="about_moreinfo">Meer info</string>
+    <string name="about_moreinfo">Meer informatie</string>
     <string name="about_notice">Kennisgeving tonen</string>
     <string name="about_license">Licentie tonen</string>
     <string name="pref_show_debug_info_summary">Schakel foutopsporingsinformatie in documentviewer weergeven in</string>
@@ -91,7 +91,7 @@
     <string name="file_exists_warning">Er bestaat al een bestand met deze naam en zal overschreven worden.</string>
     <string name="temp_file_saving_disabled">Dit bestand is alleen-lezen; opslaan is uitgeschakeld.</string>
     <string name="no_items">Geen items</string>
-    <string name="no_recent_items">Open een bestand met het mappictogram op de werkbalk.</string>
+    <string name="no_recent_items">Open een bestand met behulp van het mappictogram in de werkbalk.</string>
     <string name="app_vendor">Deze versie is geleverd door $VENDOR.</string>
     <string name="app_description">$APP_NAME is een moderne, gebruiksvriendelijke, open source productiviteitssuite voor tekstverwerking, werkbladen, presentaties en meer.</string>
     <string name="app_version">Versie: %1$s
@@ -103,7 +103,7 @@
     <string name="pref_enable_chrome_debugger_info">Gebruik Chrome\'s hulpmiddel voor foutopsporing in dit document</string>
     <string name="remove_from_list">Van de lijst verwijderen</string>
     <string name="file_actions_icon_desc">Bestandsacties</string>
-    <string name="pref_category_editor">Editor-instellingen</string>
+    <string name="pref_category_editor">Editor instellingen</string>
     <string name="app_version_and_hash">Versie: %1$s
 \nonline git-hash: %2$s
 \ncore git-hash: %3$s</string>

android/app/src/main/res/values-or/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name_settings">ସେଟିଂ</string>
+    <string name="sort">ଏହା ଅନୁଯାୟୀ ସଜାନ୍ତୁ</string>
+    <string name="action_about">ସମ୍ବନ୍ଧରେ</string>
+    <string name="action_settings">ସେଟିଂ</string>
+    <string name="search_label">ଯାଅ</string>
+    <string name="positive_ok">ଠିକ୍ ଅଛି</string>
+    <string name="password">ପାସ୍‍ୱର୍ଡ଼</string>
+    <string name="title_activity_show_html">ସମ୍ବନ୍ଧରେ</string>
+    <string name="theme">ଥିମ୍</string>
+    <string name="theme_dark">ଗାଢ଼</string>
+    <string name="theme_light">ହାଲୁକା</string>
+    <string name="pref_category_editor">ସମ୍ପାଦକ ସେଟିଂ</string>
+    <string name="about_moreinfo">ଅଧିକ ସୂଚନା</string>
+</resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -3,43 +3,43 @@
     <!--string name="app_name" definition is deliberately missing here, it is filled in in build.gradle.-->
     <string name="app_name_settings">Configurações</string>
     <string name="app_version">Version: %1$s, Build ID: %2$s</string>
-    <string name="app_description">$APP_NAME é uma moderna suíte de produtividade para processamento de texto, folhas de cálculo e apresentações, de fácil utilização, e open source.</string>
+    <string name="app_description">$APP_NAME é uma moderna, fácil de usar, suíte de produtividade de código aberto, para processamento de texto, planilhas, apresentações e muito mais.</string>
     <string name="app_vendor">Esta versão foi fornecida por $VENDOR.</string>
     <string name="no_recent_items">Abra um arquivo através do ícone existente na barra de ferramentas.</string>
     <string name="no_items">Nenhum item</string>
-    <string name="temp_file_saving_disabled">Este documento é apenas de leitura, salvaguardar está desabilitado.</string>
-    <string name="file_exists_warning">Um ficheiro com o mesmo nome já existe, e será substituído.</string>
-    <string name="file_creation_failed">Falha na criação do documento</string>
+    <string name="temp_file_saving_disabled">Este arquivo é apenas de leitura, salvamento está desabilitado.</string>
+    <string name="file_exists_warning">Um arquivo com esse nome já existe e será sobrescrito.</string>
+    <string name="file_creation_failed">Falha na criação do arquivo</string>
     <string name="storage_permission_required">Permissão de armazenamento é requirida</string>
-    <string name="failed_to_load_file">Falha no carregamento do documento</string>
+    <string name="failed_to_load_file">Falha para determinar o arquivo a ser carregado</string>
     <string name="list_view">Lista</string>
-    <string name="grid_view">Grelha</string>
-    <string name="pref_category_explorer">Configurações do gestor de arquivos</string>
+    <string name="grid_view">Grade</string>
+    <string name="pref_category_explorer">Configurações do Gerenciador de Arquivos</string>
     <string name="pref_show_hidden_files">Arquivos/pastas ocultas</string>
     <string name="pref_show_hidden_files_summary">Mostrar arquivos/pastas ocultas</string>
-    <string name="pref_sort_summary">Ordenar arquivos por: A-Z, Tamanho ou por data.</string>
-    <string name="pref_viewmode_summary">Ver arquivos em grelha ou em list.</string>
-    <string name="pref_file_explorer_title">Layout do gestor de arquivos</string>
-    <string name="pref_sort_title">Ordem padrão</string>
-    <string name="pref_filter_title">Filtro padrão</string>
+    <string name="pref_sort_summary">Ordenar os arquivos: A-Z, por tamanho ou por data.</string>
+    <string name="pref_viewmode_summary">Ver arquivos em uma grade ou em uma lista.</string>
+    <string name="pref_file_explorer_title">Layout do gerenciador de arquivos</string>
+    <string name="pref_sort_title">Ordem dos arquivos</string>
+    <string name="pref_filter_title">Filtro de arquivo padrão</string>
     <string name="pref_filter_summary">Defina qual o filtro de arquivo que deve ser usado por padrão.</string>
     <string name="pref_show_debug_info">Mostrar info de depuração </string>
-    <string name="pref_show_debug_info_summary">Habilitar info de depuração no document viewer</string>
+    <string name="pref_show_debug_info_summary">Habilitar para mostrar informação de depuração no visualizador de documento</string>
     <string name="about_license">Mostrar Licença</string>
-    <string name="about_notice">Mostar aviso</string>
-    <string name="about_moreinfo">Mais informação</string>
-    <string name="new_textdocument">Novo documento de texto</string>
-    <string name="new_presentation">Nova apresentação </string>
-    <string name="new_spreadsheet">Nova folha de cálculo</string>
-    <string name="default_document_name">Sem nome</string>
-    <string name="filter">Filtrado por</string>
-    <string name="sort">Ordenado por</string>
-    <string name="sort_smallest">Mais pequeno primeiro</string>
-    <string name="sort_largest">Maior em primeiro lugar</string>
+    <string name="about_notice">Mostrar Aviso</string>
+    <string name="about_moreinfo">Mais Informação</string>
+    <string name="new_textdocument">Novo Documento de Texto</string>
+    <string name="new_presentation">Nova Apresentação</string>
+    <string name="new_spreadsheet">Nova Planilha</string>
+    <string name="default_document_name">Sem título</string>
+    <string name="filter">Filtrar por</string>
+    <string name="sort">Ordenar por</string>
+    <string name="sort_smallest">O menor em primeiro</string>
+    <string name="sort_largest">O maior em primeiro</string>
     <string name="sort_az">A-Z</string>
     <string name="sort_za">Z-A</string>
-    <string name="sort_oldest">Mais antigo em primeiro</string>
-    <string name="sort_newest">Recentes em primeiro</string>
+    <string name="sort_oldest">Mais antigo primeiro</string>
+    <string name="sort_newest">Mais recente primeiro</string>
     <string name="file_icon_desc">Ícone de arquivo</string>
     <string name="title_recents">Arquivos recentes</string>
     <string name="title_browser">Todos os arquivos</string>
@@ -47,31 +47,31 @@
     <string name="action_about">Sobre</string>
     <string name="action_settings">Configurações</string>
     <string name="open">Abrir</string>
-    <string name="share">Partilhar</string>
-    <string name="share_via">Partilhar via</string>
+    <string name="share">Compartilhar</string>
+    <string name="share_via">Compartilhar via</string>
     <!-- Document browser filters -->
     <string name="filter_everything">Tudo</string>
     <string name="filter_documents">Documentos</string>
-    <string name="filter_spreadsheets">Folhas de cálculo</string>
+    <string name="filter_spreadsheets">Planilhas</string>
     <string name="filter_presentations">Apresentações</string>
     <!-- Document provider names -->
-    <string name="document_locations">Locais de arquivos</string>
-    <string name="close_document_locations">Fechar Locais de arquivos</string>
-    <string name="local_documents">Diretórios de documentos</string>
+    <string name="document_locations">Locais de documentos</string>
+    <string name="close_document_locations">Fechar locais de documentos</string>
+    <string name="local_documents">Diretório de documentos</string>
     <string name="local_file_system">Sistema local de arquivos</string>
     <string name="external_sd_file_system">SD externo</string>
     <string name="otg_file_system">Dispositivo OTG (experimental)</string>
     <string name="remote_server">Servidor remoto</string>
-    <string name="usb_connected_configure">USB conetado, configure o seu dispositivo.</string>
+    <string name="usb_connected_configure">USB conectado, configure o seu dispositivo.</string>
     <string name="owncloud_wrong_connection">Não foi possível conectar com o servidor na nuvem. Verifique as suas configurações.</string>
     <string name="owncloud_unauthorized">Não foi possível iniciar a sessão no servidor. Verifique as suas configurações.</string>
-    <string name="owncloud_unspecified_error">Erro não especificado ao conetar com o servidor na nuvem. Verifique as suas configurações ou tente mais tarde.</string>
+    <string name="owncloud_unspecified_error">Erro não especificado ao conectar com o servidor na nuvem. Verifique as suas configurações e/ou tente mais tarde.</string>
     <string name="ext_document_provider_error">Arquivo raiz inválido. Verifique a configuração do seu cartão SD.</string>
     <string name="otg_missing_error">Arquivo raiz inválido. Verifique seu dispositivo OTG e/ou configuração.</string>
     <!-- Edit action names -->
     <!-- Feedback messages -->
     <!-- Document provider settings -->
-    <string name="storage_provider_settings">Configurações de servidor</string>
+    <string name="storage_provider_settings">Configurações do provedor de armazenamento</string>
     <string name="owncloud_settings">Configurações do servidor na nuvem</string>
     <string name="physical_storage_settings">Configurações de armazenamento físico</string>
     <string name="external_sd_path">Caminho SD externo</string>
@@ -79,19 +79,19 @@
     <string name="otg_warning">Recurso experimental: use somente se o dispositivo OTG for gravável.</string>
     <string name="server_url">URL de servidor</string>
     <string name="server_url_and_port">URL e porta do servidor na nuvem.</string>
-    <string name="user_name">Usuário</string>
+    <string name="user_name">Nome de usuário(a)</string>
     <string name="password">Senha</string>
     <!-- Directory browser strings -->
     <string name="up_description">Ir para um diretório acima</string>
     <string name="confirm_label">Confirmar</string>
     <string name="cancel_label">Cancelar</string>
     <string name="search_label">Ir</string>
-    <string name="directory_browser_label">Escolha Diretório</string>
+    <string name="directory_browser_label">Escolher Diretório</string>
     <string name="bad_directory">Caminho de diretório inválido</string>
     <string name="current_dir">Diretório atual: %1$s</string>
     <!-- Permission rationale alert dialog strings -->
-    <string name="title_permission_required">Permissão necessária</string>
-    <string name="reason_required_to_read_documents">É necessária permissão de armazenamento para ler seus documentos.</string>
+    <string name="title_permission_required">Permissão requerida</string>
+    <string name="reason_required_to_read_documents">Permissão de armazenamento é requerida para ler seus documentos.</string>
     <string name="positive_ok">OK</string>
     <string name="negative_im_sure">Tenho a certeza</string>
     <string name="negative_cancel">Cancelar</string>
@@ -99,9 +99,9 @@
     <string name="action_cancel">Cancelar</string>
     <!-- Create New Document Dialog Strings -->
     <string name="create_new_document_title">Criar novo documento</string>
-    <string name="enter_filename">Introduza o nome do arquivo:</string>
+    <string name="enter_filename">Por favor, insira o nome do arquivo:</string>
     <string name="action_create">Criar</string>
-    <string name="action_overwrite">Substituir</string>
+    <string name="action_overwrite">Sobrescrever</string>
     <!-- Loading SlideShow Dialog Strings -->
     <string name="loading">Carregando...</string>
     <!-- Presentation Mode Strings -->
@@ -115,8 +115,8 @@
     <string name="directory_not_saved">Diretório não salvo.</string>
     <string name="title_activity_show_html">Sobre</string>
     <string name="share_document">Compartilhar documento</string>
-    <string name="pref_enable_chrome_debugger_info">Ative para utilizar a ferramenta de debug do Chrome no documento</string>
-    <string name="pref_enable_chrome_debugger">Debug do Chrome</string>
+    <string name="pref_enable_chrome_debugger_info">Habilita para utilizar a ferramenta de depuração do Chrome no documento</string>
+    <string name="pref_enable_chrome_debugger">Depuração do Chrome</string>
     <string name="pref_category_editor">Configurações do editor</string>
     <string name="remove_from_list">Remover da lista</string>
     <string name="file_actions_icon_desc">Ações de arquivo</string>
@@ -128,4 +128,7 @@
     <string name="theme_system_default">Padrão do sistema</string>
     <string name="choose_theme">Escolher tema</string>
     <string name="theme">Tema</string>
+    <string name="pref_user_name_info">Usado ao adicionar um comentário</string>
+    <string name="pref_user_name">Nome de usuário</string>
+    <string name="pref_user_name_guest">Usuário Convidado</string>
 </resources>

android/app/src/main/res/values-sq/strings.xml

@@ -1,2 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="temp_file_saving_disabled">Kjo kartelë është vetëm-lexim, ruajtja është e çaktivizuar.</string>
+    <string name="storage_permission_required">Lypset leje depozitimi</string>
+    <string name="failed_to_load_file">S’u arrit të përcaktohej kartela për ngarkim</string>
+    <string name="loading">Po ngarkohet…</string>
+    <string name="pref_show_debug_info_summary">Aktivizojeni, që të shfaqen hollësi diagnostikimi te parësi i dokumenteve</string>
+    <string name="pref_enable_chrome_debugger">Diagnostikim Chrome</string>
+    <string name="pref_enable_chrome_debugger_info">Aktivizojeni, që të përdoret mjeti i diagnostikimit Chrome te dokumenti</string>
+    <string name="new_spreadsheet">Fletëllogaritje e Re</string>
+    <string name="owncloud_unauthorized">S’bëhet dot hyrje në llogari te shërbyesi re.</string>
+    <string name="owncloud_unspecified_error">Gabim i papërcaktuar në lidhjen te shërbyesi re. Kontrolloni formësimin tuaj dhe/ose riprovoni më vonë.</string>
+    <string name="app_name_settings">Rregullime</string>
+    <string name="app_description">$APP_NAME është një suitë moderne zyrash, e lehtë për t’u përdorur, me burim të hapët, për përpunim tekstesh, fletëllogaritje, paraqitje, etj.</string>
+    <string name="app_vendor">Kjo hedhje në qarkullim qe sjellë nga $VENDOR.</string>
+    <string name="no_recent_items">Ju lutemi, hapni një kartelë duke përdorur ikonën dosje te paneli.</string>
+    <string name="no_items">S’ka objekte</string>
+    <string name="file_exists_warning">Ka tashmë një kartelë me këtë emër dhe do të mbishkruhet.</string>
+    <string name="file_creation_failed">Krijimi i kartelës dështoi</string>
+    <string name="list_view">Listë</string>
+    <string name="grid_view">Mozaik</string>
+    <string name="pref_category_explorer">Rregullime Përgjegjësi Kartelash</string>
+    <string name="pref_category_editor">Rregullime Përpunuesi</string>
+    <string name="pref_show_hidden_files">Kartela/Dosje të Fshehura</string>
+    <string name="pref_show_hidden_files_summary">Aktivizojeni, që të shfaqen kartela/dosje të fshehura</string>
+    <string name="pref_sort_summary">Përzgjidhni si të renditen kartelat: A-Z, sipas madhësish, ose datash.</string>
+    <string name="pref_viewmode_summary">Shihini kartelat si mozaik, ose si një listë.</string>
+    <string name="pref_file_explorer_title">Skemë përgjegjësi kartelash</string>
+    <string name="pref_sort_title">Rend Kartelash</string>
+    <string name="pref_filter_title">Filtër Parazgjedhje Kartelash</string>
+    <string name="pref_filter_summary">Caktoni cili filtër kartelash duhet përdorur si parazgjedhje.</string>
+    <string name="pref_show_debug_info">Shfaq Hollësi Diagnostikimi</string>
+    <string name="about_license">Shfaq Licencë</string>
+    <string name="about_notice">Shfaq Njoftim</string>
+    <string name="about_moreinfo">Më Tepër Hollësi</string>
+    <string name="new_textdocument">Dokument i Ri Tekst</string>
+    <string name="new_presentation">Paraqitje e Re</string>
+    <string name="default_document_name">pa titull</string>
+    <string name="filter">Filtroji sipas</string>
+    <string name="sort">Renditi sipas</string>
+    <string name="sort_smallest">Më të vegjlit së pari</string>
+    <string name="sort_largest">Më të mëdhenjtë së pari</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Më të vjetrit së pari</string>
+    <string name="sort_newest">Më të rinjtë së pari</string>
+    <string name="file_icon_desc">Ikonë kartelash</string>
+    <string name="file_actions_icon_desc">Veprime kartelash</string>
+    <string name="title_recents">Kartela së fundi</string>
+    <string name="title_browser">Krejt kartelat</string>
+    <string name="action_about">Mbi</string>
+    <string name="action_settings">Rregullime</string>
+    <string name="open">Hape</string>
+    <string name="share">Ndajeni Me të Tjerët</string>
+    <string name="remove_from_list">Hiqe nga lista</string>
+    <string name="share_via">Ndaje me të tjerë përmes</string>
+    <string name="filter_everything">Gjithçka</string>
+    <string name="close_document_locations">Mbyll vende dokumentesh</string>
+    <string name="local_documents">Drejtori dokumentesh</string>
+    <string name="local_file_system">Sistem vendor kartelash</string>
+    <string name="external_sd_file_system">SD e jashtme</string>
+    <string name="otg_file_system">Pajisje OTG (eksperimentale)</string>
+    <string name="remote_server">Shërbyes i largët</string>
+    <string name="usb_connected_configure">USB e lidhur, formësoni pajisjen tuaj.</string>
+    <string name="owncloud_wrong_connection">S’lidhet dot te shërbyesi re. Kontrolloni formësimin tuaj.</string>
+    <string name="ext_document_provider_error">Kartelë rrënjë e pavlefshme. Kontrolloni formësimin e kartës tuaj SD.</string>
+    <string name="otg_missing_error">Kartelë rrënjë e pavlefshme. Kontrolloni pajisje tuaj OTG dhe/ose formësimin.</string>
+    <string name="storage_provider_settings">Rregullime depozitimi nga shërbimi</string>
+    <string name="owncloud_settings">Rregullime shërbyesi re</string>
+    <string name="physical_storage_settings">Rregullime depozite materiale</string>
+    <string name="external_sd_path">Shteg SD të jashtme</string>
+    <string name="otg_device_path">Shteg pajisjeje OTG</string>
+    <string name="otg_warning">Veçori Eksperimentale: Përdoreni vetëm nëse pajisja OTG është e shkrueshme.</string>
+    <string name="server_url">URL Shërbyesi</string>
+    <string name="server_url_and_port">URL dhe portë te shërbyesi re.</string>
+    <string name="user_name">Emër përdoruesi</string>
+    <string name="up_description">Te drejtoria mëmë</string>
+    <string name="confirm_label">Ripohojeni</string>
+    <string name="cancel_label">Anuloje</string>
+    <string name="search_label">Shko</string>
+    <string name="directory_browser_label">Zgjidhni Drejtori</string>
+    <string name="bad_directory">Shteg i pavlefshëm drejtorie</string>
+    <string name="current_dir">Drejtoria e Tanishme: %1$s</string>
+    <string name="reason_required_to_read_documents">Për leximin e dokumenteve tuaja lypset leje depozite.</string>
+    <string name="negative_im_sure">Jam i sigurt</string>
+    <string name="negative_cancel">Anuloje</string>
+    <string name="action_cancel">Anuloje</string>
+    <string name="create_new_document_title">Krijoni Dokument të Ri</string>
+    <string name="enter_filename">Ju lutemi, jepni emrin e kartelës:</string>
+    <string name="action_create">Krijoje</string>
+    <string name="action_overwrite">Mbishkruaje</string>
+    <string name="share_document">Ndani Dokument Me të Tjerë</string>
+    <string name="unable_to_go_further">S’arrihet të shkohet më tej.</string>
+    <string name="bmp_null">Bpm është e zbrazët!</string>
+    <string name="directory_not_saved">Drejtoria s’u ruajt.</string>
+    <string name="title_activity_show_html">Mbi</string>
+    <string name="theme">Temë</string>
+    <string name="choose_theme">Zgjidhni temë</string>
+    <string name="theme_system_default">Parazgjedhje sistemi</string>
+    <string name="theme_dark">E errët</string>
+    <string name="theme_light">E çelët</string>
+    <string name="pref_user_name">Emër Përdoruesi</string>
+    <string name="pref_user_name_info">Përdorur kur shtohet një koment</string>
+    <string name="title_permission_required">Lypset Leje</string>
+    <string name="positive_ok">OK</string>
+    <string name="filter_documents">Dokumente</string>
+    <string name="pref_user_name_guest">Përdorues Mysafir</string>
+    <string name="filter_spreadsheets">Fletëllogaritje</string>
+    <string name="filter_presentations">Paraqitje</string>
+    <string name="document_locations">Vendndodhje dokumentesh</string>
+    <string name="password">Fjalëkalim</string>
+    <string name="app_version_and_hash">Version: %1$s
+\nonline git-hash: %2$s
+\ncore git-hash: %3$s</string>
+</resources>

android/app/src/main/res/values-uk/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="about_license">Показати ліцензію</string>
-    <string name="pref_enable_chrome_debugger_info">Використовувати в документі зневаджувальні засоби Chrome</string>
-    <string name="pref_enable_chrome_debugger">Зневадження Chrome</string>
-    <string name="pref_show_debug_info_summary">Показувати зневаджувальну інформацію в переглядачі документів</string>
-    <string name="pref_show_debug_info">Показати зневаджувальну інформацію</string>
+    <string name="pref_enable_chrome_debugger_info">Використовувати в документі засоби налагодження Chrome</string>
+    <string name="pref_enable_chrome_debugger">Налагодження Chrome</string>
+    <string name="pref_show_debug_info_summary">Показувати інформацію налагодження в переглядачі документів</string>
+    <string name="pref_show_debug_info">Показати інформацію налагодження</string>
     <string name="pref_filter_summary">Задайте, який фільтр файлів буде типовим.</string>
     <string name="pref_filter_title">Типовий фільтр файлів</string>
     <string name="pref_sort_title">Порядок файлів</string>
@@ -21,7 +21,7 @@
     <string name="file_exists_warning">Файл з такою назвою вже існує і буде перезаписаний.</string>
     <string name="temp_file_saving_disabled">Цей файл лише для читання, збереження неможливе.</string>
     <string name="no_items">Немає елементів</string>
-    <string name="no_recent_items">Відкрийте файл за допомогою піктограми папки на панелі інструментів.</string>
+    <string name="no_recent_items">Відкрийте файл за допомогою піктограми теки на панелі інструментів.</string>
     <string name="app_vendor">Цей випуск надано $VENDOR.</string>
     <string name="app_description">$APP_NAME це сучасний, простий у використанні набір програм з відкритим кодом для обробки текстів, електронних таблиць, презентацій тощо.</string>
     <string name="app_version">Версія: %1$s, збірка: %2$s</string>

android/app/src/main/res/values/strings.xml

@@ -1,11 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--string name="app_name" definition is deliberately missing here, it is filled in in build.gradle.-->
-
     <string name="app_name_settings">Settings</string>
     <string name="app_version_and_hash">Version: %1$s\nonline git-hash: %2$s\ncore git-hash: %3$s</string>
     <string name="app_description">$APP_NAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</string>
     <string name="app_vendor">This release was supplied by $VENDOR.</string>
-
     <string name="no_recent_items">Please open a file using the folder icon in the toolbar.</string>
     <string name="no_items">No items</string>
     <string name="temp_file_saving_disabled">This file is read-only, saving is disabled.</string>
@@ -13,7 +12,6 @@
     <string name="file_creation_failed">File creation failed</string>
     <string name="storage_permission_required">Storage permission is required</string>
     <string name="failed_to_load_file">Failed to determine the file to load</string>
-
     <string name="list_view">List</string>
     <string name="grid_view">Grid</string>
     <string name="pref_category_explorer">File Manager Settings</string>
@@ -33,16 +31,13 @@
     <string name="pref_user_name_guest">Guest User</string>
     <string name="pref_enable_chrome_debugger">Chrome Debugging</string>
     <string name="pref_enable_chrome_debugger_info">Enable to use Chrome\'s debugging tool in the document</string>
-
     <string name="about_license">Show License</string>
     <string name="about_notice">Show Notice</string>
     <string name="about_moreinfo">More Info</string>
-
     <string name="new_textdocument">New Text Document</string>
     <string name="new_presentation">New Presentation</string>
     <string name="new_spreadsheet">New Spreadsheet</string>
     <string name="default_document_name">untitled</string>
-
     <string name="filter">Filter by</string>
     <string name="sort">Sort by</string>
     <string name="sort_smallest">Smallest first</string>
@@ -56,20 +51,17 @@
     <string name="title_recents">Recent files</string>
     <string name="title_browser">All files</string>
     <!-- Pref keys as resources ; Not currently used -->
-
     <string name="action_about">About</string>
     <string name="action_settings">Settings</string>
     <string name="open">Open</string>
     <string name="share">Share</string>
     <string name="remove_from_list">Remove from the list</string>
     <string name="share_via">Share via</string>
-
     <!-- Document browser filters -->
     <string name="filter_everything">Everything</string>
     <string name="filter_documents">Documents</string>
     <string name="filter_spreadsheets">Spreadsheets</string>
     <string name="filter_presentations">Presentations</string>
-
     <!-- Document provider names -->
     <string name="document_locations">Document locations</string>
     <string name="close_document_locations">Close document locations</string>
@@ -79,18 +71,13 @@
     <string name="otg_file_system">OTG device (experimental)</string>
     <string name="remote_server">Remote server</string>
     <string name="usb_connected_configure">USB connected, configure your device.</string>
-
     <string name="owncloud_wrong_connection">Cannot connect to the cloud server. Check your configuration.</string>
     <string name="owncloud_unauthorized">Cannot log in to the cloud server. Check your configuration.</string>
     <string name="owncloud_unspecified_error">Unspecified error connecting to the cloud server. Check your configuration and/or try later.</string>
-
     <string name="ext_document_provider_error">Invalid root file. Check your sd card configuration.</string>
     <string name="otg_missing_error">Invalid root file. Check your OTG device and/or configuration.</string>
-
     <!-- Edit action names -->
-
     <!-- Feedback messages -->
-
     <!-- Document provider settings -->
     <string name="storage_provider_settings">Storage provider settings</string>
     <string name="owncloud_settings">Cloud server settings</string>
@@ -102,7 +89,6 @@
     <string name="server_url_and_port">URL and port of the cloud server.</string>
     <string name="user_name">User name</string>
     <string name="password">Password</string>
-
     <!-- Directory browser strings -->
     <string name="up_description">To parent directory</string>
     <string name="confirm_label">Confirm</string>
@@ -111,48 +97,36 @@
     <string name="directory_browser_label">Choose Directory</string>
     <string name="bad_directory">Invalid directory path</string>
     <string name="current_dir">Current Directory: %1$s</string>
-
     <!-- Permission rationale alert dialog strings -->
     <string name="title_permission_required">Permission Required</string>
     <string name="reason_required_to_read_documents">Storage permission is required for reading your documents.</string>
     <string name="positive_ok">OK</string>
     <string name="negative_im_sure">I\'m sure</string>
     <string name="negative_cancel">Cancel</string>
-
     <!-- Save Alert dialog strings -->
     <string name="action_cancel">Cancel</string>
-
     <!-- Create New Document Dialog Strings -->
     <string name="create_new_document_title">Create New Document</string>
     <string name="enter_filename">Please enter the file name:</string>
     <string name="action_create">Create</string>
     <string name="action_overwrite">Overwrite</string>
-
     <!-- Loading SlideShow Dialog Strings -->
     <string name="loading">Loading...</string>
-
     <string name="share_document">Share Document</string>
-
     <!-- Presentation Mode Strings -->
-
     <!-- Calc Header Menu Strings -->
-
     <!-- Password dialog strings -->
-
     <!-- Insert Image Strings -->
-
     <!-- Clipboard Actions -->
-
     <!-- UNO cmd controller Strings -->
     <string name="unable_to_go_further">Unable to go further.</string>
     <string name="bmp_null">Bmp is null!</string>
     <string name="directory_not_saved">Directory not saved.</string>
     <string name="title_activity_show_html">About</string>
-
     <!-- Theme settings -->
     <string name="theme">Theme</string>
     <string name="choose_theme">Choose theme</string>
     <string name="theme_system_default">System default</string>
     <string name="theme_dark">Dark</string>
     <string name="theme_light">Light</string>
-</resources>
+</resources>

android/build.gradle.in

@@ -4,10 +4,11 @@ buildDir = "@abs_top_builddir@/android/build"
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        // before updating make sure https://issuetracker.google.com/issues/293294923 is fixed
+        classpath 'com.android.tools.build:gradle:3.6.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,11 +18,11 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

android/lib/build.gradle.in

@@ -4,12 +4,13 @@ apply plugin: 'com.android.library'
 apply from: 'libSettings.gradle'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     buildDir = "${rootProject.getBuildDir()}/lib"
+    ndkVersion "22.1.7171670"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -67,13 +68,22 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.1.0-alpha04'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
+    // https://stackoverflow.com/questions/75263047/duplicate-class-in-kotlin-android
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }
 
-task copyUnpackAssets(type: Copy) {
+tasks.register('copyUnpackAssets', Copy) {
     description "copies assets that need to be extracted on the device"
     into 'src/main/assets/unpack'
     into('program') {
@@ -95,7 +105,7 @@ task copyUnpackAssets(type: Copy) {
     }
     into('etc/coolwsd') {
         from('/android/coolkitconfig.xcu')
-            includes = [ 'coolkitconfig.xcu' ]
+        includes = ['coolkitconfig.xcu']
     }
     into('user/fonts') {
         from "${liboInstdir}/share/fonts/truetype"
@@ -122,7 +132,7 @@ task copyUnpackAssets(type: Copy) {
         filter {
             String line ->
                 line.replaceAll(
-                    '@@APPLICATION_ID@@', new String("${liboApplicationId}")
+                        '@@APPLICATION_ID@@', new String("${liboApplicationId}")
                 )
         }
     }
@@ -138,15 +148,15 @@ task copyUnpackAssets(type: Copy) {
         includes = ['extensions/dict-de/**', 'extensions/dict-en/**', 'extensions/dict-es/**', 'extensions/dict-fr/**', 'extensions/dict-pt-BR/**']
         exclude { FileTreeElement details ->
             !(details.file.isDirectory() ||
-                details.file.name.endsWith('.xcu') ||
-                details.file.name.endsWith('.dic') ||
-                details.file.name.endsWith('.aff') ||
-                details.file.name.endsWith('.xml'))
+                    details.file.name.endsWith('.xcu') ||
+                    details.file.name.endsWith('.dic') ||
+                    details.file.name.endsWith('.aff') ||
+                    details.file.name.endsWith('.xml'))
         }
     }
 }
 
-task copyAssets(type: Copy) {
+tasks.register('copyAssets', Copy) {
     description "copies assets that can be accessed within the installed apk"
     into 'src/main/assets'
     from("${liboSrcRoot}/instdir/") {
@@ -168,7 +178,7 @@ task copyAssets(type: Copy) {
     }
 }
 
-task createFullConfig(type: Copy) {
+tasks.register('createFullConfig', Copy) {
     description "copies various configuration bits into the apk"
     into('src/main/assets/share/config')
     from("${liboInstdir}/share/config") {
@@ -176,25 +186,25 @@ task createFullConfig(type: Copy) {
     }
 }
 
-task copyBrandTheme(type: Copy) {
-	from "${liboBrandingDir}/online-theme"
-	into "src/main/assets/share/theme_definitions/online"
+tasks.register('copyBrandTheme', Copy) {
+    from "${liboBrandingDir}/online-theme"
+    into "src/main/assets/share/theme_definitions/online"
 }
 
-task copyDocTemplates(type: Copy) {
-        from "${rootProject.getRootDir()}/templates/untitled.odp",
-             "${rootProject.getRootDir()}/templates/untitled.ods",
-             "${rootProject.getRootDir()}/templates/untitled.odt"
-        into "src/main/assets/templates"
+tasks.register('copyDocTemplates', Copy) {
+    from "${rootProject.getRootDir()}/templates/untitled.odp",
+            "${rootProject.getRootDir()}/templates/untitled.ods",
+            "${rootProject.getRootDir()}/templates/untitled.odt"
+    into "src/main/assets/templates"
 }
 
-task copyKitConfig(type: Copy) {
-        from "${file(rootProject.getRootDir()).getParent()}/coolkitconfig-mobile.xcu"
-        into "src/main/assets/etc/coolwsd"
-        rename { "coolkitconfig.xcu" }
+tasks.register('copyKitConfig', Copy) {
+    from "${file(rootProject.getRootDir()).getParent()}/coolkitconfig-mobile.xcu"
+    into "src/main/assets/etc/coolwsd"
+    rename { "coolkitconfig.xcu" }
 }
 
-task createStrippedConfig {
+tasks.register('createStrippedConfig') {
     def preserveDir = file("src/main/assets/share/config/soffice.cfg/empty")
     outputs.dir "src/main/assets/share/registry/res"
     outputs.file preserveDir
@@ -207,7 +217,7 @@ task createStrippedConfig {
     }
 }
 
-task createRCfiles {
+tasks.register('createRCfiles') {
     inputs.file "libSettings.gradle"
     dependsOn copyUnpackAssets, copyAssets
     def sofficerc = file('src/main/assets/unpack/program/sofficerc')
@@ -295,7 +305,7 @@ preBuild.dependsOn 'createRCfiles',
         'createFullConfig',
         'copyBrandTheme'
 
-task generateCoolDebugAssets {
+tasks.register('generateCoolDebugAssets') {
     doLast {
         exec {
             commandLine 'make', '-C', "${rootProject.getBuildDir()}/../../browser", 'clean'
@@ -306,7 +316,7 @@ task generateCoolDebugAssets {
     }
 }
 
-task generateCoolReleaseAssets {
+tasks.register('generateCoolReleaseAssets') {
     doLast {
         exec {
             commandLine 'make', '-C', "${rootProject.getBuildDir()}/../../browser", 'clean'

android/lib/src/main/cpp/CMakeLists.txt.in

@@ -1,33 +1,42 @@
 
 cmake_minimum_required(VERSION 3.4.1)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2a")
+
 add_library(androidapp SHARED
             androidapp.cpp
             ../../../../../common/Authorization.cpp
             ../../../../../common/ConfigUtil.cpp
-            ../../../../../common/FileUtil.cpp
             ../../../../../common/CommandControl.cpp
+            ../../../../../common/Crypto-stub.cpp
+            ../../../../../common/FileUtil.cpp
             ../../../../../common/Log.cpp
-            ../../../../../common/MessageQueue.cpp
             ../../../../../common/TraceEvent.cpp
             ../../../../../common/Protocol.cpp
+            ../../../../../common/Simd.cpp
             ../../../../../common/StringVector.cpp
             ../../../../../common/Session.cpp
             ../../../../../common/SigUtil.cpp
             ../../../../../common/SpookyV2.cpp
             ../../../../../common/Unit.cpp
             ../../../../../common/Util.cpp
-            ../../../../../common/CommandControl.cpp
+            ../../../../../common/Util-mobile.cpp
             ../../../../../kit/ChildSession.cpp
+            ../../../../../kit/DeltaSimd.c
             ../../../../../kit/Kit.cpp
+            ../../../../../kit/KitQueue.cpp
+            ../../../../../kit/KitWebSocket.cpp
             ../../../../../net/FakeSocket.cpp
             ../../../../../net/Socket.cpp
             ../../../../../wsd/ClientSession.cpp
             ../../../../../wsd/DocumentBroker.cpp
             ../../../../../wsd/COOLWSD.cpp
+            ../../../../../wsd/ClientRequestDispatcher.cpp
             ../../../../../wsd/RequestDetails.cpp
+            ../../../../../wsd/RequestVettingStation.cpp
             ../../../../../wsd/Storage.cpp
-            ../../../../../wsd/TileCache.cpp)
+            ../../../../../wsd/TileCache.cpp
+            ../../../../../wsd/coolwsd-fork.cpp)
 
 target_compile_definitions(androidapp PRIVATE COOLWSD_CONFIGDIR="/assets/etc/coolwsd")
 
@@ -36,18 +45,26 @@ if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
     set(LOBUILDDIR_ABI @LOBUILDDIR@)
     set(POCOINCLUDE_ABI @POCOINCLUDE@)
     set(POCOLIB_ABI @POCOLIB@)
+    set(ZSTDINCLUDE_ABI @ZSTDINCLUDE@)
+    set(ZSTDLIB_ABI @ZSTDLIB@)
 elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
     set(LOBUILDDIR_ABI @LOBUILDDIR_ARM64_V8A@)
     set(POCOINCLUDE_ABI @POCOINCLUDE_ARM64_V8A@)
     set(POCOLIB_ABI @POCOLIB_ARM64_V8A@)
+    set(ZSTDINCLUDE_ABI @ZSTDINCLUDE_ARM64_V8A@)
+    set(ZSTDLIB_ABI @ZSTDLIB_ARM64_V8A@)
 elseif(${ANDROID_ABI} STREQUAL "x86")
     set(LOBUILDDIR_ABI @LOBUILDDIR_X86@)
     set(POCOINCLUDE_ABI @POCOINCLUDE_X86@)
     set(POCOLIB_ABI @POCOLIB_X86@)
+    set(ZSTDINCLUDE_ABI @ZSTDINCLUDE_X86@)
+    set(ZSTDLIB_ABI @ZSTDLIB_X86@)
 elseif(${ANDROID_ABI} STREQUAL "x86_64")
     set(LOBUILDDIR_ABI @LOBUILDDIR_X86_64@)
     set(POCOINCLUDE_ABI @POCOINCLUDE_X86_64@)
     set(POCOLIB_ABI @POCOLIB_X86_64@)
+    set(ZSTDINCLUDE_ABI @ZSTDINCLUDE_X86_64@)
+    set(ZSTDLIB_ABI @ZSTDLIB_X86_64@)
 else()
     MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add support for that.")
 endif()
@@ -63,6 +80,7 @@ target_include_directories(androidapp PRIVATE
                            ../../../../../net
                            ../../../../../wsd
                            ${POCOINCLUDE_ABI}         # POCO
+                           ${ZSTDINCLUDE_ABI}         # ZSTD
                            ${LOBUILDDIR_ABI}/workdir/UnpackedTarball/libpng # libpng
                            ${LOBUILDDIR_ABI}/include                        # LibreOfficeKit
 )
@@ -120,10 +138,10 @@ target_link_libraries(androidapp
                       ${LOBUILDDIR_ABI}/workdir/LinkTarget/StaticLibrary/liblibpng.a
                       ${POCOLIB_ABI}/libPocoEncodings@POCODEBUG@.a
                       ${POCOLIB_ABI}/libPocoNet@POCODEBUG@.a
-                      ${POCOLIB_ABI}/libPocoRedis@POCODEBUG@.a
                       ${POCOLIB_ABI}/libPocoUtil@POCODEBUG@.a
                       ${POCOLIB_ABI}/libPocoXML@POCODEBUG@.a
                       ${POCOLIB_ABI}/libPocoJSON@POCODEBUG@.a
                       ${POCOLIB_ABI}/libPocoFoundation@POCODEBUG@.a
+                      ${ZSTDLIB_ABI}/libzstd.a
                       "${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}/liblo-native-code.so"
 )

android/lib/src/main/cpp/androidapp.cpp

@@ -35,6 +35,7 @@ static int fakeClientFd;
 static int closeNotificationPipeForForwardingThread[2] = {-1, -1};
 static JavaVM* javaVM = nullptr;
 static bool lokInitialized = false;
+static std::mutex coolwsdRunningMutex;
 
 // Remember the reference to the LOActivity
 jclass g_loActivityClz = nullptr;
@@ -182,9 +183,11 @@ void closeDocument()
 {
     // Close one end of the socket pair, that will wake up the forwarding thread that was constructed in HULLO
     fakeSocketClose(closeNotificationPipeForForwardingThread[0]);
-
+    LOG_DBG("Waiting for Lokit to finish...");
+    std::unique_lock<std::mutex> lokitLock(COOLWSD::lokit_main_mutex);
+    LOG_DBG("Lokit has finished.");
     LOG_DBG("Waiting for COOLWSD to finish...");
-    std::unique_lock<std::mutex> lock(COOLWSD::lokit_main_mutex);
+    std::unique_lock<std::mutex> coolwsdLock(coolwsdRunningMutex);
     LOG_DBG("COOLWSD has finished.");
 }
 
@@ -345,9 +348,10 @@ Java_org_libreoffice_androidlib_LOActivity_createCOOLWSD(JNIEnv *env, jobject in
                     {
                         LOG_DBG("Creating COOLWSD");
                         {
+                            std::unique_lock<std::mutex> lock(coolwsdRunningMutex);
                             fakeClientFd = fakeSocketSocket();
                             LOG_DBG("createCOOLWSD created fakeClientFd: " << fakeClientFd);
-                            std::unique_ptr<COOLWSD> coolwsd(new COOLWSD());
+                            std::unique_ptr<COOLWSD> coolwsd = std::make_unique<COOLWSD>();
                             coolwsd->run(1, argv);
                         }
                         LOG_DBG("One run of COOLWSD completed");

android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java

@@ -23,6 +23,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -74,6 +75,7 @@ import java.util.Map;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -96,6 +98,7 @@ public class LOActivity extends AppCompatActivity {
     private static final String CLIPBOARD_COOL_SIGNATURE = "cool-clip-magic-4a22437e49a8-";
     public static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST";
     private static String USER_NAME_KEY = "USER_NAME";
+    public static final String NIGHT_MODE_KEY = "NIGHT_MODE";
 
     private File mTempFile = null;
 
@@ -349,6 +352,8 @@ public class LOActivity extends AppCompatActivity {
             webSettings.setJavaScriptEnabled(true);
             mWebView.addJavascriptInterface(this, "COOLMessageHandler");
 
+            webSettings.setDomStorageEnabled(true);
+
             // allow debugging (when building the debug version); see details in
             // https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
             boolean isChromeDebugEnabled = sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false);
@@ -393,7 +398,7 @@ public class LOActivity extends AppCompatActivity {
                 }
             });
 
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU && ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                 Log.i(TAG, "asking for read storage permission");
                 ActivityCompat.requestPermissions(this,
                         new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
@@ -637,6 +642,7 @@ public class LOActivity extends AppCompatActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
         if (resultCode != RESULT_OK) {
             if (requestCode == REQUEST_SELECT_IMAGE_FILE) {
                 valueCallback.onReceiveValue(null);
@@ -655,18 +661,15 @@ public class LOActivity extends AppCompatActivity {
             requestCopy = true;
             if (getMimeType().equals("text/plain")) {
                 requestCode = REQUEST_SAVEAS_ODT;
-            }
-            else if (getMimeType().equals("text/comma-separated-values")) {
+            } else if (getMimeType().equals("text/comma-separated-values")) {
                 requestCode = REQUEST_SAVEAS_ODS;
-            }
-            else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenabled.12")) {
+            } else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenabled.12")) {
                 requestCode = REQUEST_SAVEAS_ODS;
-            }
-            else {
+            } else {
                 String filename = getFileName(true);
                 String extension = filename.substring(filename.lastIndexOf('.') + 1);
                 requestCode = getRequestIDForFormat(extension);
-                assert(requestCode != 0);
+                assert (requestCode != 0);
             }
         }
         switch (requestCode) {
@@ -703,8 +706,7 @@ public class LOActivity extends AppCompatActivity {
                         inputStream = new FileInputStream(tempFile);
                         try {
                             outputStream = getContentResolver().openOutputStream(intent.getData(), "wt");
-                        }
-                        catch (FileNotFoundException e) {
+                        } catch (FileNotFoundException e) {
                             Log.i(TAG, "failed with the 'wt' mode, trying without: " + e.getMessage());
                             outputStream = getContentResolver().openOutputStream(intent.getData());
                         }
@@ -729,7 +731,7 @@ public class LOActivity extends AppCompatActivity {
                         }
                     }
                     if (requestCopy == true) {
-                        assert(_tempFile != null);
+                        assert (_tempFile != null);
                         mTempFile = _tempFile;
                         getIntent().setData(intent.getData());
                         /** add the document to recents */
@@ -858,6 +860,11 @@ public class LOActivity extends AppCompatActivity {
 
         if (isLargeScreen() && !isChromeOS())
             finalUrlToLoad += "&userinterfacemode=notebookbar";
+
+        if(isDarkMode()) {
+            finalUrlToLoad += "&darkTheme=true";
+        }
+
         // load the page
         mWebView.loadUrl(finalUrlToLoad);
 
@@ -866,6 +873,21 @@ public class LOActivity extends AppCompatActivity {
         loadDocumentMillis = android.os.SystemClock.uptimeMillis();
     }
 
+    private boolean isDarkMode() {
+        SharedPreferences recentPrefs = getSharedPreferences(EXPLORER_PREFS_KEY, MODE_PRIVATE);
+        int mode = recentPrefs.getInt(NIGHT_MODE_KEY, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+        switch (mode) {
+            case -1:
+                int darkModeFlag = getBaseContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+                return darkModeFlag == Configuration.UI_MODE_NIGHT_YES;
+            case 1:
+                return false;
+            case 2:
+                return true;
+        }
+        return false;
+    }
+
     static {
         System.loadLibrary("androidapp");
     }
@@ -960,14 +982,16 @@ public class LOActivity extends AppCompatActivity {
             });
 
         // update progress bar when loading
-        if (message.startsWith("'statusindicator") || message.startsWith("'error:")) {
+        if (message.startsWith("'progress") || message.startsWith("'error:")) {
             runOnUiThread(new Runnable() {
                 public void run() {
+                    // FIXME: parse properly with JSONObject if starts progress:
+
                     // update progress bar if it exists
-                    final String statusIndicatorSetValue = "'statusindicatorsetvalue: ";
+                    final String statusIndicatorSetValue = "'progress: { \"id\":\"setvalue\", \"value\":";
                     if (message.startsWith(statusIndicatorSetValue)) {
                         int start = statusIndicatorSetValue.length();
-                        int end = message.indexOf("'", start);
+                        int end = message.indexOf("}", start);
 
                         int progress = 0;
                         try {
@@ -977,7 +1001,8 @@ public class LOActivity extends AppCompatActivity {
 
                         mProgressDialog.determinateProgress(progress);
                     }
-                    else if (message.startsWith("'statusindicatorfinish:") || message.startsWith("'error:")) {
+                    else if (message.startsWith("'progress: { \"id\":\"finish\"") ||
+                             message.startsWith("'error:")) {
                         mProgressDialog.dismiss();
                         if (BuildConfig.GOOGLE_PLAY_ENABLED && rateAppController != null)
                             rateAppController.askUserForRating();
@@ -1124,7 +1149,7 @@ public class LOActivity extends AppCompatActivity {
         try {
             cursor = getContentResolver().query(getIntent().getData(), null, null, null, null);
             if (cursor != null && cursor.moveToFirst())
-                filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+                filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
         } catch (Exception e) {
             return null;
         }

android/lib/src/main/res/values-ast/strings.xml

@@ -17,4 +17,5 @@
     <string name="use_odf">Usar el formatu ODF</string>
     <string name="use_text">Usar el formatu Testu</string>
     <string name="convert_odf_message">Esti documentu pue contener formatu o conteníu que nun pue guardase nel formatu de ficheru «Testu».</string>
+    <string name="ask_for_copy">Esti documentu ye namái de llectura. ¿Quies facer una copia pa editala\?</string>
 </resources>

android/lib/src/main/res/values-b+be+Latn/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

android/lib/src/main/res/values-cy/strings.xml

@@ -4,7 +4,7 @@
     <string name="cannot_open_file_chooser">Methu agor dewisydd ffeiliau</string>
     <string name="failed_to_insert_image">Methwyd mewnosod delwedd</string>
     <string name="failed_to_load_file">Methwyd penderfynu pa ffeil i\'w chadw</string>
-    <string name="storage_permission_required">Mae angen caniatâd cadw.</string>
+    <string name="storage_permission_required">Mae angen caniatâd cadw</string>
     <string name="temp_file_saving_disabled">Darllen yn unig yw\'r ffeil hon, mae cadw wedi ei analluogi.</string>
     <string name="saving">Yn cadw...</string>
     <string name="preparing_for_the_first_start_after_an_update">Paratoi am y cychwyn cyntaf ar ôl diweddariad.</string>
@@ -14,4 +14,13 @@
     <string name="exiting">Gorffen...</string>
     <string name="rate_our_app_text">Os ydych yn ei hoffi, rhowch 5 seren i ni ar Google Play. Mae eich adolygiadau da yn ein hysbrydoli.</string>
     <string name="file_chromeos_read_only">Nid oes modd cadw\'r ffeil yn y lleoliad yma. Bydd angen ei symud i\'r fan Chwarae ffeiliau ar gyfer mynediad darllen/ysgrifennu llawn.</string>
+    <string name="restarting">Yn ailgychwyn...</string>
+    <string name="cant_open_the_document">Methu agor y ddogfen</string>
+    <string name="view_only">Gweld yn unig</string>
+    <string name="edit_copy">Golygu copi</string>
+    <string name="ask_for_copy">Mae\'r ddogfen hon yn ddarllen-yn-unig. Ydych chi eisiau gwneud copi i\'w olygu?</string>
+    <string name="use_text">Defnyddio Fformat Testun</string>
+    <string name="use_odf">Defnyddio Fformat ODF</string>
+    <string name="ask_for_convert_odf">Cadarnhau Fformat Ffeil</string>
+    <string name="convert_odf_message">Gall y ddogfen hon gynnwys fformatio neu gynnwys nad oes modd ei chadw yn y fformat ffeil \"Testun\" a ddewiswyd ar hyn o bryd .</string>
 </resources>

android/lib/src/main/res/values-da/strings.xml

@@ -13,4 +13,13 @@
     <string name="storage_permission_required">Lagringstilladelse er nødvendig.</string>
     <string name="file_chromeos_read_only">Denne fil kan ikke gemmes her og er skrivebeskyttet. Flyt den til Play-filerne og få fulde læse-/skrive-adgang.</string>
     <string name="temp_file_saving_disabled">Denne fil er skrivebeskyttet. Lagring er deaktiveret.</string>
+    <string name="restarting">Genstarter...</string>
+    <string name="edit_copy">Rediger en kopi</string>
+    <string name="use_text">Brug Text-format</string>
+    <string name="use_odf">Brug ODF-format</string>
+    <string name="ask_for_convert_odf">Bekræft filformat</string>
+    <string name="convert_odf_message">Dette dokument kan indeholde formatering eller indhold, som ikke kan gemmes i det valgte filformat \"Text\".</string>
+    <string name="cant_open_the_document">Dokumentet kunne ikke åbnes</string>
+    <string name="view_only">Kun visning</string>
+    <string name="ask_for_copy">Dette dokument er skrivebeskyttet. Ønsker du at lave en kopi til redigering\?</string>
 </resources>

android/lib/src/main/res/values-fa/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="temp_file_saving_disabled">این فایل فقط برای خواندن است، ذخیره غیر فعال شده است.</string>
+    <string name="storage_permission_required">دسترسی به حافظه لازم است</string>
+    <string name="failed_to_load_file">تعیین کردن فایل برای خوانش فایل ناموفق بود</string>
+</resources>

android/lib/src/main/res/values-gl/strings.xml

@@ -14,4 +14,13 @@
     <string name="later">Máis tarde</string>
     <string name="rate_now">Avaliar agora</string>
     <string name="file_chromeos_read_only">Non é posíbel gardar este ficheiro neste sitio, polo que se abre só para lectura. Móvao para os ficheiros de Play para un acceso de lectura e escritura completo.</string>
+    <string name="restarting">Reiniciando...</string>
+    <string name="cant_open_the_document">Non se puido abrilo documento</string>
+    <string name="view_only">Só ver</string>
+    <string name="ask_for_copy">Este documento é só de lectura. Queres facer unha copia para editala\?</string>
+    <string name="edit_copy">Editar unha copia</string>
+    <string name="use_text">Empregar o formato Texto</string>
+    <string name="use_odf">Empregar o formato ODF</string>
+    <string name="ask_for_convert_odf">Confirme o formato do ficheiro</string>
+    <string name="convert_odf_message">Este documento pode conter formato ou contido que non poidan ser gardados no formato de ficheiro seleccionado agora, «Texto».</string>
 </resources>

android/lib/src/main/res/values-hr/strings.xml

@@ -3,14 +3,14 @@
     <string name="loading">Učitavanje …</string>
     <string name="preparing_for_the_first_start_after_an_update">Priprema za prvo pokretanje nakon aktualiziranja.</string>
     <string name="saving">Spremanje …</string>
-    <string name="cannot_open_file_chooser">Nije moguće otvoriti izbornika datoteka</string>
+    <string name="cannot_open_file_chooser">Nije moguće otvoriti izbornik datoteka</string>
     <string name="failed_to_insert_image">Neuspjelo umetanje slike</string>
     <string name="failed_to_load_file">Neuspjelo određivanje datoteke za učitavanje</string>
     <string name="storage_permission_required">Potrebna je dozvola za spremište</string>
     <string name="temp_file_saving_disabled">Datoteka je zaštićena, spremanje je deaktivirano.</string>
     <string name="ask_for_copy">Ovaj dokument je samo-za-čitanje. Želiš li izraditi kopiju za uređivanje\?</string>
     <string name="edit_copy">Uredi kopiju</string>
-    <string name="view_only">Samo prikaz</string>
+    <string name="view_only">Samo za prikaz</string>
     <string name="restarting">Ponovo pokretanje …</string>
     <string name="exiting">Zatvaranje …</string>
     <string name="rate_our_app_text">Ako ti se sviđa, daj nam 5 zvjezdica na Google Play stranici. Tvoje dobre kritike su nam najbolja motivacija.</string>
@@ -19,8 +19,8 @@
     <string name="rate_now">Ocijeni sada</string>
     <string name="file_chromeos_read_only">Datoteku nije moguće spremiti na ovom mjestu, otvorit će se u zaštićenom stanju. Premjesti je u datoteke za reprodukciju za potpuni pristup čitanju/pisanju.</string>
     <string name="cant_open_the_document">Dokument se ne može otvoriti</string>
-    <string name="convert_odf_message">Ovaj dokument može sadržavati formatiranje ili sadržaj koji se ne može spremiti u trenutačno odabranom tekstualnom formatu datoteke.</string>
+    <string name="convert_odf_message">Ovaj dokument može sadržavati formatiranje ili sadržaj koji se ne može spremiti u trenutačno odabran datotečni format „Tekst”.</string>
     <string name="use_text">Koristi tekstualni format</string>
-    <string name="ask_for_convert_odf">Potvrdi format datoteke</string>
+    <string name="ask_for_convert_odf">Potvrdi datotečni format</string>
     <string name="use_odf">Koristi ODF format</string>
 </resources>

android/lib/src/main/res/values-ia/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="storage_permission_required">Es requirite un permission de immagazinage</string>
+</resources>

android/lib/src/main/res/values-it/strings.xml

@@ -18,4 +18,9 @@
     <string name="edit_copy">Modifica una copia</string>
     <string name="view_only">Visualizza solo</string>
     <string name="restarting">Riavvio…</string>
+    <string name="use_text">Utilizza il formato di testo</string>
+    <string name="use_odf">Utilizza il formato ODF</string>
+    <string name="ask_for_convert_odf">Conferma il formato del file</string>
+    <string name="convert_odf_message">Questo documento può contenere formattazione o contenuto che non può essere salvato nel formato di file attualmente selezionato \"testo\".</string>
+    <string name="cant_open_the_document">Impossibile aprire il documento</string>
 </resources>

android/lib/src/main/res/values-ja/strings.xml

@@ -7,7 +7,19 @@
     <string name="view_only">表示のみ</string>
     <string name="edit_copy">コピーを編集する</string>
     <string name="ask_for_copy">このドキュメントは読み取り専用です。編集用にコピーを作成しますか？</string>
-    <string name="restarting">再起動しています...</string>
+    <string name="restarting">再起動中...</string>
     <string name="exiting">終了しています...</string>
     <string name="rate_our_app_title">%1$s をご利用いただきありがとうございます！</string>
+    <string name="rate_now">今すぐ評価</string>
+    <string name="later">あとで</string>
+    <string name="use_text">テキスト形式を使用する</string>
+    <string name="use_odf">ODF フォーマットを使用する</string>
+    <string name="cant_open_the_document">ドキュメントを開くことが出来ませんでした</string>
+    <string name="file_chromeos_read_only">このファイルは選択した場所に保存できません。選択した場所は読み取り専用です。読み書き可能なフォルダを選択してください。</string>
+    <string name="ask_for_convert_odf">ファイルフォーマットの確認</string>
+    <string name="convert_odf_message">このドキュメントには、現在選択されているファイル形式「テキスト」で保存できない形式やコンテンツが含まれる場合があります.</string>
+    <string name="rate_our_app_text">お気に召されましたら、Google Playで5つ星を付与してください。 あなたの素晴らしいレビューは私たちにとって最高のモチベーションとなります。</string>
+    <string name="failed_to_load_file">ファイルの読み込み先が特定できませんでした</string>
+    <string name="cannot_open_file_chooser">選択したファイルを開けません</string>
+    <string name="preparing_for_the_first_start_after_an_update">更新後の開始を準備しています。</string>
 </resources>

android/lib/src/main/res/values-jv/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

android/lib/src/main/res/values-ko/strings.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="temp_file_saving_disabled">이 파일은 읽기 전용이며, 저장이 비활성화됩니다.</string>
+    <string name="file_chromeos_read_only">이 파일은 이 위치에 저장할 수 없으며, 읽기 전용으로 열립니다. 전체 읽기/쓰기 액세스를 위해 재생 파일로 이동합니다.</string>
+    <string name="storage_permission_required">저장 권한이 필요합니다</string>
+    <string name="failed_to_load_file">불러올 파일을 결정하지 못하였습니다</string>
+    <string name="failed_to_insert_image">이미지를 삽입하지 못했습니다</string>
+    <string name="cannot_open_file_chooser">파일 선택기를 열 수 없습니다</string>
+    <string name="preparing_for_the_first_start_after_an_update">업데이트 후 첫 번째 시작을 준비하는 중입니다.</string>
+    <string name="rate_now">지금 평가</string>
+    <string name="rate_our_app_title">%1$s를 이용해 주셔서 감사합니다!</string>
+    <string name="loading">불러오는 중...</string>
+    <string name="exiting">종료 중...</string>
+    <string name="restarting">다시 시작하는 중...</string>
+    <string name="cant_open_the_document">문서를 열 수 없습니다</string>
+    <string name="view_only">보기 전용</string>
+    <string name="edit_copy">사본 편집하기</string>
+    <string name="ask_for_copy">이 문서는 읽기 전용입니다. 편집을 위해 사본을 만드시겠습니까\?</string>
+    <string name="use_text">텍스트 형식 사용하기</string>
+    <string name="use_odf">ODF 형식 사용하기</string>
+    <string name="ask_for_convert_odf">파일 형식 확정하기</string>
+    <string name="convert_odf_message">이 문서에는 현재 선택한 \"텍스트\" 파일 형식으로 저장할 수 없는 서식 또는 콘텐츠가 포함되어 있을 수 있습니다.</string>
+</resources>

android/lib/src/main/res/values-ml/strings.xml

@@ -1,2 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="edit_copy">ഒരു പകർപ്പ് തിരുത്തുക</string>
+    <string name="storage_permission_required">സംഭരണ അനുമതി ആവശ്യമാണ്</string>
+    <string name="failed_to_insert_image">ചിത്രം ചേർക്കുന്നതിൽ പരാജയപ്പെട്ടു</string>
+    <string name="preparing_for_the_first_start_after_an_update">ഒരു പുതുക്കലിനുശേഷം ആദ്യ തുടക്കത്തിനായി തയ്യാറെടുക്കുന്നു.</string>
+    <string name="rate_now">ഇപ്പോൾ നിരക്ക് ചെയ്യുക</string>
+    <string name="later">പിന്നീട്</string>
+    <string name="rate_our_app_title">%1$s ഉപയോഗിച്ചതിന് നന്ദി!</string>
+    <string name="exiting">പുറത്തുകടക്കുന്നു...</string>
+    <string name="restarting">പുനരാരംഭിക്കുന്നു...</string>
+    <string name="view_only">കാണുക മാത്രം</string>
+    <string name="cant_open_the_document">പ്രമാണം തുറക്കാനായില്ല</string>
+    <string name="ask_for_copy">ഈ പ്രമാണം വായിക്കാൻ മാത്രമുള്ളതാണ്. തിരുത്താൻ നിങ്ങൾക്ക് ഒരു പകർപ്പ് നിർമ്മിക്കണോ\?</string>
+    <string name="rate_our_app_text">നിങ്ങൾക്കിത് ഇഷ്‌ടമാണെങ്കിൽ, ഗൂഗിൾ പ്ലേസ്റ്റോറിൽ ഞങ്ങൾക്ക് 5 നക്ഷത്രങ്ങൾ നൽകുക. നിങ്ങളുടെ നല്ല അവലോകനങ്ങളാണ് ഞങ്ങളുടെ മികച്ച പ്രചോദനം.</string>
+</resources>

android/lib/src/main/res/values-nb-rNO/strings.xml

@@ -19,4 +19,8 @@
     <string name="view_only">Kun visning</string>
     <string name="restarting">Starter på ny…</string>
     <string name="cant_open_the_document">Kunne ikke åpne dokumentet</string>
+    <string name="convert_odf_message">Dette dokumentet kan inneholde formatering eller innhold som ikke kan lagres i det for øyeblikket valgte filformatet \"Tekst\".</string>
+    <string name="use_odf">Bruk ODF format</string>
+    <string name="ask_for_convert_odf">Bekreft filformat</string>
+    <string name="use_text">Bruk tekstformat</string>
 </resources>

android/lib/src/main/res/values-ne/strings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="failed_to_load_file">लोड गर्न फाइल निर्धारण गर्न असफल</string>
+    <string name="temp_file_saving_disabled">यो फाइल पढ्ने मात्र हो, बचत अक्षम छ।</string>
+    <string name="storage_permission_required">भण्डारण अनुमति आवश्यक छ</string>
+    <string name="later">पछि</string>
+    <string name="rate_our_app_text">यदि तपाईंलाई यो मनपर्छ भने, कृपया हामीलाई गुगल प्ले मा ५ ताराहरू दिनुहोस्। तपाईंको राम्रो समीक्षा हाम्रो सबै भन्दा राम्रो प्रेरणा हो।</string>
+    <string name="loading">लोडहुँदै छ...</string>
+    <string name="exiting">बाहिर निस्कँदै...</string>
+    <string name="restarting">पुन: सुरु गर्दै...</string>
+    <string name="cant_open_the_document">कागजात खोल्न सकेन</string>
+    <string name="view_only">हेर्नुहोस मात्र</string>
+    <string name="edit_copy">प्रतिलिपि सम्पादन गर्नुहोस्</string>
+    <string name="ask_for_copy">यो कागजात पढ्ने मात्र हो। के तपाइँ सम्पादनको लागि प्रतिलिपि बनाउन चाहनुहुन्छ\?</string>
+    <string name="use_text">शब्द ढाँचा प्रयोग गर्नुहोस्</string>
+    <string name="use_odf">ODF ढाँचा प्रयोग गर्नुहोस्</string>
+    <string name="ask_for_convert_odf">फाइल ढाँचा पुष्टि गर्नुहोस्</string>
+    <string name="convert_odf_message">यस कागजातमा ढाँचा वा सामग्री हुन सक्छ जुन हाल चयन गरिएको फाइल ढाँचा \"पाठ\" मा बचत गर्न सकिँदैन।</string>
+    <string name="file_chromeos_read_only">यो फाइल यस स्थानमा बचत गर्न सकिँदैन, यसलाई पढ्न-मात्र खोल्दै। पूर्ण पढ्न/लेखन पहुँचको लागि यसलाई प्ले फाइलहरूमा सार्नुहोस्।</string>
+    <string name="failed_to_insert_image">छवि सम्मिलित गर्न असफल भयो</string>
+    <string name="rate_now">अहिले मूल्याङ्कन गर्नुहोस्</string>
+    <string name="rate_our_app_title">%1$s प्रयोग गर्नुभएकोमा धन्यवाद!</string>
+    <string name="cannot_open_file_chooser">फाइल चयनकर्ता खोल्न सकिँदैन</string>
+    <string name="preparing_for_the_first_start_after_an_update">अपडेट पछि पहिलो सुरुवातको लागि तयारी गर्दै।</string>
+</resources>

android/lib/src/main/res/values-nl/strings.xml

@@ -15,7 +15,7 @@
     <string name="exiting">Afsluiten...</string>
     <string name="ask_for_copy">Dit document is alleen-lezen. Wil je een kopie maken om te bewerken\?</string>
     <string name="edit_copy">Bewerk een kopie</string>
-    <string name="view_only">Alleen-lezen</string>
+    <string name="view_only">Alleen bekijken</string>
     <string name="restarting">Opnieuw starten...</string>
     <string name="file_chromeos_read_only">Het bestand kan op deze locatie niet worden bewaard; het wordt alleen-lezen geopend. Verplaats het naar Play-bestanden voor volledige lees- en schrijftoegang.</string>
     <string name="use_text">Gebruik Tekst-opmaak</string>

android/lib/src/main/res/values-or/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

android/lib/src/main/res/values-pt-rBR/strings.xml

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="temp_file_saving_disabled">Este documento é apenas de leitura, salvaguardar está desabilitado.</string>
+    <string name="temp_file_saving_disabled">Este arquivo é apenas de leitura, salvamento está desabilitado.</string>
     <string name="storage_permission_required">Permissão de armazenamento é requirida</string>
-    <string name="failed_to_load_file">Falha no carregamento do documento</string>
-    <string name="failed_to_insert_image">Falha ao inserir imagem</string>
-    <string name="cannot_open_file_chooser">Não foi possível abrir o gestor de arquivos</string>
+    <string name="failed_to_load_file">Falha para determinar o arquivo a ser carregado</string>
+    <string name="failed_to_insert_image">Falha para inserir imagem</string>
+    <string name="cannot_open_file_chooser">Não foi possível abrir o gerenciador de arquivos</string>
     <!-- Loading SlideShow Dialog Strings -->
     <string name="loading">Carregando...</string>
     <string name="saving">Salvando...</string>
     <string name="preparing_for_the_first_start_after_an_update">Preparando para iniciar após uma atualização.</string>
     <string name="rate_now">Avaliar agora</string>
-    <string name="rate_our_app_text">Se gostou dele, marque 5 estrelas no Google Play. Sua avaliação positiva é nossa melhor motivação.</string>
+    <string name="rate_our_app_text">Se você gostar, por favor, dê-nos 5 estrelas no Google Play. Suas boas críticas são nossa melhor motivação.</string>
     <string name="rate_our_app_title">Obrigado por usar %1$s!</string>
     <string name="later">Mais tarde</string>
     <string name="exiting">Saindo...</string>
-    <string name="file_chromeos_read_only">Este arquivo não pode ser salvo neste local, abrindo-o em só leitura. Mova-o para os arquivos de Play para poder ler e gravar o arquivo.</string>
+    <string name="file_chromeos_read_only">Este arquivo não pode ser salvo nesse local, abrindo-o como somente leitura. Mova-o para os arquivos Play para ter acesso total de leitura/gravação.</string>
     <string name="ask_for_copy">Este documento é somente para leitura. Você quer fazer uma cópia para editá-lo\?</string>
     <string name="edit_copy">Editar uma cópia</string>
     <string name="view_only">Apenas visualização</string>
     <string name="restarting">Reiniciando...</string>
     <string name="cant_open_the_document">Não foi possível abrir o documento</string>
+    <string name="use_odf">Usar Formato ODF</string>
+    <string name="ask_for_convert_odf">Confirmar formato de arquivo</string>
+    <string name="use_text">Usar Formato de Texto</string>
+    <string name="convert_odf_message">Este documento pode conter formatação ou conteúdo que não pode ser salvo no formato de arquivo \"Texto\" atualmente selecionado.</string>
 </resources>

android/lib/src/main/res/values-pt/strings.xml

@@ -9,8 +9,8 @@
     <string name="preparing_for_the_first_start_after_an_update">Estamos a preparar o arranque após a atualização.</string>
     <string name="saving">A guardar...</string>
     <string name="exiting">A sair...</string>
-    <string name="rate_our_app_text">Se gostou da aplicação, assinale 5 estrelas na Google Play. As avaliações positivas proporcionam motivação.</string>
-    <string name="rate_our_app_title">Obrigado por utilizar %1$s!</string>
+    <string name="rate_our_app_text">Se gostou da aplicação, dê-nos 5 estrelas no Google Play. As avaliações positivas são a nossa maior motivação.</string>
+    <string name="rate_our_app_title">Obrigado por utilizar o %1$s!</string>
     <string name="later">Mais tarde</string>
     <string name="rate_now">Avaliar agora</string>
     <string name="file_chromeos_read_only">O ficheiro não pode ser guardado neste local. Mova-o para os ficheiros \'Play\' de modo a que o possa ler/escrever.</string>

android/lib/src/main/res/values-sq/strings.xml

@@ -1,2 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="rate_now">Vlerësojeni tani</string>
+    <string name="cant_open_the_document">S’u hap dot dokumenti</string>
+    <string name="temp_file_saving_disabled">Kjo kartelë është vetëm-lexim, ruajtja është e çaktivizuar.</string>
+    <string name="file_chromeos_read_only">Kjo kartelë s’mund të ruhet në këtë vend, po hapet si vetëm-lexim. Për përdorim të plotë lexim/shkrim, kalojeni te kartelat Play.</string>
+    <string name="storage_permission_required">Lypset leje depozitimi</string>
+    <string name="failed_to_load_file">S’u arrit të përcaktohej kartela për ngarkim</string>
+    <string name="failed_to_insert_image">S’u arrit të futej figurë</string>
+    <string name="cannot_open_file_chooser">S’hapet dot zgjedhës kartelash</string>
+    <string name="preparing_for_the_first_start_after_an_update">Po përgatitet për nisjen e parë pas një përditësimi.</string>
+    <string name="later">Më vonë</string>
+    <string name="rate_our_app_title">Faleminderit që përdorni %1$s!</string>
+    <string name="rate_our_app_text">Nëse e pëlqeni, jepnani 5 yje në Google Play. Shqyrtimet tuaja dashamirëse janë motivimi ynë më i mirë.</string>
+    <string name="loading">Po ngarkohet…</string>
+    <string name="exiting">Po dilet…</string>
+    <string name="restarting">Po riniset…</string>
+    <string name="view_only">Vetëm parje</string>
+    <string name="edit_copy">Përpunoni një kopje</string>
+    <string name="ask_for_copy">Ky dokument është vetëm-lexim. Doni të bëhet një kopje për përpunim\?</string>
+    <string name="use_text">Përdor Formatin Tekst</string>
+    <string name="use_odf">Përdorim Formatin ODF</string>
+    <string name="ask_for_convert_odf">Ripohoni Format Kartele</string>
+    <string name="convert_odf_message">Ky dokument mund të përmbajë formatim, ose lëndë që s’mund të ruhet nën formatin e përzgjedhur aktualisht “Tekst”.</string>
+</resources>

android/lib/src/main/res/values/strings.xml

@@ -20,7 +20,6 @@
     <string name="view_only">View only</string>
     <string name="edit_copy">Edit a copy</string>
     <string name="ask_for_copy">This document is read-only. Do you want to make a copy for editing\?</string>
-
     <string name="use_text">Use Text Format</string>
     <string name="use_odf">Use ODF Format</string>
     <string name="ask_for_convert_odf">Confirm File Format</string>

autogen.sh

@@ -3,7 +3,6 @@
 srcdir=`dirname $0`
 test -n "$srcdir" || srcdir=.
 
-olddir=`pwd`
 cd "$srcdir"
 
 function failed {
@@ -32,10 +31,22 @@ autoreconf || failed "autoreconf"
 
 scripts/refresh-git-hooks || failed "refresh-git-hooks"
 
+if [ $# -gt 0 ]; then
+    # If we got parameters, we can execute configure directly.
+    echo -n "Result: All went OK, running $srcdir/configure "
+    for arg in "$@"
+    do
+        echo -n "'${arg}' "
+    done
+    echo "now."
+    $srcdir/configure "$@" || failed "configure"
+    exit 0
+fi
+
 cat << EOF
 
 Result: All went OK, please run $srcdir/configure (with the appropriate parameters) now.
 
 EOF
 
-cd "$olddir"
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

browser/.beforeprettier

@@ -0,0 +1,221 @@
+/src/control/ColorPicker.js
+/src/control/Control.AlertDialog.js
+/src/control/Control.Attribution.js
+/src/control/Control.ColumnGroup.ts
+/src/control/Control.ColumnHeader.ts
+/src/control/Control.Command.js
+/src/control/Control.ContextMenu.js
+/src/control/Control.CornerGroup.ts
+/src/control/Control.CornerHeader.ts
+/src/control/Control.DocumentNameInput.js
+/src/control/Control.DocumentRepair.js
+/src/control/Control.DownloadProgress.js
+/src/control/Control.FormulaBar.js
+/src/control/Control.FormulaBarJSDialog.js
+/src/control/Control.GroupBase.ts
+/src/control/Control.Header.ts
+/src/control/Control.IdleHandler.ts
+/src/control/Control.js
+/src/control/Control.JSDialog.js
+/src/control/Control.JSDialogBuilder.js
+/src/control/Control.LanguageDialog.js
+/src/control/Control.Layers.js
+/src/control/Control.LokDialog.js
+/src/control/Control.Menubar.js
+/src/control/Control.MobileBottomBar.js
+/src/control/Control.MobileSlide.js
+/src/control/Control.MobileTopBar.ts
+/src/control/Control.MobileWizard.js
+/src/control/Control.MobileWizardBuilder.js
+/src/control/Control.MobileWizardPopup.js
+/src/control/Control.MobileWizardWindow.js
+/src/control/Control.Notebookbar.js
+/src/control/Control.NotebookbarBuilder.js
+/src/control/Control.NotebookbarCalc.js
+/src/control/Control.NotebookbarDraw.js
+/src/control/Control.NotebookbarImpress.js
+/src/control/Control.NotebookbarWriter.js
+/src/control/Control.PartsPreview.js
+/src/control/Control.Permission.js
+/src/control/Control.PresentationBar.js
+/src/control/Control.RowGroup.ts
+/src/control/Control.RowHeader.ts
+/src/control/Control.Scroll.Annotation.js
+/src/control/Control.SearchBar.js
+/src/control/Control.Selection.js
+/src/control/Control.SheetsBar.js
+/src/control/Control.Sidebar.js
+/src/control/Control.StatusBar.js
+/src/control/Control.Tabs.js
+/src/control/Control.Toolbar.js
+/src/control/Control.TopToolbar.js
+/src/control/Control.UIManager.js
+/src/control/Control.UserList.js
+/src/control/Control.Zotero.js
+/src/control/IFrameDialog.js
+/src/control/jsdialog/Util.Dropdown.js
+/src/control/jsdialog/Util.FocusCycle.js
+/src/control/jsdialog/Util.ModalHelper.js
+/src/control/jsdialog/Util.StateChange.ts
+/src/control/jsdialog/Widget.Calendar.js
+/src/control/jsdialog/Widget.Combobox.js
+/src/control/jsdialog/Widget.DrawingArea.js
+/src/control/jsdialog/Widget.FormulabarEdit.js
+/src/control/jsdialog/Widget.Frame.js
+/src/control/jsdialog/Widget.IconView.js
+/src/control/jsdialog/Widget.LanguageSelector.js
+/src/control/jsdialog/Widget.MenuButton.js
+/src/control/jsdialog/Widget.MobileBorderSelector.js
+/src/control/jsdialog/Widget.MobileTabControl.js
+/src/control/jsdialog/Widget.MultilineEdit.js
+/src/control/jsdialog/Widget.Progressbar.js
+/src/control/jsdialog/Widget.ScrolledWindow.js
+/src/control/jsdialog/Widget.Timefield.js
+/src/control/jsdialog/Widget.TreeView.js
+/src/control/Parts.js
+/src/control/Permission.js
+/src/control/Ruler.js
+/src/control/Scroll.js
+/src/control/Search.js
+/src/control/Signing.js
+/src/control/Styles.js
+/src/control/Toolbar.js
+/src/core/Class.js
+/src/core/Debug.js
+/src/core/Events.js
+/src/core/Handler.js
+/src/core/Log.js
+/src/core/LOUtil.js
+/src/core/Matrix.js
+/src/core/geometry.ts
+/src/core/Rectangle.ts
+/src/core/Socket.js
+/src/core/Util.js
+/src/docstate.js
+/src/dom/DomEvent.js
+/src/dom/DomEvent.MultiClick.js
+/src/dom/DomEvent.Pointer.js
+/src/dom/DomUtil.js
+/src/dom/Draggable.js
+/src/dom/NotebookbarAccessibility.js
+/src/dom/NotebookbarAccessibilityDefinitions.js
+/src/dom/PosAnimation.js
+/src/dom/PosAnimation.Timer.js
+/src/errormessages.js
+/src/geo/crs/CRS.js
+/src/geo/LatLng.js
+/src/geo/LatLngBounds.js
+/src/geo/projection/Projection.LonLat.js
+/src/geometry/Bounds.ts
+/src/geometry/LineUtil.js
+/src/geometry/Point.ts
+/src/geometry/PolyUtil.js
+/src/geometry/Transformation.ts
+/src/layer/BackgroundColor.js
+/src/layer/CalcSplitPanesContext.ts
+/src/layer/FeatureGroup.js
+/src/layer/FormFieldButtonLayer.js
+/src/layer/Layer.js
+/src/layer/Layer.Popup.js
+/src/layer/LayerGroup.js
+/src/layer/marker/A11yTextInput.js
+/src/layer/marker/Cursor.ts
+/src/layer/marker/DivIcon.js
+/src/layer/marker/Icon.Default.js
+/src/layer/marker/Icon.js
+/src/layer/marker/Marker.Drag.js
+/src/layer/marker/Marker.js
+/src/layer/marker/Marker.Popup.js
+/src/layer/marker/ProgressOverlay.js
+/src/layer/marker/TextInput.js
+/src/layer/Popup.js
+/src/layer/SplitPanesContext.ts
+/src/canvas/sections/AutoFillMarkerSection.ts
+/src/canvas/sections/CellCursorSection.ts
+/src/canvas/sections/CellSelectionHandleSection.ts
+/src/canvas/sections/HTMLObjectSection.ts
+/src/canvas/sections/CalcValidityDropDownSection.ts
+/src/canvas/sections/TextSelectionHandleSection.ts
+/src/layer/tile/CalcTileLayer.js
+/src/canvas/CanvasSectionContainer.ts
+/src/canvas/CanvasSectionObject.ts
+/src/canvas/CanvasSectionProps.js
+/src/layer/tile/CanvasTileLayer.js
+/src/canvas/sections/CommentListSection.ts
+/src/canvas/sections/CalcGridSection.ts
+/src/canvas/sections/SplitSection.ts
+/src/canvas/sections/PixelGridSection.ts
+/src/canvas/sections/CommentSection.ts
+/src/canvas/sections/ContentControlSection.ts
+/src/layer/tile/ImpressTileLayer.js
+/src/canvas/sections/ScrollSection.ts
+/src/layer/tile/SheetGeometry.ts
+/src/layer/tile/SheetSwitch.ts
+/src/layer/tile/TileLayer.TableOverlay.js
+/src/canvas/sections/TilesSection.ts
+/src/layer/tile/WriterTileLayer.js
+/src/layer/vector/Canvas.js
+/src/layer/vector/CanvasOverlay.ts
+/src/layer/vector/CDarkOverlay.ts
+/src/layer/vector/CEventsHandler.ts
+/src/layer/vector/Circle.js
+/src/layer/vector/CircleMarker.js
+/src/layer/vector/CLineUtil.ts
+/src/layer/vector/CPath.ts
+/src/layer/vector/CPointSet.ts
+/src/layer/vector/CPolygon.ts
+/src/layer/vector/CPolyline.ts
+/src/layer/vector/CPolyUtil.ts
+/src/layer/vector/CRectangle.ts
+/src/layer/vector/CSplitterLine.ts
+/src/layer/vector/Path.Drag.js
+/src/layer/vector/Path.Drag.Transform.js
+/src/layer/vector/Path.js
+/src/layer/vector/Path.Popup.js
+/src/layer/vector/Path.Transform.Canvas.js
+/src/layer/vector/Path.Transform.js
+/src/layer/vector/Path.Transform.SVG.js
+/src/layer/vector/Path.Transform.SVG.VML.js
+/src/layer/vector/Path.Transform.Util.js
+/src/layer/vector/Polygon.js
+/src/layer/vector/Polyline.js
+/src/layer/vector/Rectangle.js
+/src/layer/vector/Renderer.js
+/src/layer/vector/SplitPanesRenderer.js
+/src/layer/vector/SplitPanesSVG.js
+/src/layer/vector/SVG.js
+/src/layer/vector/SVG.VML.js
+/src/layer/vector/SVGGroup.js
+/src/main.js
+/src/map/anim/Map.PanAnimation.js
+/src/map/Clipboard.js
+/src/map/handler/Map.DoubleClickZoom.js
+/src/map/handler/Map.Drag.js
+/src/map/handler/Map.Feedback.js
+/src/map/handler/Map.FileInserter.js
+/src/map/handler/Map.Keyboard.js
+/src/map/handler/Map.KeyboardShortcuts.ts
+/src/map/handler/Map.Mouse.js
+/src/map/handler/Map.Print.js
+/src/map/handler/Map.Scroll.js
+/src/map/handler/Map.SlideShow.js
+/src/map/handler/Map.StateChanges.js
+/src/map/handler/Map.TouchGesture.js
+/src/map/handler/Map.VersionBar.js
+/src/map/handler/Map.Welcome.js
+/src/map/handler/Map.WOPI.js
+/src/map/Map.js
+/src/UNO/Key.js
+/js/global.js
+/js/ResizeObserverPolyfill.js
+/admin/src/AdminClusterOverview.js
+/admin/src/AdminClusterOverviewAbout.js
+/admin/src/AdminSocketAnalytics.js
+/admin/src/AdminSocketBase.js
+/admin/src/AdminSocketHistory.js
+/admin/src/AdminSocketLog.js
+/admin/src/AdminSocketOverview.js
+/admin/src/AdminSocketSettings.js
+/admin/src/Base.js
+/admin/src/ModalDialogCreator.ts
+/admin/src/Util.js

browser/.eslintignore

@@ -1,12 +1,8 @@
 # We only directly edit toolbar.js in dist/
 **/js/Autolinker.js
-**/js/json2.js
 **/js/select2.js
-**/js/vex.combined.js
 **/js/sanitize-url.js
 **/js/l10n.js
-**/js/w2ui-1.5.rc1.js
 **/src/unocommands.js
-**/js/viamapi-client.js
 node_modules
-dist/src
+dist/src

browser/.eslintrc

@@ -1,26 +1,23 @@
 {
-  "extends": "eslint:recommended",
+  "extends": [
+    "eslint:recommended",
+    "prettier"
+  ],
   "rules": {
-    "camelcase": 2,
-    "quotes": [2, "single"],
     "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
-    "space-in-parens": 2,
-    "space-before-blocks": 2,
-    "keyword-spacing": 2,
     "no-lonely-if": 2,
-    "comma-style": 2,
-    "indent": [2, "tab", {"VariableDeclarator": 0}],
     "no-underscore-dangle": 0,
     "no-constant-condition": 0,
-    "no-multi-spaces": 0,
     "strict": 0,
-    "key-spacing": 0,
     "no-shadow": 0,
     "no-console": 0,
     "no-control-regex": 0,
     "no-useless-escape": 0,
-    "semi": 2,
-    "no-redeclare": 0
+    "no-redeclare": 0,
+    /// Rules that are set to warn will fail in CI but not when building for development:
+    "no-debugger": 1,
+    "no-unreachable": 1,
+    "no-unused-vars": 1,
   },
   "globals": {
     "L": true,
@@ -30,6 +27,9 @@
   "env": {
     "browser": true
   },
+  "parserOptions": {
+    "ecmaVersion": 2017
+  },
   "overrides": [
     {
       "files": ["**/*.ts"],

browser/.gitignore

@@ -8,8 +8,10 @@ index.html
 bower.json
 component.json
 
+mocha.log
 mocha_tests/*.js
 tscompile.done
+duplication.log
 
 _site
 dist/*.js

browser/.prettierignore

@@ -0,0 +1,8 @@
+# We only directly edit toolbar.js in dist/
+**/js/Autolinker.js
+**/js/select2.js
+**/js/sanitize-url.js
+**/js/l10n.js
+**/src/unocommands.js
+node_modules
+dist/src

browser/.prettierrc

@@ -0,0 +1 @@
+singleQuote: true

browser/Makefile.am

@@ -31,14 +31,16 @@ endif
 MOCHA_DIR = $(srcdir)/mocha_tests
 MOCHA_TS_FILES = $(wildcard $(MOCHA_DIR)/*.ts)
 MOCHA_TS_JS_FILES := $(MOCHA_TS_FILES:.ts=.js)
+# tsc can report a failure, but still create a .js and a second make attempt will succeed,
+# so if this returns an error then delete the target
 $(MOCHA_TS_JS_FILES): %.js: %.ts
-	$(builddir)/node_modules/typescript/bin/tsc $< --outfile $@ --module none --lib dom,es2016 --target ES5
+	$(builddir)/node_modules/typescript/bin/tsc $< --outfile $@ --module none --lib dom,es2016 --target ES5 || (rm -f $@ && false)
 
 JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness
 JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png)
 JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
 
-JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui-dist/images
+JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/images
 JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png)
 JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES))
 
@@ -54,8 +56,10 @@ endif
 COOL_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
 COOL_HTML_DST = $(patsubst $(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(COOL_HTML_SRC))
 
+if ENABLE_WELCOME_MESSAGE
 COOL_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*')
 COOL_WELCOME_DST = $(patsubst $(srcdir)/welcome/%,$(DIST_FOLDER)/welcome/%,$(COOL_WELCOME_SRC))
+endif
 
 COOL_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name '*.css' -or -name '*.ttf' -or -name 'OFL.txt' -or -name '*.svg')
 COOL_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
@@ -103,55 +107,48 @@ COOL_ADMIN_JS =\
 	admin/src/AdminSocketAnalytics.js \
 	admin/src/AdminSocketSettings.js \
 	admin/src/AdminSocketHistory.js \
-	admin/src/AdminSocketLog.js
+	admin/src/AdminSocketLog.js \
+	admin/src/AdminClusterOverview.js \
+	admin/src/AdminClusterOverviewAbout.js
 
 NODE_MODULES_SRC =\
 	autolinker@3.14.1 \
 	json-js@1.1.2 \
 	select2@4.0.13 \
-	vex-js@4.1.0 \
 	l10n-for-node@0.0.1 \
-	@braintree/sanitize-url@4.0.1
+	@braintree/sanitize-url@6.0.0
 
 COOL_CSS_LST =\
 	$(builddir)/node_modules/select2/dist/css/select2.css \
-	$(srcdir)/css/w2ui-1.5.rc1.css \
 	$(srcdir)/css/leaflet.css \
 	$(srcdir)/css/leaflet-spinner.css \
 	$(srcdir)/css/selectionMarkers.css \
 	$(srcdir)/css/color-palette.css \
+	$(srcdir)/css/color-palette-dark.css \
 	$(srcdir)/css/cool.css \
 	$(srcdir)/css/toolbar.css \
-	$(srcdir)/css/toolbar-mobile.css \
 	$(srcdir)/css/partsPreviewControl.css \
 	$(srcdir)/css/searchControl.css \
 	$(srcdir)/css/impress.css \
 	$(srcdir)/css/impress-mobile.css \
 	$(srcdir)/css/spreadsheet.css \
 	$(srcdir)/css/writer-mobile.css \
-	$(srcdir)/css/editor.css \
+	$(srcdir)/css/writer.css \
+	$(srcdir)/css/iframedialog.css \
 	$(builddir)/node_modules/jquery-contextmenu/dist/jquery.contextMenu.css \
-	$(builddir)/node_modules/vex-js/dist/css/vex.css \
-	$(builddir)/node_modules/vex-js/dist/css/vex-theme-plain.css \
-	$(builddir)/node_modules/vex-js/dist/css/vex-theme-bottom-right-corner.css \
 	$(builddir)/node_modules/smartmenus/dist/css/sm-core-css.css \
 	$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
+	$(srcdir)/css/welcome.css \
 	$(srcdir)/css/menubar.css \
 	$(srcdir)/css/mobilewizard.css \
 	$(srcdir)/css/jsdialogs.css \
 	$(srcdir)/css/btns.css \
 	$(srcdir)/css/notebookbar.css \
 	$(srcdir)/css/jssidebar.css \
-	$(srcdir)/css/override-vex.css \
 	$(srcdir)/css/override-smartmenus.css \
 	$(srcdir)/css/jquery-ui-lightness.css \
 	$(srcdir)/css/infobar.css
 
-if ENABLE_FEEDBACK
-COOL_CSS_LST += $(srcdir)/css/iframedialog.css \
-	$(srcdir)/css/welcome.css
-endif
-
 COOL_CSS = $(filter %,$(COOL_CSS_LST))
 
 COOL_CSS_DST = $(foreach file,$(COOL_CSS),$(DIST_FOLDER)/$(notdir $(file)))
@@ -164,15 +161,15 @@ NODE_MODULES_JS =\
 	node_modules/jquery/dist/jquery.js \
 	node_modules/jquery-mousewheel/jquery.mousewheel.js \
 	node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
-	node_modules/jquery-ui-dist/jquery-ui.js \
-	node_modules/smartmenus/dist/jquery.smartmenus.js
+	node_modules/jquery-ui/dist/jquery-ui.js \
+	$(shell find node_modules/jquery-ui/ui/i18n -name '*.js') \
+	node_modules/smartmenus/dist/jquery.smartmenus.js \
+	node_modules/fzstd/umd/index.js
 
 COOL_LIBS_JS =\
 	ResizeObserverPolyfill.js \
 	Autolinker.js \
-	json2.js \
 	select2.js \
-	vex.combined.js \
 	sanitize-url.js
 
 if !ENABLE_MOBILEAPP
@@ -180,10 +177,6 @@ COOL_LIBS_JS +=\
 	l10n.js
 endif
 
-COOL_LIBS_JS +=\
-	w2ui-1.5.rc1.js \
-	viamapi-client.js
-
 NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
 NODE_MODULES_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(NODE_MODULES_JS))
 
@@ -194,6 +187,9 @@ COOL_LIBS_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(COOL_LIBS_JS))
 # this list includes both Javascript and Typescript generated files
 # in a rather precise order.
 COOL_JS_LST =\
+	src/docstate.js \
+	src/docstatefunctions.js \
+	src/docdispatcher.ts \
 	src/Leaflet.js \
 	src/errormessages.js \
 	src/unocommands.js \
@@ -201,10 +197,13 @@ COOL_JS_LST =\
 	src/core/Log.js \
 	src/core/Util.js \
 	src/core/LOUtil.js \
+	src/core/geometry.ts \
+	src/core/Rectangle.ts \
 	src/core/Class.js \
 	src/core/Events.js \
 	src/core/Socket.js \
 	src/core/Matrix.js \
+	src/core/Debug.js \
 	src/geometry/Point.ts \
 	src/geometry/Bounds.ts \
 	src/geometry/Transformation.ts \
@@ -212,17 +211,28 @@ COOL_JS_LST =\
 	src/geo/LatLngBounds.js \
 	src/geo/projection/Projection.LonLat.js \
 	src/geo/crs/CRS.js \
-	src/geo/crs/CRS.Simple.js \
+	src/control/IFrameDialog.js \
 	src/map/Map.js \
+	src/control/Control.IdleHandler.ts \
 	src/map/Clipboard.js \
+	src/layer/tile/SheetSwitch.ts \
 	src/layer/Layer.js \
 	src/layer/tile/SheetGeometry.ts \
-	src/layer/tile/CanvasSectionProps.js \
-	src/layer/tile/CanvasSectionContainer.ts \
-	src/layer/tile/CommentSection.ts \
-	src/layer/tile/CommentListSection.ts \
-	src/layer/tile/TilesSection.ts \
-	src/layer/tile/AutoFillMarkerSection.ts \
+	src/canvas/CanvasSectionProps.js \
+	src/canvas/CanvasSectionContainer.ts \
+	src/canvas/CanvasSectionObject.ts \
+	src/canvas/sections/CommentSection.ts \
+	src/canvas/sections/CommentListSection.ts \
+	src/canvas/sections/CalcGridSection.ts \
+	src/canvas/sections/SplitSection.ts \
+	src/canvas/sections/PixelGridSection.ts \
+	src/canvas/sections/TilesSection.ts \
+	src/canvas/sections/AutoFillMarkerSection.ts \
+	src/canvas/sections/CellCursorSection.ts \
+	src/canvas/sections/CellSelectionHandleSection.ts \
+	src/canvas/sections/HTMLObjectSection.ts \
+	src/canvas/sections/CalcValidityDropDownSection.ts \
+	src/canvas/sections/TextSelectionHandleSection.ts \
 	src/layer/vector/CEventsHandler.ts \
 	src/layer/vector/CPointSet.ts \
 	src/layer/vector/CPath.ts \
@@ -234,21 +244,20 @@ COOL_JS_LST =\
 	src/layer/vector/CSplitterLine.ts \
 	src/layer/marker/Cursor.ts \
 	src/layer/vector/CanvasOverlay.ts \
-	src/layer/tile/ScrollSection.ts \
+	src/canvas/sections/ScrollSection.ts \
 	src/layer/tile/CanvasTileLayer.js \
-	src/layer/SplitPanesContext.ts \
 	src/layer/vector/CDarkOverlay.ts \
 	src/layer/SplitPanesContext.ts \
 	src/layer/CalcSplitPanesContext.ts \
-	src/layer/vector/CDarkOverlay.ts \
 	src/layer/tile/TileLayer.TableOverlay.js \
 	src/layer/tile/WriterTileLayer.js \
 	src/layer/tile/ImpressTileLayer.js \
 	src/layer/tile/CalcTileLayer.js \
+	src/canvas/sections/ContentControlSection.ts \
 	src/layer/BackgroundColor.js \
-	src/layer/ImageOverlay.js \
 	src/layer/marker/ProgressOverlay.js \
 	src/layer/marker/TextInput.js \
+	src/layer/marker/A11yTextInput.js \
 	src/layer/marker/Icon.js \
 	src/layer/marker/Icon.Default.js \
 	src/layer/marker/Marker.js \
@@ -285,13 +294,18 @@ COOL_JS_LST =\
 	src/layer/FormFieldButtonLayer.js \
 	src/dom/DomEvent.js \
 	src/dom/Draggable.js \
+	src/dom/NotebookbarAccessibilityDefinitions.js \
+	src/dom/NotebookbarAccessibility.js \
 	src/map/handler/Map.Drag.js \
 	src/map/handler/Map.Scroll.js \
 	src/map/handler/Map.DoubleClickZoom.js \
 	src/dom/DomEvent.Pointer.js \
 	src/map/handler/Map.TouchGesture.js \
-	src/map/handler/Map.BoxZoom.js \
 	src/map/handler/Map.Keyboard.js \
+	src/map/handler/Map.KeyboardShortcuts.ts \
+	src/map/handler/Map.Welcome.js \
+	src/map/handler/Map.Feedback.js \
+	src/map/handler/Map.VersionBar.js \
 	src/dom/DomEvent.MultiClick.js \
 	src/map/handler/Map.Mouse.js \
 	src/map/handler/Map.Print.js \
@@ -300,18 +314,19 @@ COOL_JS_LST =\
 	src/map/handler/Map.StateChanges.js \
 	src/map/handler/Map.WOPI.js \
 	src/layer/marker/Marker.Drag.js \
+	src/control/Control.AboutDialog.ts \
 	src/control/Control.Toolbar.js \
 	src/control/Control.Command.js \
 	src/control/Control.js \
 	src/control/Control.PartsPreview.js \
-	src/control/Control.GroupBase.js \
-	src/control/Control.CornerGroup.js \
-	src/control/Control.RowGroup.js \
-	src/control/Control.ColumnGroup.js \
-	src/control/Control.CornerHeader.js \
-	src/control/Control.Header.js \
-	src/control/Control.ColumnHeader.js \
-	src/control/Control.RowHeader.js \
+	src/control/Control.GroupBase.ts \
+	src/control/Control.CornerGroup.ts \
+	src/control/Control.RowGroup.ts \
+	src/control/Control.ColumnGroup.ts \
+	src/control/Control.CornerHeader.ts \
+	src/control/Control.Header.ts \
+	src/control/Control.ColumnHeader.ts \
+	src/control/Control.RowHeader.ts \
 	src/control/Control.DocumentRepair.js \
 	src/control/Control.DownloadProgress.js \
 	src/control/Control.ContextMenu.js \
@@ -321,25 +336,50 @@ COOL_JS_LST =\
 	src/control/Control.Selection.js \
 	src/control/Control.LokDialog.js \
 	src/control/Control.AlertDialog.js \
-	src/control/Control.Infobar.js src/control/ColorPicker.js \
+	src/control/ColorPicker.ts \
+	src/control/jsdialog/Component.Toolbar.ts \
+	src/control/jsdialog/Definitions.Menu.ts \
+	src/control/jsdialog/Util.Dropdown.js \
+	src/control/jsdialog/Util.Events.ts \
+	src/control/jsdialog/Util.FocusCycle.js \
+	src/control/jsdialog/Util.MessageRouter.ts \
+	src/control/jsdialog/Util.ModalHelper.js \
+	src/control/jsdialog/Util.ScrollableBar.ts \
+	src/control/jsdialog/Util.SnackbarController.ts \
+	src/control/jsdialog/Util.StateChange.ts \
+	src/control/jsdialog/Widget.Calendar.js \
+	src/control/jsdialog/Widget.ColorPicker.ts \
+	src/control/jsdialog/Widget.Combobox.js \
+	src/control/jsdialog/Widget.Containers.ts \
+	src/control/jsdialog/Widget.DrawingArea.js \
+	src/control/jsdialog/Widget.FormulabarEdit.js \
+	src/control/jsdialog/Widget.Frame.js \
+	src/control/jsdialog/Widget.HTMLContent.ts \
+	src/control/jsdialog/Widget.IconView.js \
+	src/control/jsdialog/Widget.MenuButton.js \
+	src/control/jsdialog/Widget.MobileBorderSelector.js \
+	src/control/jsdialog/Widget.MobileTabControl.js \
+	src/control/jsdialog/Widget.MultilineEdit.js \
+	src/control/jsdialog/Widget.Progressbar.js \
+	src/control/jsdialog/Widget.ScrolledWindow.js \
+	src/control/jsdialog/Widget.Timefield.js \
+	src/control/jsdialog/Widget.TreeView.js \
 	src/control/Control.JSDialog.js \
 	src/control/Control.JSDialogBuilder.js \
 	src/control/Control.MobileWizardBuilder.js \
+	src/control/Control.MobileWizardWindow.js \
 	src/control/Control.MobileWizard.js \
-	src/control/Control.MobileWizardPopup.js \
 	src/control/Control.LanguageDialog.js \
 	src/control/Control.Attribution.js \
 	src/control/Control.MobileSlide.js \
-	src/control/Control.Scale.js \
 	src/control/Control.StatusBar.js \
-	src/control/Control.SearchBar.js \
-	src/control/Control.MobileTopBar.js \
+	src/control/Control.MobileSearchBar.ts \
+	src/control/Control.MobileTopBar.ts \
 	src/control/Control.MobileBottomBar.js \
-	src/control/Control.UserList.js \
-	src/control/Control.FormulaBar.js \
+	src/control/Control.UserList.ts \
+	src/control/Control.FormulaBarJSDialog.js \
 	src/control/Control.SheetsBar.js \
 	src/control/Control.PresentationBar.js \
-	src/control/Control.SigningBar.js \
 	src/control/Control.TopToolbar.js \
 	src/control/Control.UIManager.js \
 	src/control/Control.DocumentNameInput.js \
@@ -349,9 +389,13 @@ COOL_JS_LST =\
 	src/control/Control.NotebookbarImpress.js \
 	src/control/Control.NotebookbarDraw.js \
 	src/control/Control.NotebookbarBuilder.js \
-	src/control/Control.AutofilterDropdown.js \
 	src/control/Control.Layers.js \
 	src/control/Control.Sidebar.js \
+	src/control/AutoCompletePopup.ts \
+	src/control/Control.Mention.ts \
+	src/control/Control.FormulaUsagePopup.ts \
+	src/control/Control.FormulaAutoCompletePopup.ts \
+	src/control/Control.Zotero.js \
 	src/control/Search.js \
 	src/control/Permission.js \
 	src/control/Toolbar.js \
@@ -360,21 +404,11 @@ COOL_JS_LST =\
 	src/control/Scroll.js \
 	src/control/Styles.js \
 	src/control/Ruler.js \
+	src/control/VRuler.ts \
 	src/dom/PosAnimation.js \
 	src/map/anim/Map.PanAnimation.js \
 	src/dom/PosAnimation.Timer.js \
 	src/control/Control.Scroll.Annotation.js \
-	src/layer/marker/DivOverlay.js
-
-if ENABLE_FEEDBACK
-COOL_JS_LST +=\
-	src/control/IFrameDialog.js \
-	src/map/handler/Map.Infobar.js \
-	src/map/handler/Map.Feedback.js \
-	src/map/handler/Map.Welcome.js
-endif
-
-COOL_JS_LST +=\
 	src/main.js
 
 COOL_JS_WEBORDER = $(filter %,$(COOL_JS_LST))
@@ -396,6 +430,8 @@ INTERMEDIATE_DIR ?= $(if $(IS_SEPARATE),$(abs_builddir)/debug,$(abs_builddir)/re
 
 EXTRA_DIST = $(shell find . -type f -not -path './.git/*' -not -path './node_modules/*' | sed 's/.\///')
 
+COOL_JS_BUNDLE = $(patsubst %.ts,%.js,$(COOL_JS_WEBORDER))
+
 define bundle_cool
 	$(if $(IS_SEPARATE),\
 		@touch $@,
@@ -405,7 +441,7 @@ define bundle_cool
 			-DMOBILEAPPNAME="$(APP_NAME)" \
 			-DVERSION=$(COOL_VERSION) \
 			-DCOPYRIGHT=$(srcdir)/src/copyright.js \
-			-DCOOL_JS=$(subst $(SPACE),$(COMMA),$(patsubst src/%.ts,$(DIST_FOLDER)/src/%.js,$(COOL_JS_WEBORDER))) \
+			-DCOOL_JS=$(subst $(SPACE),$(COMMA),$(patsubst src/%,$(DIST_FOLDER)/src/%,$(COOL_JS_BUNDLE))) \
 			$(srcdir)/cool-src.js.m4 > $@)
 endef
 
@@ -434,6 +470,7 @@ define bundle_all
 			-DCOOL_JS=$(INTERMEDIATE_DIR)/cool-src.js \
 			$(srcdir)/bundle.js.m4 > $(INTERMEDIATE_DIR)/bundle.js
 		@$(NODE) node_modules/uglify-js/bin/uglifyjs \
+			-O max_line_len=100 \
 			$(INTERMEDIATE_DIR)/bundle.js \
 			--output $@)
 endef
@@ -450,6 +487,21 @@ define global_file
 		@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@)
 endef
 
+define run_eslint_check
+	@$(NODE) node_modules/eslint/bin/eslint.js \
+		--resolve-plugins-relative-to $(abs_builddir) \
+		--ignore-path $(srcdir)/.eslintignore \
+		--config .eslintrc \
+		--no-eslintrc $(1)
+endef
+
+define run_prettier_check
+	@$(NODE) node_modules/.bin/prettier \
+		--ignore-path $(srcdir)/.prettierignore \
+		--ignore-path $(srcdir)/.beforeprettier \
+		$(1)
+endef
+
 .PHONY: build-cool
 
 all-local: build-cool
@@ -458,6 +510,29 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
 endif
 
+if ENABLE_WASM
+$(DIST_FOLDER)/online%: $(abs_top_builddir)/wasm/online%
+	@mkdir -p $(dir $@)
+	@cp $< $@
+
+$(DIST_FOLDER)/soffice%: $(abs_top_builddir)/wasm/soffice%
+	@mkdir -p $(dir $@)
+	@cp $< $@
+
+WASM_FILES= \
+	$(DIST_FOLDER)/online.js \
+	$(DIST_FOLDER)/online.wasm \
+	$(DIST_FOLDER)/online.worker.js \
+	$(DIST_FOLDER)/soffice.data \
+	$(DIST_FOLDER)/soffice.data.js.metadata
+
+if ENABLE_DEBUG
+WASM_FILES += \
+	$(DIST_FOLDER)/online.wasm.debug.wasm
+endif
+
+endif
+
 $(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
 	@mkdir -p $(dir $@)
 	$(builddir)/node_modules/typescript/bin/tsc --outFile $@ $<
@@ -476,7 +551,8 @@ build-cool: \
 	$(DIST_FOLDER)/device-tablet.css \
 	$(DIST_FOLDER)/device-desktop.css \
 	$(DIST_FOLDER)/bundle.js \
-	$(DIST_FOLDER)/cool.html
+	$(DIST_FOLDER)/cool.html \
+	$(WASM_FILES)
 	@echo "build cool completed"
 if ENABLE_ANDROIDAPP
 	@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js" $(DIST_FOLDER)/ ; else touch $(DIST_FOLDER)/branding.css ; fi
@@ -498,17 +574,18 @@ $(DIST_FOLDER)/admin-bundle.js: $(COOL_ADMIN_DST) \
 $(INTERMEDIATE_DIR)/admin-src.js: $(COOL_ADMIN_TS_JS) $(COOL_ADMIN_JS)
 	@mkdir -p $(dir $@)
 	@echo "Checking for admin JS errors..."
-	@$(NODE) node_modules/eslint/bin/eslint.js --resolve-plugins-relative-to $(abs_builddir) --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc --no-eslintrc $(srcdir)/admin/src
+	$(call run_eslint_check,--ignore-pattern $(COOL_ADMIN_TS_JS) $(srcdir)/admin/src)
+	$(call run_prettier_check,--debug-check $(srcdir)/admin/src)
 	@awk 'FNR == 1 {print ""} 1' $(COOL_ADMIN_TS_JS) $(patsubst %.js,$(srcdir)/%.js,$(COOL_ADMIN_JS)) > $@
 
-$(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST)
+$(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST) $(abs_top_srcdir)/scripts/unocommands.py
 	@mkdir -p $(dir $@)
 	$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 	@printf "Checking for obsolete JS build intermediates in this makefile... "
 	@if ! test "z$(COOL_ASSERT_INTERSECT)" == "z"; then echo; echo "Error: please remove obsolete files:"; echo "$(COOL_ASSERT_INTERSECT)"; exit 1; else echo "clean"; fi
 	@echo "Checking for cool JS errors..."
-	@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src --resolve-plugins-relative-to $(abs_builddir) \
-		$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --no-eslintrc --config $(srcdir)/.eslintrc
+	$(call run_eslint_check,$(srcdir)/src $(srcdir)/js)
+	$(call run_prettier_check,--debug-check $(srcdir)/src $(srcdir)/js/global.js)
 	@echo "Bundling cool..."
 	$(call bundle_cool)
 
@@ -534,10 +611,11 @@ $(DIST_FOLDER)/cool.html: $(srcdir)/html/cool.html.m4 \
 	$(DIST_FOLDER)/bundle.js
 	@echo "Generating cool.html..."
 	m4 -PE -DBUNDLE=$(IS_BUNDLE) \
-		-DENABLE_FEEDBACK=$(ENABLE_FEEDBACK) \
 		-DIOSAPP=$(ENABLE_IOSAPP) \
 		-DGTKAPP=$(ENABLE_GTKAPP) \
+		-DDEBUG=$(ENABLE_DEBUG) \
 		-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
+		-DEMSCRIPTENAPP=$(ENABLE_EMSCRIPTENAPP) \
 		-DMOBILEAPPNAME="$(APP_NAME)" \
 		-DCOOL_CSS="$(subst $(SPACE),$(COMMA),$(COOL_CSS_M4))" \
 		-DGLOBAL_JS="$(DIST_FOLDER)/global.js" \
@@ -583,6 +661,7 @@ $(DIST_FOLDER)/%.html: $(srcdir)/html/%.html
 		`ln -sf $(abs_srcdir)/$< $@`; \
 	fi
 
+if ENABLE_WELCOME_MESSAGE
 $(DIST_FOLDER)/welcome/%: $(srcdir)/welcome/%
 	@mkdir -p $(dir $@)
 	@if test -z '$(ENABLE_BROWSERSYNC)'; then \
@@ -590,7 +669,7 @@ $(DIST_FOLDER)/welcome/%: $(srcdir)/welcome/%
 	else \
 		`ln -sf $(abs_srcdir)/$< $@`; \
 	fi
-
+endif
 
 if ENABLE_DEBUG
 SourceMap=--allowJs true --sourceMap true --inlineSources true
@@ -651,9 +730,25 @@ $(DIST_FOLDER)/admin/%: $(srcdir)/admin/%
 	@mkdir -p $(dir $@)
 	@cp $< $@
 
+if ENABLE_DEBUG
 install-data-hook:
 	mkdir -p $(DESTDIR)$(pkgdatadir)/browser; \
 	cp -a dist/ $(DESTDIR)$(pkgdatadir)/browser/;
+else
+install-data-hook:
+	mkdir -p $(DESTDIR)$(pkgdatadir)/browser; \
+	rsync -a --exclude='src' \
+		--exclude='debug.html' \
+		--exclude='framed.doc.html' \
+		--exclude='framed.html' \
+		--exclude='load.doc.html' \
+		--exclude='multidocs.html' \
+		--exclude='tsconfig.tsbuildinfo' \
+		dist $(DESTDIR)$(pkgdatadir)/browser/;
+if ENABLE_WASM
+	find $(DESTDIR)$(pkgdatadir)/browser/dist -type f ! -iname "*.png" -exec brotli --force {} \;
+endif
+endif
 
 libs:
 	@mkdir -p $(abs_srcdir)/libs
@@ -668,21 +763,25 @@ pot:
 		admin/src/AdminSocketOverview.js \
 		admin/src/AdminSocketSettings.js \
 		admin/src/Util.js \
-		js/w2ui-1.5.rc1.js \
-		src/control/ColorPicker.js \
+		js/global.js \
+		src/control/ColorPicker.ts \
+		src/control/Control.AboutDialog.ts \
 		src/control/Control.AlertDialog.js \
 		src/control/Control.Command.js \
 		src/control/Control.ContextMenu.js \
 		src/control/Control.DocumentNameInput.js \
 		src/control/Control.DocumentRepair.js \
 		src/control/Control.DownloadProgress.js \
-		src/control/Control.FormulaBar.js \
+		src/control/Control.FormulaBarJSDialog.js \
+		src/control/Control.IdleHandler.ts \
 		src/control/Control.JSDialogBuilder.js \
 		src/control/Control.LanguageDialog.js \
 		src/control/Control.Menubar.js \
 		src/control/Control.MobileBottomBar.js \
-		src/control/Control.MobileTopBar.js \
+		src/control/Control.MobileTopBar.ts \
 		src/control/Control.MobileWizardBuilder.js \
+		src/control/Control.MobileWizardWindow.js \
+		src/control/Control.MobileWizard.js \
 		src/control/Control.Notebookbar.js \
 		src/control/Control.NotebookbarBuilder.js \
 		src/control/Control.NotebookbarCalc.js \
@@ -692,28 +791,64 @@ pot:
 		src/control/Control.PartsPreview.js \
 		src/control/Control.PresentationBar.js \
 		src/control/Control.Scroll.Annotation.js \
-		src/control/Control.SearchBar.js \
+		src/control/Control.MobileSearchBar.ts \
 		src/control/Control.SheetsBar.js \
 		src/control/Control.StatusBar.js \
 		src/control/Control.Tabs.js \
 		src/control/Control.Toolbar.js \
 		src/control/Control.TopToolbar.js \
-		src/control/Control.UserList.js \
+		src/control/Control.UIManager.js \
+		src/control/Control.UserList.ts \
+		src/control/Control.Zotero.js \
 		src/control/Parts.js \
 		src/control/Permission.js \
 		src/control/Ruler.js \
+		src/control/VRuler.ts \
 		src/control/Signing.js \
 		src/control/Toolbar.js \
+		src/control/jsdialog/Component.Toolbar.ts \
+		src/control/jsdialog/Definitions.Menu.ts \
+		src/control/jsdialog/Util.Dropdown.js \
+		src/control/jsdialog/Util.Events.ts \
+		src/control/jsdialog/Util.FocusCycle.js \
+		src/control/jsdialog/Util.MessageRouter.ts \
+		src/control/jsdialog/Util.ModalHelper.js \
+		src/control/jsdialog/Util.ScrollableBar.ts \
+		src/control/jsdialog/Util.SnackbarController.ts \
+		src/control/jsdialog/Util.StateChange.ts \
+		src/control/jsdialog/Widget.Calendar.js \
+		src/control/jsdialog/Widget.ColorPicker.ts \
+		src/control/jsdialog/Widget.Combobox.js \
+		src/control/jsdialog/Widget.Containers.ts \
+		src/control/jsdialog/Widget.DrawingArea.js \
+		src/control/jsdialog/Widget.FormulabarEdit.js \
+		src/control/jsdialog/Widget.Frame.js \
+		src/control/jsdialog/Widget.HTMLContent.ts \
+		src/control/jsdialog/Widget.IconView.js \
+		src/control/jsdialog/Widget.MenuButton.js \
+		src/control/jsdialog/Widget.MobileBorderSelector.js \
+		src/control/jsdialog/Widget.MobileTabControl.js \
+		src/control/jsdialog/Widget.MultilineEdit.js \
+		src/control/jsdialog/Widget.Progressbar.js \
+		src/control/jsdialog/Widget.ScrolledWindow.js \
+		src/control/jsdialog/Widget.Timefield.js \
+		src/control/jsdialog/Widget.TreeView.js \
 		src/core/Socket.js \
+		src/core/Debug.js \
+		src/docstate.js \
+		src/docstatefunctions.js \
+		src/docdispatcher.ts \
 		src/errormessages.js \
 		src/layer/tile/CanvasTileLayer.js \
-		src/layer/tile/CommentListSection.ts \
-		src/layer/tile/CommentSection.ts \
+		src/canvas/sections/CommentListSection.ts \
+		src/canvas/sections/CommentSection.ts \
 		src/main.js \
 		src/map/Clipboard.js \
 		src/map/Map.js \
+		src/map/handler/Map.Feedback.js \
 		src/map/handler/Map.FileInserter.js \
 		src/map/handler/Map.Keyboard.js \
+		src/map/handler/Map.SlideShow.js \
 		src/map/handler/Map.WOPI.js
 
 	html2po --pot --input=html/cool-help.html --output=po/templates/cool-help.pot --duplicates=merge
@@ -755,23 +890,50 @@ jsconfig: $(abs_srcdir)/jsconfig.json $(abs_srcdir)/admin/jsconfig.json
 build-tests: $(MOCHA_TS_JS_FILES)
 	@echo "Build of mocha test finished."
 
+eslint: $(COOL_ADMIN_TS_JS)
+	$(call run_eslint_check,--max-warnings 0 \
+		--ignore-pattern $(COOL_ADMIN_TS_JS) \
+		$(srcdir)/src \
+		$(srcdir)/js \
+		$(srcdir)/admin/src)
+
+prettier:
+	$(call run_prettier_check,--check \
+		$(srcdir)/src \
+		$(srcdir)/js \
+		$(srcdir)/admin/src)
+
+prettier-write:
+	$(call run_prettier_check,--write \
+		$(srcdir)/src \
+		$(srcdir)/js \
+		$(srcdir)/admin/src)
+
 MOCHA_TEST_LOG = "`pwd`/mocha.log"
+DUPLICATION_TEST_LOG = "`pwd`/duplication.log"
 check-local: $(MOCHA_TS_JS_FILES)
 	@echo "Running mocha tests..."
 	@echo > ${MOCHA_TEST_LOG}
-	@if $(NODE) node_modules/mocha/bin/mocha "$(srcdir)/mocha_tests/**/*.js" 2> ${MOCHA_TEST_LOG} 1>&2; then \
+	@if npm test 2> ${MOCHA_TEST_LOG} 1>&2; then \
 		echo "Mocha tests finished successfully. Results in ${MOCHA_TEST_LOG}"; \
 	else \
 		cat ${MOCHA_TEST_LOG}; \
 		exit 1; \
 	fi
 
-SSL_FLAG = `xmllint --xpath 'string(/config/ssl/enable)' $(abs_top_builddir)/coolwsd.xml`
+	@echo "Checking code duplication..."
+	@echo > ${DUPLICATION_TEST_LOG}
+	@if npm run duplication 2> ${DUPLICATION_TEST_LOG} 1>&2; then \
+		echo "Code duplication tests finished successfully."; \
+	else \
+		cat ${DUPLICATION_TEST_LOG}; \
+		exit 1; \
+	fi
 
-# the delay (in miliseconds) between each emulated key stroke for each view
+# the delay (in milliseconds) between each emulated key stroke for each view
 typing_speed=100
-# The duration of the typing (in miliseconds)
-typing_duration=30000
+# The duration of the typing (in milliseconds)
+typing_duration=60000
 # By default 6 views are spawned in the document.
 single_view="false"
 # --inspect flag for the first view. Ideally should be used with single_view=true
@@ -786,6 +948,6 @@ perf-test:
 		echo 'Making fresh copy of the perf-test-edit.odt document'; \
 		cp $(abs_top_srcdir)/test/data/perf-test.odt $(abs_top_builddir)/test/data/perf-test-edit.odt; \
 	fi
-	$(NODE) $(abs_srcdir)/test/bootstrap.js $(SSL_FLAG) $(abs_top_builddir) $(abs_srcdir) $(typing_speed) $(single_view) $(typing_duration) $(node_inspect) ${record_stats}
+	$(NODE) $(abs_srcdir)/test/bootstrap.js $(abs_top_builddir) $(abs_srcdir) $(typing_speed) $(single_view) $(typing_duration) $(node_inspect) ${record_stats}
 # for now - unwinding ts and js deps for different targets is a real pain.
 .NOTPARALLEL:

browser/README

@@ -29,7 +29,7 @@ To update any of the dependency, process often goes like this:
 1.) Change version of the dependency in package.json
 2.) Do an `npm update <package_name>', which fetches the new module from npm registry. Make sure that
     only the module that you want to update is updated.
-3.) `npm shrinkwrap --dev` to update npm-shrinkwrap.json with newer information. You might see
+3.) `npm shrinkwrap --include=dev` to update npm-shrinkwrap.json with newer information. You might see
     that this tool updates path convention of tarballs inside node_shrinkwrap/ also, but this
     should get corrected in next step.
 4.) Do `shrinkpack', which should remove the old tarball, add new one, and make appropriate
@@ -217,10 +217,11 @@ Parts (like slides in presentation, or sheets in spreadsheets):
             + [e.part] - if the preview is for a part
             + e.docType
 
-Statusindicator (when the document is loading):
+progress (when the document is loading):
     - events
-        map.on('statusindicator', function (e) {}) where:
+        map.on('progress', function (e) {}) where:
             + e.statusType = 'start' | 'setvalue' | 'finish' | 'coolloaded' | 'alltilesloaded'
+	    + e.type == 'bg' for a background operation
             + e.value == a value from 0 to 100 indicating the status
               if the statusType is 'setvalue
             + 'coolloaded' is fired when the JS code is initialized and the document
@@ -387,10 +388,10 @@ x				menu-nb-hamburger > ul (calculated from jquery.smartmenus.js)
 -------------------------------------------
 		on the top
 -------------------------------------------
-1105			dialogs
+1105			dialogs, tooltips
 1001			mobile-edit-button
 1500			mobile-wizard (with class=menuwizard)
 1501			toolbar-hamburger (with class=menuwizard-opened)
-2000			vex-overlay
-2001			vex dialog (vex-content)
+2000			JSDialog overlay
+2001			JSDialog modal
 -------------------------------------------

browser/admin/admin.html

@@ -63,6 +63,7 @@
             <th class="has-text-centered"><script>document.write(l10nstrings.strElapsedTime)</script></th>
             <th class="has-text-centered"><script>document.write(l10nstrings.strIdleTime)</script></th>
             <th class="has-text-centered"><script>document.write(l10nstrings.strModified)</script></th>
+            <th class="has-text-centered"><script>document.write(l10nstrings.strUploaded)</script></th>
           </tr>
         </thead>
         <tbody id="doclist"></tbody>

browser/admin/admin.strings.js

@@ -1,8 +1,17 @@
 /* -*- js-indent-level: 8 -*- */
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 /* Stringtable for Admin Console User Interface */
 var l10nstrings = {};
 
-l10nstrings.strProductName = 'Collabora Online Development Edition';
+l10nstrings.strProductName = 'Collabora Online Development Edition (unbranded)';
 l10nstrings.strAdminConsole = _('Admin console');
 l10nstrings.strSettings = _('Settings');
 l10nstrings.strOverview = _('Overview');
@@ -26,6 +35,7 @@ l10nstrings.strViewers = _('Views');
 l10nstrings.strElapsedTime = _('Elapsed time');
 l10nstrings.strIdleTime = _('Idle time');
 l10nstrings.strModified = _('Modified');
+l10nstrings.strUploaded = _('Uploaded');
 l10nstrings.strWopihost = _('WOPI host');
 l10nstrings.strKill = _('Kill');
 l10nstrings.strGraphs = _('Graphs');
@@ -54,7 +64,8 @@ l10nstrings.strLogLevels = _('Log Levels');
 l10nstrings.strCloseModal = _('Close');
 l10nstrings.strUpdateLogLevels = _('Update Log Levels');
 l10nstrings.strVersionInfo = _('Version Information');
-
+l10nstrings.strLicense = _('License');
+l10nstrings.strAbout = _('About');
 if (module) {
 	module.exports = l10nstrings;
 }

browser/admin/adminBody.html

@@ -0,0 +1,70 @@
+<script>
+    if (typeof brandProductName !== 'undefined') {l10nstrings.strProductName = brandProductName}
+    document.title = l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole;
+    var host = (window.location.protocol === 'https:' ? 'wss://': 'ws://') + window.location.host + '%SERVICE_ROOT%/cool/adminws';
+    if (routeToken) {
+        host += '?RouteToken=' + routeToken
+    }
+</script>
+
+<div class="is-fullwidth has-text-white" style="height:62px;background-color:#17191E;line-height:50px;">
+    <a style="margin-left:12px;color:#9D998D;"><script>document.write(l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole)</script></a>
+    <a style="margin-right:12px;color:#9D998D;" id="a-settings-tablet" href="adminSettings.html" class="is-hidden-mobile is-pulled-right add-routetoken"><script>document.write(l10nstrings.strSettings)</script></a>
+    <div class="dropdown is-hoverable is-right is-pulled-right is-hidden-tablet" style="margin-right:12px;">
+        <div class="dropdown-trigger">
+            <button class="button has-text-white" aria-haspopup="true" aria-controls="dropdown-menu1" style="width:40px;background-color:#17191E;border:none;">
+            <span>&#9776;</span>
+            <span class="icon is-small">
+                <i class="fas fa-angle-down" aria-hidden="true"></i>
+            </span>
+            </button>
+        </div>
+        <div class="dropdown-menu" id="dropdown-menu1" role="menu">
+            <div class="dropdown-content">
+                <div class="dropdown-item">
+                    <div class="list is-hoverable" style="height:100%;">
+                        <a id="a-overwiew-mobile" class="list-item add-routetoken" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
+                        <a id="a-analytics-mobile" class="list-item add-routetoken" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
+                        <a id="a-history-mobile" class="list-item add-routetoken" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
+                        <a id="a-log-mobile" class="list-item add-routetoken" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
+                        <a id="a-settingsmenu-mobile" class="list-item add-routetoken" href="adminSettings.html"><script>document.write(l10nstrings.strSettings)</script></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="columns is-fullwidth" style="height:calc(100vh - 62px);background-color: #F5F5F5;">
+    <nav class="column is-hidden-mobile is-narrow" id="column-admin-panel" style="width:225px;">
+        <div class="list is-hoverable" style="height:100%;">
+            <a class="list-item" id="button-admin-panel-collapse" href="#">&larr;</a>
+            <a id="a-overwiew-tablet" class="list-item add-routetoken" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
+            <a id="a-analytics-tablet" class="list-item add-routetoken" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
+            <a id="a-history-tablet" class="list-item add-routetoken" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
+            <a id="a-log-tablet" class="list-item add-routetoken" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
+            <a id="a-settingsmenu-tablet" class="list-item add-routetoken" href="adminSettings.html"><script>document.write(l10nstrings.strSettings)</script></a>
+        </div>
+    </nav>
+    <div class="column is-narrow is-hidden-mobile" id="column-admin-panel-expand" style="width:70px;display:none;">
+        <div class="list is-hoverable">
+            <a class="list-item" id="button-admin-panel-expand" href="#">&rarr;</a>
+        </div>
+    </div>
+    <div class="column">
+        <!--%MAIN_CONTENT%-->
+    </div>
+</div>
+
+<script>
+    if (routeToken) {
+        // update href attributes
+        var anchors = document.getElementsByClassName('add-routetoken');
+
+        for (var i = 0; i < anchors.length; i++) {
+            var href = anchors[i].getAttribute('href');
+            var updatedHref = href + '?RouteToken=' + routeToken;
+            anchors[i].setAttribute('href', updatedHref);
+        }
+    }
+</script>

browser/admin/adminClusterBody.html

@@ -0,0 +1,47 @@
+<script>
+  if (typeof brandProductName !== 'undefined') { l10nstrings.strProductName = brandProductName }
+  document.title = l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole;
+  var host = (window.location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host + '/controller/adminws';
+</script>
+
+<style>
+  .is-rounded {
+    border-radius: 8px;
+  }
+  
+  .is-top-rounded {
+    border-top-right-radius: 8px;
+    border-top-left-radius: 8px;
+  }
+  
+  /* Set to scroll otherwise tablets can spill over into other cards*/
+  .card {
+    overflow: auto;
+  }
+  
+  /* Decrease left panel when on laptop  */
+  @media screen and (max-width: 1024px) {
+    #column-admin-panel {
+      width: 20% !important;
+    }
+  }
+  
+  /* Hide left panel before reaching mobile (there is no space)  */
+  @media screen and (max-width: 960px) {
+    #column-admin-panel {
+      display: none !important;
+    }
+  }
+</style>
+
+<div class="is-fullwidth has-text-white" style="height:62px;background-color:#17191E;line-height:50px;">
+  <a style="margin-left:12px;color:#9D998D;">
+    <script>document.write(l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole)</script>
+  </a>
+  <a style="margin-right:12px;color:#9D998D;" id="a-settings-tablet" href="adminClusterOverviewAbout.html"
+  class="is-hidden-mobile is-pulled-right">
+  <script>document.write(l10nstrings.strAbout)</script>
+</a>
+</div>
+
+<!--%MAIN_CONTENT%-->

browser/admin/adminClusterOverview.html

@@ -0,0 +1,21 @@
+<main>
+    <div class="columns is-fullwidth" style="background-color: #F5F5F5; min-height: 100vh">
+        <nav class="column is-hidden-mobile is-narrow" id="column-admin-panel" style="width:350px;">
+            <div class="list is-hoverable" style="height:100%;">
+                <a class="list-item" id="button-admin-panel-collapse" href="#">&larr; Pod</a>
+            </div>
+        </nav>
+        <div class="column is-narrow is-hidden-mobile" id="column-admin-panel-expand" style="width:70px;display:none;">
+            <div class="list is-hoverable">
+                <a class="list-item" id="button-admin-panel-expand" href="#">&rarr;</a>
+            </div>
+        </div>
+        <div class="column">
+            <div class="tile is-ancestor" id="tileAncestor" style="flex-wrap: wrap;">
+                <script>
+                    Admin.ClusterOverview(host, '%ROUTE_TOKEN%');
+                </script>
+            </div>
+        </div>
+    </div>
+</main>

browser/admin/adminClusterOverviewAbout.html

@@ -0,0 +1,43 @@
+<main>
+	<div class="columns is-fullwidth" style="background-color: #F5F5F5; min-height: 100vh">
+		<div class="container">
+			<script>
+				Admin.ClusterOverviewAbout(host, '%ROUTE_TOKEN%');
+				var aboutButton = document.getElementById('a-settings-tablet');
+				if (aboutButton) {
+					aboutButton.setAttribute('href', 'adminClusterOverview.html');
+					aboutButton.innerHTML = l10nstrings.strOverview;
+				}
+			</script>
+			<div class="columns">
+				<div class="column">
+					<h3 class="title is-3">
+						<script>document.write(l10nstrings.strAbout)</script>
+					</h3>
+				</div>
+			</div>
+			<div class="tabs">
+				<ul>
+					<li id="tab-documents-open" class="is-active"><a id="button-licenseview" href="#licenseview">
+							COOL Controller
+							<script>document.write(l10nstrings.strLicense)</script>
+						</a></li>
+				</ul>
+			</div>
+			<div id="licenseview" class="mtabs">
+				<p>
+				<div id="license-content"></div>
+				</p>
+			</div>
+		</div>
+	</div>
+</main>
+
+<script>
+
+	window.location.href += '#licenseview';
+
+	document.getElementById('button-licenseview').onclick = function (e) {
+		document.getElementById('button-licenseview').parentNode.className = 'is-active';
+	}
+</script>

browser/admin/adminSettings.html

@@ -1,9 +1,21 @@
 <main>
   <div class="container">
     <script>Admin.Settings(host);</script>
-
+    <div class="columns">
+      <div class="column">
     <h3 class="title is-3"><script>document.write(l10nstrings.strSettings)</script></h3>
-
+      </div>
+      <div class="column has-text-right">
+      <button id="btnShutdown" type="submit" class="button is-danger" style="min-width:140px; margin-inline-end:14px"><script>document.write(l10nstrings.strShutdown)</script></button>
+      </div>
+    </div>
+    <div class="tabs">
+      <ul>
+        <li id="tab-documents-open" class="is-active"><a id="button-opview" href="#opview"><script>document.write(l10nstrings.strSettings)</script></a></li>
+        <li id="tab-users-online"><a id="button-versionview" href="#versionview"><script>document.write(l10nstrings.strVersionInfo)</script></a></li>
+      </ul>
+     </div>
+    <div id="opview" class="mtabs">
     <form id="admin_settings">
       <div class="field is-horizontal">
         <div class="field-label is-normal">
@@ -119,26 +131,37 @@
         </div>
       </div>
     </form>
-
-    <div class="section">
-      <h4><script>document.write(l10nstrings.strVersionInfo)</script></h4>
+</div>
+<div id="versionview" class="mtabs">
       <p>
         <h5><b>COOLWSD</b></h5>
         <div id="coolwsd-version"></div>
+        <div id="coolwsd-buildconfig"></div>
       </p>
       <p>
         <h5><b>LOKit</b></h5>
         <div id="lokit-version"></div>
+        <div id="lokit-buildconfig"></div>
       </p>
-    </div>
-
-    <div class="section is-fullwidth has-text-right">
-      <button id="btnShutdown" type="submit" class="button is-danger" style="min-width:140px;"><script>document.write(l10nstrings.strShutdown)</script></button>
-    </div>
-
-  </div>
+ </div>
+</div>
 </main>
 
 <script>
-  document.getElementById('a-settings-mobile').classList.add('is-active');
+  document.getElementById('a-settingsmenu-mobile').classList.add('is-active');
+  document.getElementById('a-settingsmenu-tablet').classList.add('is-active');
+
+  window.location.href += '#opview';
+
+  // Switching tabs is done by css rules. We will set "is-active" classes here.
+  document.getElementById('button-versionview').onclick = function() {
+    document.getElementById('button-versionview').parentNode.className = 'is-active';
+    document.getElementById('button-opview').parentNode.className = '';
+  }
+
+  document.getElementById('button-opview').onclick = function() {
+    document.getElementById('button-opview').parentNode.className = 'is-active';
+    document.getElementById('button-versionview').parentNode.className = '';
+  }
+
 </script>

browser/admin/admintemplate.html

@@ -11,7 +11,15 @@
 
     <title>Collabora Online - Admin console</title>
     <link rel=StyleSheet href="%SERVICE_ROOT%/browser/%VERSION%/admin/css/bulma.min.css" type="text/css" />
-    <script src="%SERVICE_ROOT%/browser/%VERSION%/admin-bundle.js"></script>
+    <script>
+        var params = new URLSearchParams(window.location.search);
+        var routeToken = params.get('RouteToken');
+        var adminBundleSrc = '%SERVICE_ROOT%/browser/%VERSION%/admin-bundle.js';
+        if (routeToken) {
+            adminBundleSrc += '?RouteToken=' + routeToken
+        }
+        document.write('<script src="' + adminBundleSrc + '"><\/script>');
+    </script>
 
     <style>
         @font-face {
@@ -52,74 +60,27 @@
 </head>
 <body>
     <!--%BRANDING_JS%-->
-    <script>
-        if (typeof brandProductName !== 'undefined') {l10nstrings.strProductName = brandProductName}
-        document.title = l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole;
-        var host = (window.location.protocol === 'https:' ? 'wss://': 'ws://') + window.location.host + '%SERVICE_ROOT%/cool/adminws/';
-    </script>
-
-    <div class="is-fullwidth has-text-white" style="height:62px;background-color:#17191E;line-height:50px;">
-        <a style="margin-left:12px;color:#9D998D;"><script>document.write(l10nstrings.strProductName + ' - ' + l10nstrings.strAdminConsole)</script></a>
-        <a style="margin-right:12px;color:#9D998D;" id="a-settings-tablet" href="adminSettings.html" class="is-hidden-mobile is-pulled-right"><script>document.write(l10nstrings.strSettings)</script></a>
-        <div class="dropdown is-hoverable is-right is-pulled-right is-hidden-tablet" style="margin-right:12px;">
-            <div class="dropdown-trigger">
-                <button class="button has-text-white" aria-haspopup="true" aria-controls="dropdown-menu1" style="width:40px;background-color:#17191E;border:none;">
-                <span>&#9776;</span>
-                <span class="icon is-small">
-                    <i class="fas fa-angle-down" aria-hidden="true"></i>
-                </span>
-                </button>
-            </div>
-            <div class="dropdown-menu" id="dropdown-menu1" role="menu">
-                <div class="dropdown-content">
-                    <div class="dropdown-item">
-                        <div class="list is-hoverable" style="height:100%;">
-                            <a id="a-overwiew-mobile" class="list-item" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
-                            <a id="a-analytics-mobile" class="list-item" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
-                            <a id="a-history-mobile" class="list-item" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
-                            <a id="a-log-mobile" class="list-item" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
-                            <a id="a-settings-mobile" class="list-item" href="adminSettings.html"><script>document.write(l10nstrings.strSettings)</script></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="columns is-fullwidth" style="height:calc(100vh - 70px);background-color: #F5F5F5;">
-        <nav class="column is-hidden-mobile is-narrow" id="column-admin-panel" style="width:225px;">
-            <div class="list is-hoverable" style="height:100%;">
-                <a class="list-item" id="button-admin-panel-collapse" href="#">&larr;</a>
-                <a id="a-overwiew-tablet" class="list-item" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
-                <a id="a-analytics-tablet" class="list-item" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
-                <a id="a-history-tablet" class="list-item" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
-                <a id="a-log-tablet" class="list-item" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
-            </div>
-        </nav>
-        <div class="column is-narrow is-hidden-mobile" id="column-admin-panel-expand" style="width:70px;display:none;">
-            <div class="list is-hoverable">
-                <a class="list-item" id="button-admin-panel-expand" href="#">&rarr;</a>
-            </div>
-        </div>
-        <div class="column">
-            <!--%MAIN_CONTENT%-->
-        </div>
-    </div>
-
-<script>
-    window.addEventListener('load', function() {
-        document.getElementById('button-admin-panel-expand').onclick = function() {
-            document.getElementById('column-admin-panel').style.display = 'block';
-            document.getElementById('column-admin-panel-expand').style.display = 'none';
-        };
-
-        document.getElementById('button-admin-panel-collapse').onclick = function() {
-            document.getElementById('column-admin-panel').style.display = 'none';
-            document.getElementById('column-admin-panel-expand').style.display = 'block';
-        };
-    });
-</script>
-
+    <!--%BODY%-->
     <!--%FOOTER%-->
+    <script>
+        window.jwtToken = '%JWT_TOKEN%';
+        window.addEventListener('load', function () {
+            var buttonAdminPanelExpand = document.getElementById('button-admin-panel-expand');
+            if (buttonAdminPanelExpand) {
+                buttonAdminPanelExpand.onclick = function () {
+                    document.getElementById('column-admin-panel').style.display = 'block';
+                    document.getElementById('column-admin-panel-expand').style.display = 'none';
+                };
+            }
+
+            var buttonAdminPanelCollapse = document.getElementById('button-admin-panel-collapse');
+            if (buttonAdminPanelCollapse) {
+                buttonAdminPanelCollapse.onclick = function () {
+                    document.getElementById('column-admin-panel').style.display = 'none';
+                    document.getElementById('column-admin-panel-expand').style.display = 'block';
+                };
+            }
+        });
+    </script>
 </body>
-</html>
+</html>

browser/admin/main-admin.js

@@ -1,18 +1,20 @@
 /* -*- js-indent-level: 8 -*- */
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 // CSS requires
-require('vex-js/dist/css/vex.css');
-require('vex-js/dist/css/vex-theme-plain.css');
 
 var $ = require('jquery');
 global.$ = global.jQuery = $;
 
-require('json-js/json2');
 require('l10n-for-node');
 
-var vex = require('vex-js/dist/js/vex.combined.js');
-vex.defaultOptions.className = 'vex-theme-plain';
-global.vex = vex;
-
 global._ = function (string) {
 	return string.toLocaleString();
 };
@@ -20,4 +22,4 @@ global._ = function (string) {
 global.l10nstrings = require('./admin.strings.js');
 
 global.d3 = require('d3');
-global.Admin = require('admin-src.js');
+global.Admin = require('admin-src.js');

browser/admin/src/AdminClusterOverview.js

@@ -0,0 +1,585 @@
+/* -*- js-indent-level: 8 -*- */
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Socket to be intialized on opening the cluster overview page in Admin console
+ */
+
+/* global DlgLoading _ AdminSocketBase Admin d3 Map Util DlgYesNo */
+
+var AdminClusterOverview = AdminSocketBase.extend({
+    constructor: function (host, routeToken) {
+        this.base(host);
+        this.routeToken = routeToken;
+    },
+
+    _statsData: new Map(),
+    _size: 20,
+    _statIntervalId: 0,
+
+    _graphDimensions: {
+        x: 756,
+        y: 115,
+    },
+
+    _graphMargins: {
+        top: 10,
+        right: 0,
+        bottom: 10,
+        left: 80
+    },
+
+    _interval: 5000,
+
+    addStat: function (serverId) {
+        var offset = 0;
+        var memData = [];
+        var cpuData = [];
+        for (var i = 0; i < this._size; i++) {
+            memData.unshift({ time: -(offset), value: 0 });
+            cpuData.unshift({ time: -(offset), value: 0 });
+            offset += this._interval;
+        }
+        this._statsData.set(serverId, {
+            mem: memData,
+            cpu: cpuData,
+        });
+    },
+
+    updateStat: function (serverId, mem, cpuUsage) {
+        var stat = this._statsData.get(serverId);
+        if (serverId) {
+            for (var i = stat.mem.length - 1; i > 0; i--) {
+                stat.mem[i].time = stat.mem[i - 1].time;
+                stat.cpu[i].time = stat.cpu[i - 1].time;
+            }
+
+            stat.mem.push({ time: 0, value: mem });
+            stat.cpu.push({ time: 0, value: cpuUsage });
+            if (stat.mem.length > this._size) {
+                stat.mem.shift();
+            }
+            if (stat.cpu.length > this._size) {
+                stat.cpu.shift();
+            }
+        }
+    },
+
+    deleteStat: function (serverId) {
+        this._statsData.delete(serverId);
+    },
+
+    createCard: function (server) {
+        var card = document.createElement('div');
+        card.className = 'tile is-child card is-rounded';
+        card.id = 'card-' + server.serverId;
+
+        var cardHeader = document.createElement('header');
+        cardHeader.className = 'card-header is-top-rounded';
+        var cardTitle = document.createElement('p');
+        cardTitle.className = 'card-header-title';
+        if (server.podname) {
+            cardTitle.textContent = server.podname;
+        } else {
+            console.warn('podname doesnot exist, using serverId instead of podname on card title');
+            cardTitle.textContent = server.serverId;
+        }
+        cardHeader.appendChild(cardTitle);
+        card.appendChild(cardHeader);
+
+        var cardContent = document.createElement('div');
+        cardContent.className = 'card-content';
+
+        var mainTile = document.createElement('div');
+        mainTile.className = 'tile is-fullwidth is-vertical';
+
+        var cpuSubTitle = document.createElement('p');
+        cpuSubTitle.className = 'tile is-fullwidth subtitle';
+        cpuSubTitle.textContent = _('CPU History');
+        cpuSubTitle.setAttribute('style', 'margin-bottom: 0rem !important');
+
+        mainTile.appendChild(cpuSubTitle);
+
+        var data = this._statsData.get(server.serverId);
+        var cpuGraph = this.createGraph('cpu', data.cpu, server.cpu);
+        mainTile.appendChild(cpuGraph);
+
+        var memorySubTitle = document.createElement('p');
+        memorySubTitle.className = 'tile is-fullwidth subtitle';
+        memorySubTitle.textContent = _('Memory History');
+        memorySubTitle.setAttribute('style', 'margin-bottom: 0rem !important; margin-top:1.5rem');
+
+        mainTile.appendChild(memorySubTitle);
+
+        var memGraph = this.createGraph('mem', data.mem, Util.humanizeMem(server.memory));
+        mainTile.appendChild(memGraph);
+
+        var horizontalTile = document.createElement('div');
+        horizontalTile.className = 'tile is-fullwidth';
+        var routeTokenTile = this.createTile(_('RouteToken'), server.routeToken, 'route');
+        horizontalTile.appendChild(routeTokenTile);
+
+        var serverIdTile = this.createTile(_('ServerId'), server.serverId, 'serverId');
+        horizontalTile.appendChild(serverIdTile);
+
+        cardContent.appendChild(mainTile);
+        cardContent.appendChild(horizontalTile);
+
+        card.appendChild(cardContent);
+        var parentTile = document.createElement('div');
+        parentTile.className = 'tile is-parent is-4';
+        parentTile.appendChild(card);
+        var tileAncestor = document.getElementById('tileAncestor');
+        tileAncestor.appendChild(parentTile);
+    },
+
+    updateCardContent: function (cardId, server) {
+        var card = document.getElementById(cardId);
+        card.querySelector('#cpu-usage').textContent = server.cpu + '%';
+        card.querySelector('#mem-con').textContent = Util.humanizeMem(server.memory);
+        card.querySelector('#route').textContent = server.routeToken;
+
+        var data = this._statsData.get(server.serverId);
+
+        var memObj = this.getScaleAndLine(data.mem);
+        var cpuObj = this.getScaleAndLine(data.cpu);
+
+        var memSvg = card.querySelector('#mem-graph svg');
+        d3.select(memSvg).select('path.line')
+            .datum(data.mem)
+            .attr('d', memObj.line);
+
+        var innerWidth = this._graphDimensions.x - this._graphMargins.left - this._graphMargins.right;
+
+        var yAxisMemGenerator = d3.axisLeft(memObj.yScale)
+            .tickFormat(function (d) {
+                return Util.humanizeMem(d);
+            });
+        yAxisMemGenerator.ticks(2);
+        yAxisMemGenerator.tickSize(-innerWidth);
+
+        var yAxisMem = d3.select(memSvg).select('.y-axis')
+            .transition()
+            .duration(500)
+            .call(yAxisMemGenerator);
+
+        yAxisMem.select('.domain').attr('stroke-width', 0);
+        yAxisMem.selectAll('.tick line').attr('stroke', '#EDEDED');
+
+        var cpuSvg = card.querySelector('#cpu-graph svg');
+        d3.select(cpuSvg).select('path.line')
+            .datum(data.cpu)
+            .attr('d', cpuObj.line);
+
+        var yAxisCpuGenerator = d3.axisLeft(cpuObj.yScale)
+            .tickFormat(function (d) {
+                return d + '%';
+            });
+        yAxisCpuGenerator.ticks(2);
+        yAxisCpuGenerator.tickSize(-innerWidth);
+
+        var yAxisCpu = d3.select(cpuSvg).select('.y-axis')
+            .transition()
+            .duration(500)
+            .call(yAxisCpuGenerator);
+
+        yAxisCpu.select('.domain').attr('stroke-width', 0);
+        yAxisCpu.selectAll('.tick line').attr('stroke', '#EDEDED');
+    },
+
+    createGraph: function (graphName, data, currData) {
+        var tileParent = document.createElement('div');
+        tileParent.className = 'tile is-parent is-vertical';
+
+        var graphChild = document.createElement('div');
+        graphChild.className = 'tile is-child';
+
+        var spanforBullet = document.createElement('span');
+        spanforBullet.textContent = '● ';
+        if (graphName == 'cpu') {
+            var cpuStat = document.createElement('p');
+            cpuStat.className = 'pb-1 has-text-right';
+            spanforBullet.style = 'color:blue';
+            var spanforText = document.createElement('span');
+            spanforText.id = 'cpu-usage';
+            spanforText.textContent = currData + '%';
+
+            cpuStat.appendChild(spanforBullet);
+            cpuStat.appendChild(spanforText);
+            tileParent.appendChild(cpuStat);
+        } else if (graphName == 'mem') {
+            var memStat = document.createElement('p');
+            memStat.className = 'pb-1 has-text-right';
+            spanforBullet.style = 'color:green';
+            var spanforText = document.createElement('span');
+            spanforText.id = 'mem-con';
+            spanforText.textContent = currData;
+
+            memStat.appendChild(spanforBullet);
+            memStat.appendChild(spanforText);
+            tileParent.appendChild(memStat);
+        }
+
+        var figure = document.createElement('figure');
+        figure.id = graphName + '-graph';
+
+        var svg = d3.select(figure).append('svg')
+            .attr('viewBox', '0 0 ' + this._graphDimensions.x + ' ' + this._graphDimensions.y)
+            .append('g')
+            .attr('transform', 'translate(' + this._graphMargins.left + ',' + this._graphMargins.top + ')');
+
+        var obj = this.getScaleAndLine(data);
+
+        var yAxisGenerator;
+        if (graphName == 'cpu') {
+            yAxisGenerator = d3.axisLeft(obj.yScale)
+                .tickFormat(function (d) {
+                    return d + '%';
+                });
+            yAxisGenerator.ticks(3);
+        } else if (graphName == 'mem') {
+            yAxisGenerator = d3.axisLeft(obj.yScale)
+                .tickFormat(function (d) {
+                    return Util.humanizeMem(d);
+                });
+            yAxisGenerator.ticks(3);
+        }
+
+        var innerWidth = this._graphDimensions.x - this._graphMargins.left - this._graphMargins.right;
+        yAxisGenerator.tickSize(-innerWidth);
+
+        var yAxis = svg.append('g')
+            .attr('class', 'y-axis axis')
+            .style('font-size', '1em')
+            .call(yAxisGenerator);
+
+        yAxis.select('.domain').attr('stroke-width', 0);
+        yAxis.selectAll('.tick line').attr('stroke', '#EDEDED');
+
+        // add empty axis
+        var xAxis = svg.append('g')
+            .attr('class', 'x-axis axis')
+            .attr('transform', 'translate(0,' + (this._graphDimensions.y - this._graphMargins.bottom - this._graphMargins.top) + ')')
+            .call(d3.axisBottom(obj.xScale).tickSize(0).tickValues([]));
+
+        xAxis.select('.domain').attr('stroke', '#DBDBDB');
+
+        var lineColor = 'blue';
+        if (graphName == 'mem') {
+            lineColor = 'green';
+        }
+        svg.append('path')
+            .attr('class', 'line')
+            .datum(data)
+            .attr('d', obj.line)
+            .attr('stroke', lineColor)
+            .attr('stroke-width', 2)
+            .attr('stroke-linejoin', 'round')
+            .attr('fill', 'none');
+
+        graphChild.appendChild(figure);
+        tileParent.appendChild(graphChild);
+        return tileParent;
+    },
+
+    getScaleAndLine: function (data) {
+        var xAccessor = function (d) {
+            return d.time;
+        };
+        var yAccessor = function (d) {
+            return d.value;
+        };
+
+        var xDomain = d3.extent(data, xAccessor);
+        var yDomain = [0, d3.max(data, yAccessor)];
+
+        var width = this._graphDimensions.x - this._graphMargins.left - this._graphMargins.right;
+        var height = this._graphDimensions.y - this._graphMargins.top - this._graphMargins.bottom;
+
+        var xScale = d3.scaleTime()
+            .domain(xDomain)
+            .range([0, width]);
+
+        var yScale = d3.scaleLinear()
+            .domain(yDomain)
+            .range([height, 0]);
+
+        var line = d3.line()
+            .x(function (d) {
+                return xScale(xAccessor(d));
+            }).y(function (d) {
+                return yScale(yAccessor(d));
+            }).curve(d3.curveBumpX);
+
+        return {
+            xScale: xScale,
+            yScale: yScale,
+            line: line,
+        };
+    },
+
+    createRow: function (filename, mem, pid) {
+        var row = document.createElement('tr');
+        row.id = 'doc-' + pid;
+        var documentCell = document.createElement('td');
+        documentCell.textContent = filename;
+        documentCell.className = 'has-text-left';
+
+        var memoryCell = document.createElement('td');
+        memoryCell.textContent = mem;
+        memoryCell.className = 'has-text-centered docmem';
+        row.appendChild(documentCell);
+        row.appendChild(memoryCell);
+        return row;
+    },
+
+    createDocumentTable: function (documents) {
+        var table = document.createElement('table');
+        table.className = 'table is-fullwidth is-striped is-bordered';
+
+        var tableHeader = document.createElement('thead');
+        var tableHeaderRow = document.createElement('tr');
+        var documentNameHeader = document.createElement('th');
+
+        documentNameHeader.textContent = _('Document');
+        documentNameHeader.className = 'has-text-centered';
+
+        var documentMemoryHeader = document.createElement('th');
+        documentMemoryHeader.textContent = _('Memory');
+        documentMemoryHeader.className = 'has-text-centered';
+
+        tableHeaderRow.appendChild(documentNameHeader);
+        tableHeaderRow.appendChild(documentMemoryHeader);
+        tableHeader.appendChild(tableHeaderRow);
+        table.appendChild(tableHeader);
+
+        var tableBody = document.createElement('tbody');
+        var that = this;
+        documents.forEach(function (doc) {
+            var row = that.createRow(doc.documentName, Util.humanizeMem(doc.memoryConsumed), doc.pid);
+            tableBody.appendChild(row);
+        });
+
+        table.appendChild(tableBody);
+        return table;
+    },
+
+    createTile: function (heading, value, id) {
+        var tile = document.createElement('div');
+        tile.className = 'tile has-text-centered is-fullwidth';
+
+        var tileParent = document.createElement('div');
+        tileParent.className = 'tile is-parent';
+
+        var tileChild = document.createElement('div');
+        tileChild.className = 'tile is-child has-text-centered';
+
+        var elementHeading = document.createElement('p');
+        elementHeading.className = 'heading';
+        elementHeading.textContent = heading;
+
+        var elementValue = document.createElement('p');
+        elementValue.className = 'subtitle';
+        elementValue.textContent = value;
+        elementValue.id = id;
+
+        tileChild.appendChild(elementHeading);
+        tileChild.appendChild(elementValue);
+        tileParent.appendChild(tileChild);
+        return tileParent;
+    },
+
+    createAnchor: function (server) {
+        var anchor = document.createElement('a');
+        anchor.className = 'list-item';
+        anchor.id = 'anchor' + server.serverId;
+        anchor.href = server.ingressUrl + '/browser/dist/admin/admin.html?RouteToken=' + server.routeToken;
+        anchor.setAttribute('target', '_blank');
+        if (server.podname) {
+            anchor.textContent = server.podname;
+        } else {
+            console.warn('podname doesnot exist, using serverId instead of podname on anchor tag');
+            anchor.textContent = server.serverId;
+        }
+        return anchor;
+    },
+
+
+    updateAnchor: function (server) {
+        var anchor = document.getElementById('anchor' + server.serverId);
+        anchor.id = 'anchor' + server.serverId;
+        anchor.href = server.ingressUrl + '/browser/dist/admin/admin.html?RouteToken=' + server.routeToken;
+    },
+
+    onSocketMessage: function (e) {
+        var textMsg;
+        if (typeof e.data === 'string') {
+            textMsg = e.data;
+        }
+        else {
+            textMsg = '';
+        }
+
+        if (textMsg.startsWith('stats')) {
+            var stats = JSON.parse(textMsg.substring(textMsg.indexOf('[')));
+            var srvList = document.querySelector('#column-admin-panel .list');
+            var that = this;
+            stats.forEach(function (srvStat) {
+                var anchor = document.getElementById('anchor' + srvStat.serverId);
+                if (anchor) {
+                    that.updateAnchor(srvStat);
+                } else {
+                    anchor = that.createAnchor(srvStat);
+                    srvList.appendChild(anchor);
+                }
+                var cardId = 'card-' + srvStat.serverId;
+                var card = document.getElementById(cardId);
+                if (card) {
+                    that.updateStat(srvStat.serverId, srvStat.memory, srvStat.cpu);
+                    that.updateCardContent(cardId, srvStat);
+                } else {
+                    that.addStat(srvStat.serverId);
+                    that.createCard(srvStat);
+                }
+            });
+        } else if (textMsg.startsWith('documents')) {
+            var srvs = JSON.parse(textMsg.substring(textMsg.indexOf('[')));
+            var that = this;
+            srvs.forEach(function (srv) {
+                var cardId = 'card-' + srv.serverId;
+                var card = document.getElementById(cardId);
+                if (card && srv.documents.length) {
+                    var table = that.createDocumentTable(srv.documents);
+                    card.querySelector('.card-content').appendChild(table);
+                }
+            });
+        } else if (textMsg.startsWith('adddoc')) {
+            textMsg = textMsg.substring('adddoc'.length);
+            var tokens = textMsg.trim().split(' ');
+            if (tokens.length < 4) {
+                return;
+            }
+            var serverId = tokens[0];
+            var pid = tokens[1];
+            var filename = tokens[2];
+            var mem = tokens[3];
+            var cardId = 'card-' + serverId;
+            var card = document.getElementById(cardId);
+            if (card) {
+                var table = card.querySelector('table');
+                if (!table) {
+                    table = this.createDocumentTable([{ documentName: decodeURI(filename), memoryConsumed: mem, pid: pid }]);
+                    card.querySelector('.card-content').appendChild(table);
+                } else {
+                    var row = this.createRow(decodeURI(filename), Util.humanizeMem(Number.parseInt(mem)), pid);
+                    card.querySelector('tbody').appendChild(row);
+                }
+            }
+        } else if (textMsg.startsWith('rmdoc')) {
+            textMsg = textMsg.substring('rmdoc'.length);
+            var tokens = textMsg.trim().split(' ');
+            if (tokens.length < 3) {
+                return;
+            }
+            var serverId = tokens[0];
+            var pid = tokens[1];
+            var cardId = 'card-' + serverId;
+            var card = document.getElementById(cardId);
+            if (card) {
+                card.querySelector('#doc-' + pid).remove();
+                var rows = card.querySelectorAll('tbody tr');
+                if (rows.length == 0) {
+                    card.querySelector('table').remove();
+                }
+            }
+        } else if (textMsg.startsWith('propchange')) {
+            textMsg = textMsg.substring('propchange'.length);
+            var tokens = textMsg.trim().split(' ');
+            if (tokens.length < 3) {
+                return;
+            }
+            var serverId = tokens[0];
+            var pid = tokens[1];
+            var newMem = tokens[2];
+            var cardId = 'card-' + serverId;
+            var card = document.getElementById(cardId);
+            if (card) {
+                var row = card.querySelector('#doc-' + pid);
+                if (row) {
+                    row.querySelector('.docmem').textContent = Util.humanizeMem(Number.parseInt(newMem));
+                }
+            }
+        } else if (textMsg.startsWith('rmsrv')) {
+            textMsg = textMsg.substring('rmsrv'.length);
+            var tokens = textMsg.trim().split(' ');
+            if (tokens.length < 1) {
+                return;
+            }
+            var serverId = tokens[0];
+            var cardId = 'card-' + serverId;
+            var card = document.getElementById(cardId).parentElement;
+            if (card) {
+                card.remove();
+            }
+            var anchor = document.getElementById('anchor' + serverId);
+            if (anchor) {
+                anchor.remove();
+            }
+        } else if (textMsg.startsWith('scaling')) {
+            var msg = textMsg.split(' ')[1];
+            if (msg == 'true') {
+                var dialog = (new DlgLoading())
+                    .text(_('Please wait kubernetes cluster is scaling...'));
+                dialog.open();
+            } else {
+                this.socket.send('stats');
+                DlgLoading.close();
+            }
+        } else if (textMsg == 'InvalidAuthToken' || textMsg == 'NotAuthenticated') {
+            var msg;
+            if (window.location.protocol === 'http:') {
+                // Browsers refuse to overwrite the jwt cookie in this case.
+                msg = _('Failed to set jwt authentication cookie over insecure connection');
+            }
+            else {
+                msg = _('Failed to authenticate this session over protocol %0');
+                msg = msg.replace('%0', window.location.protocol);
+            }
+
+            var dialog = (new DlgYesNo())
+                .title(_('Warning'))
+                .text(_(msg))
+                .yesButtonText(_('OK'))
+                .noButtonText(_('Cancel'))
+                .type('warning');
+            this.pageWillBeRefreshed = true;
+            dialog.open();
+        }
+    },
+
+    onSocketOpen: function () {
+        this.socket.send('auth jwt=' + window.jwtToken + ' routeToken=' + this.routeToken);
+        this.socket.send('stats');
+        this.socket.send('documents');
+        var that = this;
+        this._statIntervalId = setInterval(function () {
+            that.socket.send('stats');
+        }, this._interval);
+    },
+
+    onSocketClose: function () {
+        clearInterval(this._statIntervalId);
+        this.base.call(this);
+    }
+});
+
+Admin.ClusterOverview = function (host, routeToken) {
+    return new AdminClusterOverview(host, routeToken);
+};

browser/admin/src/AdminClusterOverviewAbout.js

@@ -0,0 +1,35 @@
+/* -*- js-indent-level: 8 -*- */
+/* global AdminSocketBase Admin $ */
+
+var AdminClusterOverviewAbout = AdminSocketBase.extend({
+    constructor: function(host, routeToken) {
+        this.base(host);
+        this.routeToken = routeToken;
+    },
+
+    onSocketMessage: function(e) {
+        var textMsg;
+        if (typeof e.data === 'string') {
+            textMsg = e.data;
+        }
+        else {
+            textMsg = '';
+        }
+        if (textMsg.startsWith('license')) {
+            $('#license-content').html(textMsg.substring('license: '.length));
+        }
+    },
+
+    onSocketOpen: function() {
+        this.socket.send('auth jwt=' + window.jwtToken + ' routeToken=' + this.routeToken);
+        this.socket.send('license');
+    },
+
+    onSocketClose: function() {
+        this.base.call(this);
+    }
+});
+
+Admin.ClusterOverviewAbout = function(host, routeToken) {
+    return new AdminClusterOverviewAbout(host, routeToken);
+};

browser/admin/src/AdminSocketAnalytics.js

@@ -1,8 +1,17 @@
 /* -*- js-indent-level: 8 -*- */
 /*
-	Socket to be intialized on opening the analytics page in Admin console
-	containing various graphs to show to the user on specified interval
-*/
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Socket to be intialized on opening the analytics page in Admin console
+ * containing various graphs to show to the user on specified interval
+ */
 
 /* global _ d3 Util AdminSocketBase $ Admin */
 var AdminSocketAnalytics = AdminSocketBase.extend({