feat: add option to disable OCR (#768)

fixes #344
refs #767

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [jendib]

.github/workflows/build-deploy.yml

@@ -0,0 +1,84 @@
+name: Maven CI/CD
+
+on:
+  push:
+    branches: [master]
+    tags: [v*]
+  workflow_dispatch:
+
+jobs:
+  build_and_publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: "11"
+          distribution: "temurin"
+          cache: maven
+      - name: Install test dependencies
+        run: sudo apt-get update && sudo apt-get -y -q --no-install-recommends install ffmpeg mediainfo tesseract-ocr tesseract-ocr-deu
+      - name: Build with Maven
+        run: mvn --batch-mode -Pprod clean install
+      - name: Upload war artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: docs-web-ci.war
+          path: docs-web/target/docs*.war
+
+  build_docker_image:
+    name: Publish to Docker Hub
+    runs-on: ubuntu-latest
+    needs: [build_and_publish]
+
+    steps:
+      - 
+        name: Checkout
+        uses: actions/checkout@v2
+      - 
+        name: Download war artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: docs-web-ci.war
+          path: docs-web/target
+      - 
+        name: Setup up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - 
+        name: Populate Docker metadata
+        id: metadata
+        uses: docker/metadata-action@v3
+        with:
+          images: sismics/docs
+          flavor: |
+            latest=false
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ github.ref_type != 'tag' }}
+          labels: |
+            org.opencontainers.image.title = Teedy
+            org.opencontainers.image.description = Teedy is an open source, lightweight document management system for individuals and businesses.
+            org.opencontainers.image.created = ${{ github.event_created_at }}
+            org.opencontainers.image.author = Sismics
+            org.opencontainers.image.url = https://teedy.io/
+            org.opencontainers.image.vendor = Sismics
+            org.opencontainers.image.license = GPLv2
+            org.opencontainers.image.version = ${{ github.event_head_commit.id }}
+      - 
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}

.gitignore

@@ -5,7 +5,17 @@
 /*/gen
 /*/target
 /*/build
-/*/*.iml
 /out
 /.idea
 /.project
+*.iml
+node_modules
+import_test
+teedy-importer-linux
+teedy-importer-macos
+teedy-importer-win.exe
+docs/*
+!docs/.gitkeep
+
+#macos
+.DS_Store

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@sismicsdocs.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

Dockerfile

@@ -1,10 +1,75 @@
-FROM sismics/debian-java7-jetty9
+FROM ubuntu:22.04
-MAINTAINER benjamin.gam@gmail.com
+LABEL maintainer="b.gamard@sismics.com"
 
-RUN apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn
+# Run Debian in non interactive mode
+ENV DEBIAN_FRONTEND noninteractive
 
-ENV TESSDATA_PREFIX /usr/share/tesseract-ocr
+# Configure env
-ENV LC_NUMERIC C
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
+ENV JAVA_OPTIONS -Dfile.encoding=UTF-8 -Xmx1g
+ENV JETTY_VERSION 11.0.20
+ENV JETTY_HOME /opt/jetty
 
-ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war
+# Install packages
-ADD docs.xml /opt/jetty/webapps/docs.xml
+RUN apt-get update && \
+    apt-get -y -q --no-install-recommends install \
+    vim less procps unzip wget tzdata openjdk-11-jdk \
+    ffmpeg \
+    mediainfo \
+    tesseract-ocr \
+    tesseract-ocr-ara \
+    tesseract-ocr-ces \
+    tesseract-ocr-chi-sim \
+    tesseract-ocr-chi-tra \
+    tesseract-ocr-dan \
+    tesseract-ocr-deu \
+    tesseract-ocr-fin \
+    tesseract-ocr-fra \
+    tesseract-ocr-heb \
+    tesseract-ocr-hin \
+    tesseract-ocr-hun \
+    tesseract-ocr-ita \
+    tesseract-ocr-jpn \
+    tesseract-ocr-kor \
+    tesseract-ocr-lav \
+    tesseract-ocr-nld \
+    tesseract-ocr-nor \
+    tesseract-ocr-pol \
+    tesseract-ocr-por \
+    tesseract-ocr-rus \
+    tesseract-ocr-spa \
+    tesseract-ocr-swe \
+    tesseract-ocr-tha \
+    tesseract-ocr-tur \
+    tesseract-ocr-ukr \
+    tesseract-ocr-vie \
+    tesseract-ocr-sqi \
+    && apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+RUN dpkg-reconfigure -f noninteractive tzdata
+
+# Install Jetty
+RUN wget -nv -O /tmp/jetty.tar.gz \
+    "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_VERSION}/jetty-home-${JETTY_VERSION}.tar.gz" \
+    && tar xzf /tmp/jetty.tar.gz -C /opt \
+    && mv /opt/jetty* /opt/jetty \
+    && useradd jetty -U -s /bin/false \
+    && chown -R jetty:jetty /opt/jetty \
+    && mkdir /opt/jetty/webapps \
+    && chmod +x /opt/jetty/bin/jetty.sh
+
+EXPOSE 8080
+
+# Install app
+RUN mkdir /app && \
+    cd /app && \
+    java -jar /opt/jetty/start.jar --add-modules=server,http,webapp,deploy
+
+ADD docs.xml /app/webapps/docs.xml
+ADD docs-web/target/docs-web-*.war /app/webapps/docs.war
+
+WORKDIR /app
+
+CMD ["java", "-jar", "/opt/jetty/start.jar"]

README.md

@@ -1,50 +1,206 @@
-Sismics Docs
+<h3 align="center">
-============
+  <img src="https://teedy.io/img/github-title.png" alt="Teedy" width=500 />
+</h3>
 
-_Web interface_
+[![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+[![Maven CI/CD](https://github.com/sismics/docs/actions/workflows/build-deploy.yml/badge.svg)](https://github.com/sismics/docs/actions/workflows/build-deploy.yml)
 
-![Web interface](http://sismics.com/docs/screenshot1.png)
+Teedy is an open source, lightweight document management system for individuals and businesses.
 
-_Android application_
+<hr />
+<h2 align="center">
+  ✨ <a href="https://github.com/users/jendib/sponsorship">Sponsor this project if you use and appreciate it!</a> ✨
+</h2>
+<hr />
 
-![Android documents list](http://sismics.com/docs/android1.png) ![Android navigation](http://sismics.com/docs/android2.png) ![Android document details](http://sismics.com/docs/android3.png)
+![New!](https://teedy.io/img/laptop-demo.png?20180301)
 
-What is Docs?
+# Demo
----------------
 
-Docs is an open source, lightweight document management system.
+A demo is available at [demo.teedy.io](https://demo.teedy.io)
 
-Docs is written in Java, and may be run on any operating system with Java support.
+- Guest login is enabled with read access on all documents
+- "admin" login with "admin" password
+- "demo" login with "password" password 
 
-Features
+# Features
---------
 
 - Responsive user interface
 - Optical character recognition
-- Support image and PDF files
+- LDAP authentication ![New!](https://www.sismics.com/public/img/new.png)
-- Flexible search engine
+- Support image, PDF, ODT, DOCX, PPTX files
-- Full text search in image and PDF
+- Video file support
-- SHA-256 encryption
+- Flexible search engine with suggestions and highlighting
-- Tag system
+- Full text search in all supported files
-- Multi-users ACL system
+- All [Dublin Core](http://dublincore.org/) metadata
+- Custom user-defined metadata ![New!](https://www.sismics.com/public/img/new.png)
+- Workflow system ![New!](https://www.sismics.com/public/img/new.png)
+- 256-bit AES encryption of stored files
+- File versioning ![New!](https://www.sismics.com/public/img/new.png)
+- Tag system with nesting
+- Import document from email (EML format)
+- Automatic inbox scanning and importing
+- User/group permission system
+- 2-factor authentication
+- Hierarchical groups
+- Audit log
+- Comments
+- Storage quota per user
 - Document sharing by URL
 - RESTful Web API
-- Modern Android client
+- Webhooks to trigger external service
+- Fully featured Android client
+- [Bulk files importer](https://github.com/sismics/docs/tree/master/docs-importer) (single or scan mode)
+- Tested to one million documents
 
-Download
+# Install with Docker
---------
+
+A preconfigured Docker image is available, including OCR and media conversion tools, listening on port 8080. If no PostgreSQL config is provided, the database is an embedded H2 database. The H2 embedded database should only be used for testing. For production usage use the provided PostgreSQL configuration (check the Docker Compose example)
+
+**The default admin password is "admin". Don't forget to change it before going to production.**
+
+- Master branch, can be unstable. Not recommended for production use: `sismics/docs:latest`
+- Latest stable version: `sismics/docs:v1.11`
+
+The data directory is `/data`. Don't forget to mount a volume on it.
+
+To build external URL, the server is expecting a `DOCS_BASE_URL` environment variable (for example https://teedy.mycompany.com)
+
+## Available environment variables
+
+- General
+  - `DOCS_BASE_URL`: The base url used by the application. Generated url's will be using this as base.
+  - `DOCS_GLOBAL_QUOTA`: Defines the default quota applying to all users.
+  - `DOCS_BCRYPT_WORK`: Defines the work factor which is used for password hashing. The default is `10`. This value may be `4...31` including `4` and `31`. The specified value will be used for all new users and users changing their password. Be aware that setting this factor to high can heavily impact login and user creation performance.
+
+- Admin
+  - `DOCS_ADMIN_EMAIL_INIT`: Defines the e-mail-address the admin user should have upon initialization.
+  - `DOCS_ADMIN_PASSWORD_INIT`: Defines the password the admin user should have upon initialization.  Needs to be a bcrypt hash.  **Be aware that `$` within the hash have to be escaped with a second `$`.**
+
+- Database
+  - `DATABASE_URL`: The jdbc connection string to be used by `hibernate`.
+  - `DATABASE_USER`: The user which should be used for the database connection.
+  - `DATABASE_PASSWORD`: The password to be used for the database connection.
+  - `DATABASE_POOL_SIZE`: The pool size to be used for the database connection.
+
+- Language
+  - `DOCS_DEFAULT_LANGUAGE`: The language which will be used as default. Currently supported values are:
+    - `eng`, `fra`, `ita`, `deu`, `spa`, `por`, `pol`, `rus`, `ukr`, `ara`, `hin`, `chi_sim`, `chi_tra`, `jpn`, `tha`, `kor`, `nld`, `tur`, `heb`, `hun`, `fin`, `swe`, `lav`, `dan`
+
+- E-Mail
+  - `DOCS_SMTP_HOSTNAME`: Hostname of the SMTP-Server to be used by Teedy.
+  - `DOCS_SMTP_PORT`: The port which should be used.
+  - `DOCS_SMTP_USERNAME`: The username to be used.
+  - `DOCS_SMTP_PASSWORD`: The password to be used.
+
+## Examples
+
+In the following examples some passwords are exposed in cleartext. This was done in order to keep the examples simple. We strongly encourage you to use variables with an `.env` file or other means to securely store your passwords.
+
+
+### Default, using PostgreSQL
+
+```yaml
+version: '3'
+services:
+# Teedy Application
+  teedy-server:
+    image: sismics/docs:v1.11
+    restart: unless-stopped
+    ports:
+      # Map internal port to host
+      - 8080:8080
+    environment:
+      # Base url to be used
+      DOCS_BASE_URL: "https://docs.example.com"
+      # Set the admin email
+      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+      # Set the admin password (in this example: "superSecure")
+      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+      # Setup the database connection. "teedy-db" is the hostname
+      # and "teedy" is the name of the database the application
+      # will connect to.
+      DATABASE_URL: "jdbc:postgresql://teedy-db:5432/teedy"
+      DATABASE_USER: "teedy_db_user"
+      DATABASE_PASSWORD: "teedy_db_password"
+      DATABASE_POOL_SIZE: "10"
+    volumes:
+      - ./docs/data:/data
+    networks:
+      - docker-internal
+      - internet
+    depends_on:
+      - teedy-db
+
+# DB for Teedy
+  teedy-db:
+    image: postgres:13.1-alpine
+    restart: unless-stopped
+    expose:
+      - 5432
+    environment:
+      POSTGRES_USER: "teedy_db_user"
+      POSTGRES_PASSWORD: "teedy_db_password"
+      POSTGRES_DB: "teedy"
+    volumes:
+      - ./docs/db:/var/lib/postgresql/data
+    networks:
+      - docker-internal
+
+networks:
+  # Network without internet access. The db does not need
+  # access to the host network.
+  docker-internal:
+    driver: bridge
+    internal: true
+  internet:
+    driver: bridge
+```
+
+### Using the internal database (only for testing)
+
+```yaml
+version: '3'
+services:
+# Teedy Application
+  teedy-server:
+    image: sismics/docs:v1.11
+    restart: unless-stopped
+    ports:
+      # Map internal port to host
+      - 8080:8080
+    environment:
+      # Base url to be used
+      DOCS_BASE_URL: "https://docs.example.com"
+      # Set the admin email
+      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+      # Set the admin password (in this example: "superSecure")
+      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+    volumes:
+      - ./docs/data:/data
+```
+
+# Manual installation
+
+## Requirements
+
+- Java 11
+- Tesseract 4 for OCR
+- ffmpeg for video thumbnails
+- mediainfo for video metadata extraction
+- A webapp server like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/)
+
+## Download
 
 The latest release is downloadable here: <https://github.com/sismics/docs/releases> in WAR format. 
-You will need a Java webapp server to run it, like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/)
+**The default admin password is "admin". Don't forget to change it before going to production.**
 
-How to build Docs from the sources
+## How to build Teedy from the sources
-----------------------------------
 
-Prerequisites: JDK 7 with JCE, Maven 3, Tesseract 3.02
+Prerequisites: JDK 11, Maven 3, NPM, Grunt, Tesseract 4
 
-Docs is organized in several Maven modules:
+Teedy is organized in several Maven modules:
 
-  - docs-parent
 - docs-core
 - docs-web
 - docs-web-common
@@ -52,29 +208,39 @@ Docs is organized in several Maven modules:
 First off, clone the repository: `git clone git://github.com/sismics/docs.git`
 or download the sources from GitHub.
 
-#### Launch the build
+### Launch the build
 
-From the `docs-parent` directory:
+From the root directory:
 
-    mvn -Pinit validate -N
+```console
 mvn clean -DskipTests install
+```
 
-#### Run a stand-alone version
+### Run a stand-alone version
 
 From the `docs-web` directory:
 
+```console
 mvn jetty:run
+```
 
-#### Build a .war to deploy to your servlet container
+### Build a .war to deploy to your servlet container
 
 From the `docs-web` directory:
 
+```console
 mvn -Pprod -DskipTests clean install
+```
 
-You will get your deployable WAR in the `target` directory.
+You will get your deployable WAR in the `docs-web/target` directory.
 
-License
+# Contributing
--------
 
-Docs is released under the terms of the GPL license. See `COPYING` for more
+All contributions are more than welcomed. Contributions may close an issue, fix a bug (reported or not reported), improve the existing code, add new feature, and so on.
+
+The `master` branch is the default and base branch for the project. It is used for development and all Pull Requests should go there.
+
+# License
+
+Teedy is released under the terms of the GPL license. See `COPYING` for more
 information or see <http://opensource.org/licenses/GPL-2.0>.

build.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-docker build -t sismics/docs .

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3'
+services:
+# Teedy Application
+  teedy-server:
+    image: sismics/docs:v1.10
+    restart: unless-stopped
+    ports:
+      # Map internal port to host
+      - 8080:8080
+    environment:
+      # Base url to be used
+      DOCS_BASE_URL: "https://docs.example.com"
+      # Set the admin email
+      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+      # Set the admin password (in this example: "superSecure")
+      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+    volumes:
+      - ./docs/data:/data

docs-android/app/app.iml

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="docs-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.shamanland/fab/0.0.6/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/it.sephiroth.android.library.easing/android-easing/1.0.3/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/it.sephiroth.android.library.imagezoom/imagezoom/1.0.5/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/source" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
-    <orderEntry type="library" exported="" name="fab-0.0.6" level="project" />
-    <orderEntry type="library" exported="" name="android-easing-1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="imagezoom-1.0.5" level="project" />
-    <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="android-query.0.26.8" level="project" />
-    <orderEntry type="library" exported="" name="tokenautocomplete-1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
-  </component>
-</module>

docs-android/app/build.gradle

@@ -1,46 +1,27 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 apply plugin: 'com.android.application'
 
 repositories {
-    mavenCentral()
+    jcenter()
+    google()
 }
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 28
-    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName '1.0'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    signingConfigs {
-        release {
-            storeFile file(System.getenv("TRACKINO_STORE_PATH"))
-            storePassword System.getenv("TRACKINO_STORE_PASS")
-            keyAlias System.getenv("TRACKINO_STORE_ALIAS")
-            keyPassword System.getenv("TRACKINO_STORE_KEYPASS")
-        }
-    }
-
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
     }
 
     lintOptions {
@@ -49,11 +30,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
+    implementation fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.android.support:appcompat-v7:22.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
-    compile 'com.android.support:recyclerview-v7:22.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    compile 'com.loopj.android:android-async-http:1.4.6'
+    implementation 'com.android.support:design:28.0.0'
-    compile 'it.sephiroth.android.library.imagezoom:imagezoom:1.0.5'
+    implementation 'it.sephiroth.android.library.imagezoom:imagezoom:1.0.5'
-    compile 'de.greenrobot:eventbus:2.4.0'
+    implementation 'org.greenrobot:eventbus:3.1.1'
-    compile 'com.shamanland:fab:0.0.6'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
+    implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
 }

docs-android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sismics.docs" >
+    package="com.sismics.docs"
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".MainApplication"
@@ -27,6 +29,7 @@
             android:name=".activity.MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
+            android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -42,11 +45,24 @@
         <activity
             android:name=".activity.DocumentViewActivity"
             android:label="">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".activity.DocumentEditActivity"
             android:label="@string/new_document">
         </activity>
+        <activity
+            android:name=".activity.AuditLogActivity"
+            android:label="@string/latest_activity">
+        </activity>
+        <activity
+            android:name=".activity.UserProfileActivity">
+        </activity>
+        <activity
+            android:name=".activity.GroupProfileActivity">
+        </activity>
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/settings">

docs-android/app/src/main/java/com/sismics/docs/MainApplication.java

@@ -1,8 +1,8 @@
 package com.sismics.docs;
 
 import android.app.Application;
+import android.support.v7.app.AppCompatDelegate;
 
-import com.androidquery.callback.BitmapAjaxCallback;
 import com.sismics.docs.model.application.ApplicationContext;
 import com.sismics.docs.util.PreferenceUtil;
 
@@ -20,14 +20,10 @@ public class MainApplication extends Application {
         JSONObject json = PreferenceUtil.getCachedJson(getApplicationContext(), PreferenceUtil.PREF_CACHED_USER_INFO_JSON);
         ApplicationContext.getInstance().setUserInfo(getApplicationContext(), json);
 
-        // TODO google docs app: right drawer with all actions, with acls, with deep metadatas
         // TODO Provide documents to intent action get content
 
         super.onCreate();
-    }
 
-    @Override
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-    public void onLowMemory() {
-        BitmapAjaxCallback.clearCache();
     }
 }

docs-android/app/src/main/java/com/sismics/docs/activity/AuditLogActivity.java

@@ -0,0 +1,121 @@
+package com.sismics.docs.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+
+import com.sismics.docs.R;
+import com.sismics.docs.adapter.AuditLogListAdapter;
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.model.application.ApplicationContext;
+import com.sismics.docs.resource.AuditLogResource;
+
+import org.json.JSONObject;
+
+/**
+ * Audit log activity.
+ *
+ * @author bgamard.
+ */
+public class AuditLogActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Check if logged in
+        if (!ApplicationContext.getInstance().isLoggedIn()) {
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
+            return;
+        }
+
+        // Handle activity context
+        if (getIntent() == null) {
+            finish();
+            return;
+        }
+
+        // Input document ID (optional)
+        final String documentId = getIntent().getStringExtra("documentId");
+
+        // Setup the activity
+        setContentView(R.layout.auditlog_activity);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+        }
+
+        // Configure the swipe refresh layout
+        SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout);
+        swipeRefreshLayout.setColorSchemeResources(android.R.color.holo_blue_bright,
+                android.R.color.holo_green_light,
+                android.R.color.holo_orange_light,
+                android.R.color.holo_red_light);
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                refreshView(documentId);
+            }
+        });
+
+        // Navigate to user profile on click
+        final ListView auditLogListView = findViewById(R.id.auditLogListView);
+        auditLogListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (auditLogListView.getAdapter() == null) {
+                    return;
+                }
+                AuditLogListAdapter adapter = (AuditLogListAdapter) auditLogListView.getAdapter();
+                String username = adapter.getItem(position).optString("username");
+                Intent intent = new Intent(AuditLogActivity.this, UserProfileActivity.class);
+                intent.putExtra("username", username);
+                startActivity(intent);
+            }
+        });
+
+        // Get audit log list
+        refreshView(documentId);
+    }
+
+    /**
+     * Refresh the view.
+     */
+    private void refreshView(String documentId) {
+        final SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout);
+        final ProgressBar progressBar = findViewById(R.id.progressBar);
+        final ListView auditLogListView = findViewById(R.id.auditLogListView);
+        progressBar.setVisibility(View.VISIBLE);
+        auditLogListView.setVisibility(View.GONE);
+        AuditLogResource.list(this, documentId, new HttpCallback() {
+            @Override
+            public void onSuccess(JSONObject response) {
+                auditLogListView.setAdapter(new AuditLogListAdapter(AuditLogActivity.this, response.optJSONArray("logs")));
+            }
+
+            @Override
+            public void onFinish() {
+                progressBar.setVisibility(View.GONE);
+                auditLogListView.setVisibility(View.VISIBLE);
+                swipeRefreshLayout.setRefreshing(false);
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java

@@ -1,7 +1,6 @@
 package com.sismics.docs.activity;
 
 import android.app.ProgressDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -17,7 +16,7 @@ import com.sismics.docs.adapter.LanguageAdapter;
 import com.sismics.docs.adapter.TagAutoCompleteAdapter;
 import com.sismics.docs.event.DocumentAddEvent;
 import com.sismics.docs.event.DocumentEditEvent;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.resource.DocumentResource;
 import com.sismics.docs.ui.form.Validator;
 import com.sismics.docs.ui.form.validator.Required;
@@ -25,7 +24,7 @@ import com.sismics.docs.ui.view.DatePickerView;
 import com.sismics.docs.ui.view.TagsCompleteTextView;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -36,8 +35,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Document edition activity.
  *
@@ -104,7 +101,7 @@ public class DocumentEditActivity extends AppCompatActivity {
             finish();
             return;
         }
-        JSONArray tagArray = tags.optJSONArray("stats");
+        JSONArray tagArray = tags.optJSONArray("tags");
 
         List<JSONObject> tagList = new ArrayList<>();
         for (int i = 0; i < tagArray.length(); i++) {
@@ -124,7 +121,7 @@ public class DocumentEditActivity extends AppCompatActivity {
         } else {
             setTitle(R.string.edit_document);
             titleEditText.setText(document.optString("title"));
-            descriptionEditText.setText(document.optString("description"));
+            descriptionEditText.setText(document.isNull("description") ? "" : document.optString("description"));
             datePickerView.setDate(new Date(document.optLong("create_date")));
             languageSpinner.setSelection(languageAdapter.getItemPosition(document.optString("language")));
             JSONArray documentTags = document.optJSONArray("tags");
@@ -165,18 +162,12 @@ public class DocumentEditActivity extends AppCompatActivity {
                 // Cancellable progress dialog
                 final ProgressDialog progressDialog = ProgressDialog.show(this,
                         getString(R.string.please_wait),
-                        getString(R.string.document_editing_message), true, true,
+                        getString(R.string.document_editing_message), true, true);
-                        new DialogInterface.OnCancelListener() {
-                            @Override
-                            public void onCancel(DialogInterface dialog) {
-                                DocumentResource.cancel(DocumentEditActivity.this);
-                            }
-                        });
 
                 // Server callback
-                JsonHttpResponseHandler callback = new JsonHttpResponseHandler() {
+                HttpCallback callback = new HttpCallback() {
                     @Override
-                    public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                    public void onSuccess(JSONObject response) {
                         // Build a fake document JSON to update the UI
                         final JSONObject outputDoc = new JSONObject();
                         try {
@@ -211,7 +202,7 @@ public class DocumentEditActivity extends AppCompatActivity {
                     }
 
                     @Override
-                    public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                    public void onFailure(JSONObject json, Exception e) {
                         Toast.makeText(DocumentEditActivity.this, R.string.error_editing_document, Toast.LENGTH_LONG).show();
                     }
 

docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java

@@ -1,16 +1,13 @@
 package com.sismics.docs.activity;
 
 import android.app.AlertDialog;
-import android.app.DownloadManager;
 import android.app.ProgressDialog;
 import android.content.ClipData;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.view.ViewPager;
@@ -19,11 +16,16 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
+import android.text.method.LinkMovementMethod;
+import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -31,22 +33,30 @@ import android.widget.Toast;
 
 import com.sismics.docs.R;
 import com.sismics.docs.adapter.AclListAdapter;
+import com.sismics.docs.adapter.CommentListAdapter;
 import com.sismics.docs.adapter.FilePagerAdapter;
+import com.sismics.docs.event.CommentAddEvent;
+import com.sismics.docs.event.CommentDeleteEvent;
 import com.sismics.docs.event.DocumentDeleteEvent;
 import com.sismics.docs.event.DocumentEditEvent;
 import com.sismics.docs.event.DocumentFullscreenEvent;
 import com.sismics.docs.event.FileAddEvent;
 import com.sismics.docs.event.FileDeleteEvent;
+import com.sismics.docs.fragment.DocExportPdfFragment;
 import com.sismics.docs.fragment.DocShareFragment;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.model.application.ApplicationContext;
+import com.sismics.docs.resource.CommentResource;
 import com.sismics.docs.resource.DocumentResource;
 import com.sismics.docs.resource.FileResource;
 import com.sismics.docs.service.FileUploadService;
+import com.sismics.docs.util.NetworkUtil;
 import com.sismics.docs.util.PreferenceUtil;
-import com.sismics.docs.util.TagUtil;
+import com.sismics.docs.util.SpannableUtil;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -55,8 +65,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Document activity.
  * 
@@ -68,11 +76,6 @@ public class DocumentViewActivity extends AppCompatActivity {
      */
     public static final int REQUEST_CODE_ADD_FILE = 1;
 
-    /**
-     * Request code of editing document.
-     */
-    public static final int REQUEST_CODE_EDIT_DOCUMENT = 2;
-
     /**
      * File view pager.
      */
@@ -83,6 +86,11 @@ public class DocumentViewActivity extends AppCompatActivity {
      */
     private FilePagerAdapter filePagerAdapter;
 
+    /**
+     * Comment list adapter.
+     */
+    private CommentListAdapter commentListAdapter;
+
     /**
      * Document displayed.
      */
@@ -142,7 +150,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param document Document in JSON format
      */
-    private void refreshDocument(JSONObject document) {
+    private void refreshDocument(final JSONObject document) {
         this.document = document;
 
         String title = document.optString("title");
@@ -164,28 +172,33 @@ public class DocumentViewActivity extends AppCompatActivity {
         }
 
         // Fill the layout
+        // Create date
         TextView createdDateTextView = (TextView) findViewById(R.id.createdDateTextView);
         createdDateTextView.setText(date);
 
+        // Description
         TextView descriptionTextView = (TextView) findViewById(R.id.descriptionTextView);
-        if (description == null || description.isEmpty()) {
+        if (description.isEmpty() || document.isNull("description")) {
             descriptionTextView.setVisibility(View.GONE);
         } else {
             descriptionTextView.setVisibility(View.VISIBLE);
             descriptionTextView.setText(description);
         }
 
+        // Tags
         TextView tagTextView = (TextView) findViewById(R.id.tagTextView);
         if (tags.length() == 0) {
             tagTextView.setVisibility(View.GONE);
         } else {
             tagTextView.setVisibility(View.VISIBLE);
-            tagTextView.setText(TagUtil.buildSpannable(tags));
+            tagTextView.setText(SpannableUtil.buildSpannableTags(tags));
         }
 
+        // Language
         ImageView languageImageView = (ImageView) findViewById(R.id.languageImageView);
         languageImageView.setImageResource(getResources().getIdentifier(language, "drawable", getPackageName()));
 
+        // Shared status
         ImageView sharedImageView = (ImageView) findViewById(R.id.sharedImageView);
         sharedImageView.setVisibility(shared ? View.VISIBLE : View.GONE);
 
@@ -196,7 +209,7 @@ public class DocumentViewActivity extends AppCompatActivity {
             public void onClick(View view) {
                 Intent intent = new Intent(DocumentViewActivity.this, DocumentEditActivity.class);
                 intent.putExtra("document", DocumentViewActivity.this.document.toString());
-                startActivityForResult(intent, REQUEST_CODE_EDIT_DOCUMENT);
+                startActivity(intent);
             }
         });
 
@@ -231,20 +244,75 @@ public class DocumentViewActivity extends AppCompatActivity {
             }
         });
 
+        // Action export PDF
+        button = (Button) findViewById(R.id.actionExportPdf);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                DialogFragment dialog = DocExportPdfFragment.newInstance(
+                        document.optString("id"), document.optString("title"));
+                dialog.show(getSupportFragmentManager(), "DocExportPdfFragment");
+            }
+        });
+
         // Action share
         button = (Button) findViewById(R.id.actionSharing);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                DialogFragment dialog = DocShareFragment.newInstance(DocumentViewActivity.this.document.optString("id"));
+                DialogFragment dialog = DocShareFragment.newInstance(document.optString("id"));
                 dialog.show(getSupportFragmentManager(), "DocShareFragment");
             }
         });
 
+        // Action audit log
+        button = (Button) findViewById(R.id.actionAuditLog);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(DocumentViewActivity.this, AuditLogActivity.class);
+                intent.putExtra("documentId", document.optString("id"));
+                startActivity(intent);
+            }
+        });
+
+        // Button add a comment
+        ImageButton imageButton = (ImageButton) findViewById(R.id.addCommentBtn);
+        imageButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final EditText commentEditText = (EditText) findViewById(R.id.commentEditText);
+                if (commentEditText.getText().length() == 0) {
+                    // No content for the new comment
+                    return;
+                }
+
+                Toast.makeText(DocumentViewActivity.this, R.string.adding_comment, Toast.LENGTH_LONG).show();
+
+                CommentResource.add(DocumentViewActivity.this,
+                        DocumentViewActivity.this.document.optString("id"),
+                        commentEditText.getText().toString(),
+                        new HttpCallback() {
+                    public void onSuccess(JSONObject response) {
+                        EventBus.getDefault().post(new CommentAddEvent(response));
+                        commentEditText.setText("");
+                    }
+
+                    @Override
+                    public void onFailure(JSONObject json, Exception e) {
+                        Toast.makeText(DocumentViewActivity.this, R.string.comment_add_failure, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        });
+
+        // Grab the comments
+        updateComments();
+
         // Grab the attached files
         updateFiles();
 
-        // Grab the full document (used for ACLs and writable status)
+        // Grab the full document (used for ACLs, remaining metadata and writable status)
         updateDocument();
     }
 
@@ -268,6 +336,15 @@ public class DocumentViewActivity extends AppCompatActivity {
                 }
                 return true;
 
+            case R.id.comments:
+                drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+                if (drawerLayout.isDrawerVisible(GravityCompat.START)) {
+                    drawerLayout.closeDrawer(GravityCompat.START);
+                } else {
+                    drawerLayout.openDrawer(GravityCompat.START);
+                }
+                return true;
+
             case R.id.download_file:
                 downloadCurrentFile();
                 return true;
@@ -299,11 +376,11 @@ public class DocumentViewActivity extends AppCompatActivity {
         int position = fileViewPager.getCurrentItem();
         if (mimeType == null || !mimeType.contains("/")) return;
         String ext = mimeType.split("/")[1];
-        String fileName = getTitle() + "-" + position + "." + ext;
+        String fileName = document.optString("title") + "-" + position + "." + ext;
 
         // Download the file
         String fileUrl = PreferenceUtil.getServerUrl(this) + "/api/file/" + file.optString("id") + "/data";
-        downloadFile(fileUrl, fileName, getTitle().toString(), getString(R.string.downloading_file, position + 1));
+        NetworkUtil.downloadFile(this, fileUrl, fileName, document.optString("title"), getString(R.string.download_file_title));
     }
 
     private void deleteCurrentFile() {
@@ -326,24 +403,18 @@ public class DocumentViewActivity extends AppCompatActivity {
                         // Show a progress dialog while deleting
                         final ProgressDialog progressDialog = ProgressDialog.show(DocumentViewActivity.this,
                                 getString(R.string.please_wait),
-                                getString(R.string.file_deleting_message), true, true,
+                                getString(R.string.file_deleting_message), true, true);
-                                new DialogInterface.OnCancelListener() {
-                                    @Override
-                                    public void onCancel(DialogInterface dialog) {
-                                        FileResource.cancel(DocumentViewActivity.this);
-                                    }
-                                });
 
                         // Actual delete server call
                         final String fileId = file.optString("id");
-                        FileResource.delete(DocumentViewActivity.this, fileId, new JsonHttpResponseHandler() {
+                        FileResource.delete(DocumentViewActivity.this, fileId, new HttpCallback() {
                             @Override
-                            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                            public void onSuccess(JSONObject response) {
                                 EventBus.getDefault().post(new FileDeleteEvent(fileId));
                             }
 
                             @Override
-                            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                            public void onFailure(JSONObject json, Exception e) {
                                 Toast.makeText(DocumentViewActivity.this, R.string.file_delete_failure, Toast.LENGTH_LONG).show();
                             }
 
@@ -368,28 +439,8 @@ public class DocumentViewActivity extends AppCompatActivity {
     private void downloadZip() {
         if (document == null) return;
         String url = PreferenceUtil.getServerUrl(this) + "/api/file/zip?id=" + document.optString("id");
-        String fileName = getTitle() + ".zip";
+        String fileName = document.optString("title") + ".zip";
-        downloadFile(url, fileName, getTitle().toString(), getString(R.string.downloading_document));
+        NetworkUtil.downloadFile(this, url, fileName, document.optString("title"), getString(R.string.download_document_title));
-    }
-
-    /**
-     * Download a file using Android download manager.
-     *
-     * @param url URL to download
-     * @param fileName Destination file name
-     * @param title Notification title
-     * @param description Notification description
-     */
-    private void downloadFile(String url, String fileName, String title, String description) {
-        String authToken = PreferenceUtil.getAuthToken(this);
-        DownloadManager downloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName);
-        request.addRequestHeader("Cookie", "auth_token=" + authToken);
-        request.setTitle(title);
-        request.setDescription(description);
-        downloadManager.enqueue(request);
     }
 
     /**
@@ -411,24 +462,18 @@ public class DocumentViewActivity extends AppCompatActivity {
                         // Show a progress dialog while deleting
                         final ProgressDialog progressDialog = ProgressDialog.show(DocumentViewActivity.this,
                                 getString(R.string.please_wait),
-                                getString(R.string.document_deleting_message), true, true,
+                                getString(R.string.document_deleting_message), true, true);
-                                new DialogInterface.OnCancelListener() {
-                                    @Override
-                                    public void onCancel(DialogInterface dialog) {
-                                        DocumentResource.cancel(DocumentViewActivity.this);
-                                    }
-                                });
 
                         // Actual delete server call
                         final String documentId = document.optString("id");
-                        DocumentResource.delete(DocumentViewActivity.this, documentId, new JsonHttpResponseHandler() {
+                        DocumentResource.delete(DocumentViewActivity.this, documentId, new HttpCallback() {
                             @Override
-                            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                            public void onSuccess(JSONObject response) {
                                 EventBus.getDefault().post(new DocumentDeleteEvent(documentId));
                             }
 
                             @Override
-                            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                            public void onFailure(JSONObject json, Exception e) {
                                 Toast.makeText(DocumentViewActivity.this, R.string.document_delete_failure, Toast.LENGTH_LONG).show();
                             }
 
@@ -453,6 +498,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param event Document fullscreen event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentFullscreenEvent event) {
         findViewById(R.id.detailLayout).setVisibility(event.isFullscreen() ? View.GONE : View.VISIBLE);
     }
@@ -462,6 +508,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param event Document edit event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentEditEvent event) {
         if (document == null) return;
         if (event.getDocument().optString("id").equals(document.optString("id"))) {
@@ -475,6 +522,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param event Document delete event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentDeleteEvent event) {
         if (document == null) return;
         if (event.getDocumentId().equals(document.optString("id"))) {
@@ -488,6 +536,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param event File delete event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(FileDeleteEvent event) {
         if (filePagerAdapter == null) return;
         filePagerAdapter.remove(event.getFileId());
@@ -500,6 +549,7 @@ public class DocumentViewActivity extends AppCompatActivity {
      *
      * @param event File add event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(FileAddEvent event) {
         if (document == null) return;
         if (document.optString("id").equals(event.getDocumentId())) {
@@ -507,6 +557,38 @@ public class DocumentViewActivity extends AppCompatActivity {
         }
     }
 
+    /**
+     * A comment add event has been fired.
+     *
+     * @param event Comment add event
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CommentAddEvent event) {
+        if (commentListAdapter == null) return;
+        TextView emptyView = (TextView) findViewById(R.id.commentEmptyView);
+        ListView listView = (ListView) findViewById(R.id.commentListView);
+        emptyView.setVisibility(View.GONE);
+        listView.setVisibility(View.VISIBLE);
+        commentListAdapter.add(event.getComment());
+    }
+
+    /**
+     * A comment delete event has been fired.
+     *
+     * @param event Comment add event
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CommentDeleteEvent event) {
+        if (commentListAdapter == null) return;
+        TextView emptyView = (TextView) findViewById(R.id.commentEmptyView);
+        ListView listView = (ListView) findViewById(R.id.commentListView);
+        commentListAdapter.remove(event.getCommentId());
+        if (commentListAdapter.getCount() == 0) {
+            emptyView.setVisibility(View.VISIBLE);
+            listView.setVisibility(View.GONE);
+        }
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (document == null) return;
@@ -550,9 +632,9 @@ public class DocumentViewActivity extends AppCompatActivity {
         // Silently get the document to know if it is writable by the current user
         // If this call fails or is slow and the document is read-only,
         // write actions will be allowed and will fail
-        DocumentResource.get(this, document.optString("id"), new JsonHttpResponseHandler() {
+        DocumentResource.get(this, document.optString("id"), new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 document = response;
                 boolean writable = document.optBoolean("writable");
 
@@ -560,14 +642,171 @@ public class DocumentViewActivity extends AppCompatActivity {
                     menu.findItem(R.id.delete_file).setVisible(writable);
                 }
 
-                findViewById(R.id.actionEditDocument).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
+                // Action only available if the document is writable
-                findViewById(R.id.actionUploadFile).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
+                findViewById(R.id.actionEditDocument).setVisibility(writable ? View.VISIBLE : View.GONE);
-                findViewById(R.id.actionSharing).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
+                findViewById(R.id.actionUploadFile).setVisibility(writable ? View.VISIBLE : View.GONE);
-                findViewById(R.id.actionDelete).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
+                findViewById(R.id.actionSharing).setVisibility(writable ? View.VISIBLE : View.GONE);
+                findViewById(R.id.actionDelete).setVisibility(writable ? View.VISIBLE : View.GONE);
 
                 // ACLs
                 ListView aclListView = (ListView) findViewById(R.id.aclListView);
-                aclListView.setAdapter(new AclListAdapter(document.optJSONArray("acls")));
+                final AclListAdapter aclListAdapter = new AclListAdapter(document.optJSONArray("acls"));
+                aclListView.setAdapter(aclListAdapter);
+                aclListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        AclListAdapter.AclItem acl = aclListAdapter.getItem(position);
+                        if (acl.getType().equals("USER")) {
+                            Intent intent = new Intent(DocumentViewActivity.this, UserProfileActivity.class);
+                            intent.putExtra("username", acl.getName());
+                            startActivity(intent);
+                        } else if (acl.getType().equals("GROUP")) {
+                            Intent intent = new Intent(DocumentViewActivity.this, GroupProfileActivity.class);
+                            intent.putExtra("name", acl.getName());
+                            startActivity(intent);
+                        }
+                    }
+                });
+
+                // Remaining metadata
+                TextView creatorTextView = (TextView) findViewById(R.id.creatorTextView);
+                final String creator = document.optString("creator");
+                creatorTextView.setText(creator);
+                creatorTextView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(DocumentViewActivity.this, UserProfileActivity.class);
+                        intent.putExtra("username", creator);
+                        startActivity(intent);
+                    }
+                });
+
+                // Contributors
+                TextView contributorsTextView = (TextView) findViewById(R.id.contributorsTextView);
+                contributorsTextView.setText(SpannableUtil.buildSpannableContributors(document.optJSONArray("contributors")));
+
+                // Relations
+                JSONArray relations = document.optJSONArray("relations");
+                if (relations.length() > 0) {
+                    TextView relationsTextView = (TextView) findViewById(R.id.relationsTextView);
+                    relationsTextView.setMovementMethod(LinkMovementMethod.getInstance());
+                    relationsTextView.setText(SpannableUtil.buildSpannableRelations(relations));
+                } else {
+                    findViewById(R.id.relationsLayout).setVisibility(View.GONE);
+                }
+
+                // Additional dublincore metadata
+                displayDublincoreMetadata(R.id.subjectTextView, R.id.subjectLayout, "subject");
+                displayDublincoreMetadata(R.id.identifierTextView, R.id.identifierLayout, "identifier");
+                displayDublincoreMetadata(R.id.publisherTextView, R.id.publisherLayout, "publisher");
+                displayDublincoreMetadata(R.id.formatTextView, R.id.formatLayout, "format");
+                displayDublincoreMetadata(R.id.sourceTextView, R.id.sourceLayout, "source");
+                displayDublincoreMetadata(R.id.typeTextView, R.id.typeLayout, "type");
+                displayDublincoreMetadata(R.id.coverageTextView, R.id.coverageLayout, "coverage");
+                displayDublincoreMetadata(R.id.rightsTextView, R.id.rightsLayout, "rights");
+            }
+        });
+    }
+
+    /**
+     * Display a dublincore metadata.
+     *
+     * @param textViewId TextView ID
+     * @param blockViewId View ID
+     * @param name Name
+     */
+    private void displayDublincoreMetadata(int textViewId, int blockViewId, String name) {
+        if (document == null) return;
+        String value = document.optString(name);
+        if (document.isNull(name) || value.isEmpty()) {
+            findViewById(blockViewId).setVisibility(View.GONE);
+            return;
+        }
+
+        findViewById(blockViewId).setVisibility(View.VISIBLE);
+        TextView textView = (TextView) findViewById(textViewId);
+        textView.setText(value);
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
+        switch (view.getId()) {
+            case R.id.commentListView:
+                if (commentListAdapter == null || document == null) return;
+                AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
+                JSONObject comment = commentListAdapter.getItem(info.position);
+                boolean writable = document.optBoolean("writable");
+                String creator = comment.optString("creator");
+                String username = ApplicationContext.getInstance().getUserInfo().optString("username");
+                if (writable || creator.equals(username)) {
+                    menu.add(Menu.NONE, 0, 0, getString(R.string.comment_delete));
+                }
+        }
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        // Use real ids if more than one item someday
+        if (item.getItemId() == 0) {
+            // Delete a comment
+            AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo)item.getMenuInfo();
+            if (commentListAdapter == null) return false;
+            JSONObject comment = commentListAdapter.getItem(info.position);
+            final String commentId = comment.optString("id");
+            Toast.makeText(DocumentViewActivity.this, R.string.deleting_comment, Toast.LENGTH_LONG).show();
+
+            CommentResource.remove(DocumentViewActivity.this, commentId, new HttpCallback() {
+                @Override
+                public void onSuccess(JSONObject response) {
+                    EventBus.getDefault().post(new CommentDeleteEvent(commentId));
+                }
+
+                @Override
+                public void onFailure(JSONObject json, Exception e) {
+                    Toast.makeText(DocumentViewActivity.this, R.string.error_deleting_comment, Toast.LENGTH_LONG).show();
+                }
+            });
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Refresh comments list.
+     */
+    private void updateComments() {
+        if (document == null) return;
+
+        final View progressBar = findViewById(R.id.commentProgressView);
+        final TextView emptyView = (TextView) findViewById(R.id.commentEmptyView);
+        final ListView listView = (ListView) findViewById(R.id.commentListView);
+        progressBar.setVisibility(View.VISIBLE);
+        emptyView.setVisibility(View.GONE);
+        listView.setVisibility(View.GONE);
+        registerForContextMenu(listView);
+
+        CommentResource.list(this, document.optString("id"), new HttpCallback() {
+            @Override
+            public void onSuccess(JSONObject response) {
+                JSONArray comments = response.optJSONArray("comments");
+                commentListAdapter = new CommentListAdapter(DocumentViewActivity.this, comments);
+                listView.setAdapter(commentListAdapter);
+                listView.setVisibility(View.VISIBLE);
+                progressBar.setVisibility(View.GONE);
+                if (comments.length() == 0) {
+                    listView.setVisibility(View.GONE);
+                    emptyView.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onFailure(JSONObject json, Exception e) {
+                emptyView.setText(R.string.error_loading_comments);
+                progressBar.setVisibility(View.GONE);
+                listView.setVisibility(View.GONE);
+                emptyView.setVisibility(View.VISIBLE);
             }
         });
     }
@@ -586,9 +825,9 @@ public class DocumentViewActivity extends AppCompatActivity {
         progressBar.setVisibility(View.VISIBLE);
         filesEmptyView.setVisibility(View.GONE);
 
-        FileResource.list(this, document.optString("id"), new JsonHttpResponseHandler() {
+        FileResource.list(this, document.optString("id"), new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 JSONArray files = response.optJSONArray("files");
                 filePagerAdapter = new FilePagerAdapter(DocumentViewActivity.this, files);
                 fileViewPager.setAdapter(filePagerAdapter);
@@ -598,7 +837,7 @@ public class DocumentViewActivity extends AppCompatActivity {
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject json, Exception e) {
                 filesEmptyView.setText(R.string.error_loading_files);
                 progressBar.setVisibility(View.GONE);
                 filesEmptyView.setVisibility(View.VISIBLE);

docs-android/app/src/main/java/com/sismics/docs/activity/GroupProfileActivity.java

@@ -0,0 +1,92 @@
+package com.sismics.docs.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.model.application.ApplicationContext;
+import com.sismics.docs.resource.UserResource;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+/**
+ * Group profile activity.
+ *
+ * @author bgamard.
+ */
+public class GroupProfileActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Check if logged in
+        if (!ApplicationContext.getInstance().isLoggedIn()) {
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
+            return;
+        }
+
+        // Handle activity context
+        if (getIntent() == null) {
+            finish();
+            return;
+        }
+
+        // Input name
+        final String name = getIntent().getStringExtra("name");
+        if (name == null) {
+            finish();
+            return;
+        }
+
+        // Setup the activity
+        setTitle(name);
+        setContentView(R.layout.groupprofile_activity);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+        }
+
+        // Get the group and populate the view
+        final ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        final View layoutView = findViewById(R.id.layout);
+        progressBar.setVisibility(View.VISIBLE);
+        layoutView.setVisibility(View.GONE);
+        UserResource.get(this, name, new HttpCallback() {
+            @Override
+            public void onSuccess(JSONObject json) {
+                TextView membersTextView = (TextView) findViewById(R.id.membersTextView);
+                JSONArray members = json.optJSONArray("members");
+                String output = "";
+                for (int i = 0; i < members.length(); i++) {
+                    output += members.optString(i) + "; ";
+                }
+                membersTextView.setText(output);
+            }
+
+            @Override
+            public void onFinish() {
+                progressBar.setVisibility(View.GONE);
+                layoutView.setVisibility(View.VISIBLE);
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/activity/LoginActivity.java

@@ -10,11 +10,11 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
-import com.androidquery.AQuery;
 import com.sismics.docs.R;
 import com.sismics.docs.listener.CallbackListener;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.model.application.ApplicationContext;
 import com.sismics.docs.resource.UserResource;
 import com.sismics.docs.ui.form.Validator;
@@ -22,7 +22,6 @@ import com.sismics.docs.ui.form.validator.Required;
 import com.sismics.docs.util.DialogUtil;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.Header;
 import org.json.JSONObject;
 
 /**
@@ -31,7 +30,6 @@ import org.json.JSONObject;
  * @author bgamard
  */
 public class LoginActivity extends AppCompatActivity {
-
     /**
      * User interface.
      */
@@ -43,18 +41,17 @@ public class LoginActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.login_activity);
 
-        AQuery aq = new AQuery(this);
+        TextView loginExplainTextView = (TextView) findViewById(R.id.loginExplain);
-        aq.id(R.id.loginExplain)
+        loginExplainTextView.setText(Html.fromHtml(getString(R.string.login_explain)));
-            .text(Html.fromHtml(getString(R.string.login_explain)))
+        loginExplainTextView.setMovementMethod(LinkMovementMethod.getInstance());
-            .getTextView()
-            .setMovementMethod(LinkMovementMethod.getInstance());
 
-        final EditText txtServer = aq.id(R.id.txtServer).getEditText();
+        final EditText txtServer = (EditText) findViewById(R.id.txtServer);
-        final EditText txtUsername = aq.id(R.id.txtUsername).getEditText();
+        final EditText txtUsername = (EditText) findViewById(R.id.txtUsername);
-        final EditText txtPassword = aq.id(R.id.txtPassword).getEditText();
+        final EditText txtPassword = (EditText) findViewById(R.id.txtPassword);
-        final Button btnConnect = aq.id(R.id.btnConnect).getButton();
+        final EditText txtValidationCode = (EditText) findViewById(R.id.txtValidationCode);
-        loginForm = aq.id(R.id.loginForm).getView();
+        final Button btnConnect = (Button) findViewById(R.id.btnConnect);
-        progressBar = aq.id(R.id.progressBar).getView();
+        loginForm = findViewById(R.id.loginForm);
+        progressBar = findViewById(R.id.progressBar);
         
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
         
@@ -91,9 +88,11 @@ public class LoginActivity extends AppCompatActivity {
                 PreferenceUtil.setServerUrl(LoginActivity.this, txtServer.getText().toString());
                 
                 try {
-                    UserResource.login(getApplicationContext(), txtUsername.getText().toString(), txtPassword.getText().toString(), new JsonHttpResponseHandler() {
+                    UserResource.login(getApplicationContext(), txtUsername.getText().toString(),
+                            txtPassword.getText().toString(), txtValidationCode.getText().toString(),
+                            new HttpCallback() {
                         @Override
-                        public void onSuccess(int statusCode, Header[] headers, JSONObject json) {
+                        public void onSuccess(JSONObject json) {
                             // Empty previous user caches
                             PreferenceUtil.resetUserCache(getApplicationContext());
 
@@ -109,12 +108,16 @@ public class LoginActivity extends AppCompatActivity {
                         }
 
                         @Override
-                        public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                        public void onFailure(JSONObject json, Exception e) {
                             loginForm.setVisibility(View.VISIBLE);
                             progressBar.setVisibility(View.GONE);
 
-                            if (responseBytes != null && new String(responseBytes).contains("\"ForbiddenError\"")) {
+                            if (json != null && json.optString("type").equals("ForbiddenError")) {
                                 DialogUtil.showOkDialog(LoginActivity.this, R.string.login_fail_title, R.string.login_fail);
+                            } else if (json != null && json.optString("type").equals("ValidationCodeRequired")) {
+                                txtValidationCode.setVisibility(View.VISIBLE);
+                                validator.addValidable(txtValidationCode, new Required());
+                                validator.validate();
                             } else {
                                 DialogUtil.showOkDialog(LoginActivity.this, R.string.network_error_title, R.string.network_error);
                             }
@@ -151,9 +154,9 @@ public class LoginActivity extends AppCompatActivity {
             finish();
         } else {
             // Trying to get user data
-            UserResource.info(getApplicationContext(), new JsonHttpResponseHandler() {
+            UserResource.info(getApplicationContext(), new HttpCallback() {
                 @Override
-                public void onSuccess(int statusCode, Header[] headers, final JSONObject json) {
+                public void onSuccess(final JSONObject json) {
                     if (json.optBoolean("anonymous", true)) {
                         loginForm.setVisibility(View.VISIBLE);
                         return;
@@ -169,7 +172,7 @@ public class LoginActivity extends AppCompatActivity {
                 }
 
                 @Override
-                public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                public void onFailure(JSONObject json, Exception e) {
                     DialogUtil.showOkDialog(LoginActivity.this, R.string.network_error_title, R.string.network_error);
                     loginForm.setVisibility(View.VISIBLE);
                 }

docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java

@@ -9,33 +9,34 @@ import android.provider.SearchRecentSuggestions;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.androidquery.util.AQUtility;
 import com.sismics.docs.R;
 import com.sismics.docs.adapter.TagListAdapter;
 import com.sismics.docs.event.AdvancedSearchEvent;
 import com.sismics.docs.event.SearchEvent;
 import com.sismics.docs.fragment.SearchFragment;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.model.application.ApplicationContext;
 import com.sismics.docs.provider.RecentSuggestionsProvider;
 import com.sismics.docs.resource.TagResource;
 import com.sismics.docs.resource.UserResource;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONObject;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Main activity.
  * 
@@ -43,7 +44,6 @@ import de.greenrobot.event.EventBus;
  */
 
 public class MainActivity extends AppCompatActivity {
-    
     private ActionBarDrawerToggle drawerToggle;
     private MenuItem searchItem;
     private DrawerLayout drawerLayout;
@@ -63,7 +63,10 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.main_activity);
 
         // Enable ActionBar app icon to behave as action to toggle nav drawer
-        drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawerLayout = findViewById(R.id.drawer_layout);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitleTextColor(getResources().getColor(android.R.color.white));
+        setSupportActionBar(toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
@@ -73,35 +76,35 @@ public class MainActivity extends AppCompatActivity {
         // between the sliding drawer and the action bar app icon
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout,
                 R.string.drawer_open, R.string.drawer_close);
-        drawerLayout.setDrawerListener(drawerToggle);
+        drawerLayout.addDrawerListener(drawerToggle);
 
         // Fill the drawer user info
         JSONObject userInfo = ApplicationContext.getInstance().getUserInfo();
-        TextView usernameTextView = (TextView) findViewById(R.id.usernameTextView);
+        TextView usernameTextView = findViewById(R.id.usernameTextView);
         usernameTextView.setText(userInfo.optString("username"));
-        TextView emailTextView = (TextView) findViewById(R.id.emailTextView);
+        TextView emailTextView = findViewById(R.id.emailTextView);
         emailTextView.setText(userInfo.optString("email"));
 
         // Get tag list to fill the drawer
-        final ListView tagListView = (ListView) findViewById(R.id.tagListView);
+        final ListView tagListView = findViewById(R.id.tagListView);
         final View tagProgressView = findViewById(R.id.tagProgressView);
-        final TextView tagEmptyView = (TextView) findViewById(R.id.tagEmptyView);
+        final TextView tagEmptyView = findViewById(R.id.tagEmptyView);
         tagListView.setEmptyView(tagProgressView);
         JSONObject cacheTags = PreferenceUtil.getCachedJson(this, PreferenceUtil.PREF_CACHED_TAGS_JSON);
         if (cacheTags != null) {
-            tagListView.setAdapter(new TagListAdapter(cacheTags.optJSONArray("stats")));
+            tagListView.setAdapter(new TagListAdapter(cacheTags.optJSONArray("tags")));
         }
-        TagResource.stats(this, new JsonHttpResponseHandler() {
+        TagResource.list(this, new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 PreferenceUtil.setCachedJson(MainActivity.this, PreferenceUtil.PREF_CACHED_TAGS_JSON, response);
-                tagListView.setAdapter(new TagListAdapter(response.optJSONArray("stats")));
+                tagListView.setAdapter(new TagListAdapter(response.optJSONArray("tags")));
                 tagProgressView.setVisibility(View.GONE);
                 tagListView.setEmptyView(tagEmptyView);
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject json, Exception e) {
                 tagEmptyView.setText(R.string.error_loading_tags);
                 tagProgressView.setVisibility(View.GONE);
                 tagListView.setEmptyView(tagEmptyView);
@@ -114,9 +117,9 @@ public class MainActivity extends AppCompatActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 TagListAdapter adapter = (TagListAdapter) tagListView.getAdapter();
                 if (adapter == null) return;
-                JSONObject tag = adapter.getItem(position);
+                TagListAdapter.TagItem tagItem = adapter.getItem(position);
-                if (tag == null) return;
+                if (tagItem == null) return;
-                searchQuery("tag:" + tag.optString("name"));
+                searchQuery("tag:" + tagItem.getName());
             }
         });
 
@@ -138,6 +141,24 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        // Click on Latest activity
+        View auditLogLayout = findViewById(R.id.auditLogLayout);
+        auditLogLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, AuditLogActivity.class));
+            }
+        });
+
+        // Add document button
+        ImageButton addDocumentButton = findViewById(R.id.addDocumentButton);
+        addDocumentButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, DocumentEditActivity.class));
+            }
+        });
+
         handleIntent(getIntent());
 
         EventBus.getDefault().register(this);
@@ -147,10 +168,11 @@ public class MainActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.logout:
-                UserResource.logout(getApplicationContext(), new JsonHttpResponseHandler() {
+                UserResource.logout(getApplicationContext(), new HttpCallback() {
                     @Override
                     public void onFinish() {
                         // Force logout in all cases, so the user is not stuck in case of network error
+                        PreferenceUtil.clearAuthToken(MainActivity.this);
                         ApplicationContext.getInstance().setUserInfo(getApplicationContext(), null);
                         startActivity(new Intent(MainActivity.this, LoginActivity.class));
                         finish();
@@ -267,6 +289,7 @@ public class MainActivity extends AppCompatActivity {
      *
      * @param event Advanced search event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(AdvancedSearchEvent event) {
         searchQuery(event.getQuery());
     }
@@ -274,10 +297,6 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         EventBus.getDefault().unregister(this);
-        if(isTaskRoot()) {
-            int cacheSizeMb = PreferenceUtil.getIntegerPreference(this, PreferenceUtil.PREF_CACHE_SIZE, 10);
-            AQUtility.cleanCacheAsync(this, cacheSizeMb * 1000000, cacheSizeMb * 1000000);
-        }
         super.onDestroy();
     }
 }

docs-android/app/src/main/java/com/sismics/docs/activity/SettingsActivity.java

@@ -12,7 +12,6 @@ import com.sismics.docs.fragment.SettingsFragment;
  * @author bgamard.
  */
 public class SettingsActivity extends AppCompatActivity {
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

docs-android/app/src/main/java/com/sismics/docs/activity/UserProfileActivity.java

@@ -0,0 +1,91 @@
+package com.sismics.docs.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.model.application.ApplicationContext;
+import com.sismics.docs.resource.UserResource;
+
+import org.json.JSONObject;
+
+/**
+ * User profile activity.
+ *
+ * @author bgamard.
+ */
+public class UserProfileActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Check if logged in
+        if (!ApplicationContext.getInstance().isLoggedIn()) {
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
+            return;
+        }
+
+        // Handle activity context
+        if (getIntent() == null) {
+            finish();
+            return;
+        }
+
+        // Input username
+        final String username = getIntent().getStringExtra("username");
+        if (username == null) {
+            finish();
+            return;
+        }
+
+        // Setup the activity
+        setTitle(username);
+        setContentView(R.layout.userprofile_activity);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+        }
+
+        // Get the user and populate the view
+        final ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        final View layoutView = findViewById(R.id.layout);
+        progressBar.setVisibility(View.VISIBLE);
+        layoutView.setVisibility(View.GONE);
+        UserResource.get(this, username, new HttpCallback() {
+            @Override
+            public void onSuccess(JSONObject json) {
+                TextView emailTextView = (TextView) findViewById(R.id.emailTextView);
+                emailTextView.setText(json.optString("email"));
+
+                TextView quotaTextView = (TextView) findViewById(R.id.quotaTextView);
+                quotaTextView.setText(getString(R.string.storage_display,
+                        Math.round(json.optLong("storage_current") / 1000000),
+                        Math.round(json.optLong("storage_quota") / 1000000)));
+            }
+
+            @Override
+            public void onFinish() {
+                progressBar.setVisibility(View.GONE);
+                layoutView.setVisibility(View.VISIBLE);
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/adapter/AclListAdapter.java

@@ -1,6 +1,7 @@
 package com.sismics.docs.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,7 +25,7 @@ public class AclListAdapter extends BaseAdapter {
     /**
      * Shares.
      */
-    private List<JSONObject> acls;
+    private List<AclItem> aclItemList;
 
     /**
      * ACL list adapter.
@@ -32,28 +33,46 @@ public class AclListAdapter extends BaseAdapter {
      * @param acls ACLs
      */
     public AclListAdapter(JSONArray acls) {
-        this.acls = new ArrayList<>();
+        this.aclItemList = new ArrayList<>();
 
-        // Extract only share ACLs
+        // Group ACLs
         for (int i = 0; i < acls.length(); i++) {
             JSONObject acl = acls.optJSONObject(i);
-            this.acls.add(acl);
+            String type = acl.optString("type");
+            String name = acl.optString("name");
+            String perm = acl.optString("perm");
+
+            boolean found = false;
+            for (AclItem aclItem : aclItemList) {
+                if (aclItem.type.equals(type) && aclItem.name.equals(name)) {
+                    aclItem.permList.add(perm);
+                    found = true;
+                }
+            }
+
+            if (!found) {
+                AclItem aclItem = new AclItem();
+                aclItem.type = type;
+                aclItem.name = name;
+                aclItem.permList.add(perm);
+                this.aclItemList.add(aclItem);
+            }
         }
     }
 
     @Override
     public int getCount() {
-        return acls.size();
+        return aclItemList.size();
     }
 
     @Override
-    public JSONObject getItem(int position) {
+    public AclItem getItem(int position) {
-        return acls.get(position);
+        return aclItemList.get(position);
     }
 
     @Override
     public long getItemId(int position) {
-        return getItem(position).optString("id").hashCode();
+        return getItem(position).hashCode();
     }
 
     @Override
@@ -64,14 +83,37 @@ public class AclListAdapter extends BaseAdapter {
         }
 
         // Fill the view
-        final JSONObject acl = getItem(position);
+        final AclItem aclItem = getItem(position);
         TextView typeTextView = (TextView) view.findViewById(R.id.typeTextView);
-        typeTextView.setText(acl.optString("type"));
+        typeTextView.setText(aclItem.type);
         TextView nameTextView = (TextView) view.findViewById(R.id.nameTextView);
-        nameTextView.setText(acl.optString("name"));
+        nameTextView.setText(aclItem.name);
         TextView permTextView = (TextView) view.findViewById(R.id.permTextView);
-        permTextView.setText(acl.optString("perm"));
+        permTextView.setText(TextUtils.join(" + ", aclItem.permList));
 
         return view;
     }
+
+    /**
+     * An ACL item in the list.
+     * Permissions are grouped together.
+     */
+    public static class AclItem {
+        private String type;
+        private String name;
+        private List<String> permList = new ArrayList<>();
+
+        public String getType() {
+            return type;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public int hashCode() {
+            return (type + name).hashCode();
+        }
+    }
 }

docs-android/app/src/main/java/com/sismics/docs/adapter/AuditLogListAdapter.java

@@ -0,0 +1,113 @@
+package com.sismics.docs.adapter;
+
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Audit log list adapter.
+ *
+ * @author bgamard.
+ */
+public class AuditLogListAdapter extends BaseAdapter {
+    /**
+     * Shares.
+     */
+    private List<JSONObject> logList;
+
+    /**
+     * Context.
+     */
+    private Context context;
+
+    /**
+     * Audit log list adapter.
+     *
+     * @param context Context
+     * @param logs Logs
+     */
+    public AuditLogListAdapter(Context context, JSONArray logs) {
+        this.context = context;
+        this.logList = new ArrayList<>();
+
+        for (int i = 0; i < logs.length(); i++) {
+            logList.add(logs.optJSONObject(i));
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return logList.size();
+    }
+
+    @Override
+    public JSONObject getItem(int position) {
+        return logList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return getItem(position).hashCode();
+    }
+
+    @Override
+    public View getView(int position, View view, final ViewGroup parent) {
+        if (view == null) {
+            LayoutInflater vi = (LayoutInflater) parent.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = vi.inflate(R.layout.auditlog_list_item, parent, false);
+        }
+
+        // Build message
+        final JSONObject log = getItem(position);
+        StringBuilder message = new StringBuilder();
+
+        // Translate entity name
+        int stringId = context.getResources().getIdentifier("auditlog_" + log.optString("class"), "string", context.getPackageName());
+        if (stringId == 0) {
+            message.append(log.optString("class"));
+        } else {
+            message.append(context.getResources().getString(stringId));
+        }
+        message.append(" ");
+
+        switch (log.optString("type")) {
+            case "CREATE": message.append(context.getResources().getString(R.string.auditlog_created)); break;
+            case "UPDATE": message.append(context.getResources().getString(R.string.auditlog_updated)); break;
+            case "DELETE": message.append(context.getResources().getString(R.string.auditlog_deleted)); break;
+        }
+        switch (log.optString("class")) {
+            case "Document":
+            case "Acl":
+            case "Tag":
+            case "User":
+            case "Group":
+                message.append(" : ");
+                message.append(log.optString("message"));
+                break;
+        }
+
+        // Fill the view
+        TextView usernameTextView = view.findViewById(R.id.usernameTextView);
+        TextView messageTextView = view.findViewById(R.id.messageTextView);
+        TextView dateTextView = view.findViewById(R.id.dateTextView);
+        usernameTextView.setText(log.optString("username"));
+        messageTextView.setText(message);
+        String date = DateFormat.getDateFormat(parent.getContext()).format(new Date(log.optLong("create_date")));
+        dateTextView.setText(date);
+
+        return view;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/adapter/CommentListAdapter.java

@@ -0,0 +1,115 @@
+package com.sismics.docs.adapter;
+
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+import com.sismics.docs.util.OkHttpUtil;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Comment list adapter.
+ *
+ * @author bgamard.
+ */
+public class CommentListAdapter extends BaseAdapter {
+    /**
+     * Tags.
+     */
+    private List<JSONObject> commentList = new ArrayList<>();
+
+    /**
+     * Context.
+     */
+    private Context context;
+
+    /**
+     * Comment list adapter.
+     *
+     * @param commentsArray Comments
+     */
+    public CommentListAdapter(Context context, JSONArray commentsArray) {
+        this.context = context;
+        for (int i = 0; i < commentsArray.length(); i++) {
+            commentList.add(commentsArray.optJSONObject(i));
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return commentList.size();
+    }
+
+    @Override
+    public JSONObject getItem(int position) {
+        return commentList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return getItem(position).optString("id").hashCode();
+    }
+
+    @Override
+    public View getView(int position, View view, ViewGroup parent) {
+        if (view == null) {
+            LayoutInflater vi = (LayoutInflater) parent.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = vi.inflate(R.layout.comment_list_item, parent, false);
+        }
+
+        // Fill the view
+        JSONObject comment = getItem(position);
+        TextView creatorTextView = (TextView) view.findViewById(R.id.creatorTextView);
+        TextView dateTextView = (TextView) view.findViewById(R.id.dateTextView);
+        TextView contentTextView = (TextView) view.findViewById(R.id.contentTextView);
+        ImageView gravatarImageView = (ImageView) view.findViewById(R.id.gravatarImageView);
+        creatorTextView.setText(comment.optString("creator"));
+        dateTextView.setText(DateFormat.getDateFormat(dateTextView.getContext()).format(new Date(comment.optLong("create_date"))));
+        contentTextView.setText(comment.optString("content"));
+
+        // Gravatar image
+        String gravatarUrl = "http://www.gravatar.com/avatar/" + comment.optString("creator_gravatar") + "?s=128d=identicon";
+        OkHttpUtil.picasso(context)
+                .load(gravatarUrl)
+                .into(gravatarImageView);
+
+        return view;
+    }
+
+    /**
+     * Add a new comment.
+     *
+     * @param comment Comment
+     */
+    public void add(JSONObject comment) {
+        commentList.add(comment);
+        notifyDataSetChanged();
+    }
+
+    /**
+     * Remove a comment.
+     *
+     * @param commentId Comment ID
+     */
+    public void remove(String commentId) {
+        for (JSONObject comment : commentList) {
+            if (comment.optString("id").equals(commentId)) {
+                commentList.remove(comment);
+                notifyDataSetChanged();
+                return;
+            }
+        }
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/adapter/DocListAdapter.java

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sismics.docs.R;
-import com.sismics.docs.util.TagUtil;
+import com.sismics.docs.util.SpannableUtil;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -69,7 +69,7 @@ public class DocListAdapter extends RecyclerView.Adapter<DocListAdapter.ViewHold
         holder.titleTextView.setText(document.optString("title"));
 
         JSONArray tags = document.optJSONArray("tags");
-        holder.subtitleTextView.setText(TagUtil.buildSpannable(tags));
+        holder.subtitleTextView.setText(SpannableUtil.buildSpannableTags(tags));
 
         String date = DateFormat.getDateFormat(holder.dateTextView.getContext()).format(new Date(document.optLong("create_date")));
         holder.dateTextView.setText(date);

docs-android/app/src/main/java/com/sismics/docs/adapter/FilePagerAdapter.java

@@ -7,10 +7,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
-import com.androidquery.AQuery;
-import com.androidquery.callback.BitmapAjaxCallback;
 import com.sismics.docs.R;
+import com.sismics.docs.util.OkHttpUtil;
 import com.sismics.docs.util.PreferenceUtil;
+import com.squareup.picasso.Callback;
+import com.squareup.picasso.MemoryPolicy;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -30,21 +31,11 @@ public class FilePagerAdapter extends PagerAdapter {
      */
     private List<JSONObject> files;
 
-    /**
-     * AQuery.
-     */
-    private AQuery aq;
-
     /**
      * Context.
      */
     private Context context;
 
-    /**
-     * Auth token used to download files.
-     */
-    private String authToken;
-
     /**
      * File pager adapter.
      *
@@ -57,8 +48,6 @@ public class FilePagerAdapter extends PagerAdapter {
             files.add(filesArray.optJSONObject(i));
         }
         this.context = context;
-        this.authToken = PreferenceUtil.getAuthToken(context);
-        aq = new AQuery(context);
     }
 
     @Override
@@ -66,15 +55,20 @@ public class FilePagerAdapter extends PagerAdapter {
         View view = LayoutInflater.from(container.getContext()).inflate(R.layout.file_viewpager_item, container, false);
 
         ImageViewTouch fileImageView = (ImageViewTouch) view.findViewById(R.id.fileImageView);
-        ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.fileProgressBar);
+        final ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.fileProgressBar);
         JSONObject file = files.get(position);
         String fileUrl = PreferenceUtil.getServerUrl(context) + "/api/file/" + file.optString("id") + "/data?size=web";
-        aq.id(fileImageView)
+
-                .image(new BitmapAjaxCallback()
+        // Load image
-                        .url(fileUrl)
+        OkHttpUtil.picasso(context)
-                        .progress(progressBar)
+                .load(fileUrl)
-                        .animation(AQuery.FADE_IN_NETWORK)
+                .memoryPolicy(MemoryPolicy.NO_CACHE, MemoryPolicy.NO_STORE) // Don't memory cache the images
-                        .cookie("auth_token", authToken));
+                .into(fileImageView, new Callback.EmptyCallback() {
+                    @Override
+                    public void onSuccess() {
+                        progressBar.setVisibility(View.GONE);
+                    }
+                });
 
         fileImageView.setDisplayType(ImageViewTouchBase.DisplayType.FIT_TO_SCREEN);
 
@@ -109,7 +103,7 @@ public class FilePagerAdapter extends PagerAdapter {
      * @return Object
      */
     public JSONObject getObjectAt(int position) {
-        if (files == null) {
+        if (files == null || position < 0 || position >= files.size()) {
             return null;
         }
 

docs-android/app/src/main/java/com/sismics/docs/adapter/LanguageAdapter.java

@@ -33,7 +33,8 @@ public class LanguageAdapter extends BaseAdapter {
         }
         languageList.add(new Language("fra", R.string.language_french, R.drawable.fra));
         languageList.add(new Language("eng", R.string.language_english, R.drawable.eng));
-        languageList.add(new Language("jpn", R.string.language_japanese, R.drawable.jpn));
+        languageList.add(new Language("deu", R.string.language_german, R.drawable.deu));
+        languageList.add(new Language("pol", R.string.language_polish, R.drawable.pol));
     }
 
     @Override

docs-android/app/src/main/java/com/sismics/docs/adapter/ShareListAdapter.java

@@ -12,14 +12,13 @@ import com.sismics.docs.R;
 import com.sismics.docs.event.ShareDeleteEvent;
 import com.sismics.docs.event.ShareSendEvent;
 
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Share list adapter.
  *

docs-android/app/src/main/java/com/sismics/docs/adapter/TagListAdapter.java

@@ -1,9 +1,11 @@
 package com.sismics.docs.adapter;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,9 +19,8 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Tag list adapter.
@@ -30,7 +31,7 @@ public class TagListAdapter extends BaseAdapter {
     /**
      * Tags.
      */
-    private List<JSONObject> tags;
+    private List<TagItem> tagItemList = new ArrayList<>();
 
     /**
      * Tag list adapter.
@@ -38,33 +39,52 @@ public class TagListAdapter extends BaseAdapter {
      * @param tagsArray Tags
      */
     public TagListAdapter(JSONArray tagsArray) {
-        this.tags = new ArrayList<>();
+        List<JSONObject> tags = new ArrayList<>();
         for (int i = 0; i < tagsArray.length(); i++) {
             tags.add(tagsArray.optJSONObject(i));
         }
 
-        // Sort tags by count desc
+        // Reorder tags by parent/child relation and compute depth
-        Collections.sort(tags, new Comparator<JSONObject>() {
+        int depth = 0;
-            @Override
+        initTags(tags, "", depth);
-            public int compare(JSONObject lhs, JSONObject rhs) {
+    }
-                return lhs.optInt("count") < rhs.optInt("count") ? 1 : -1;
+
+    /**
+     * Init tags model recursively.
+     *
+     * @param tags All tags from server
+     * @param parentId Parent ID
+     * @param depth Depth
+     */
+    private void initTags(List<JSONObject> tags, String parentId, int depth) {
+        // Get all tags with this parent
+        for (JSONObject tag : tags) {
+            String tagParentId = tag.optString("parent");
+            if (parentId.equals(tagParentId)) {
+                TagItem tagItem = new TagItem();
+                tagItem.id = tag.optString("id");
+                tagItem.name = tag.optString("name");
+                tagItem.color = tag.optString("color");
+                tagItem.depth = depth;
+                tagItemList.add(tagItem);
+                initTags(tags, tagItem.id, depth + 1);
+            }
         }
-        });
     }
 
     @Override
     public int getCount() {
-        return tags.size();
+        return tagItemList.size();
     }
 
     @Override
-    public JSONObject getItem(int position) {
+    public TagItem getItem(int position) {
-        return tags.get(position);
+        return tagItemList.get(position);
     }
 
     @Override
     public long getItemId(int position) {
-        return getItem(position).optString("id").hashCode();
+        return getItem(position).id.hashCode();
     }
 
     @Override
@@ -75,19 +95,38 @@ public class TagListAdapter extends BaseAdapter {
         }
 
         // Fill the view
-        JSONObject tag = getItem(position);
+        TagItem tagItem = getItem(position);
         TextView tagTextView = (TextView) view.findViewById(R.id.tagTextView);
-        tagTextView.setText(tag.optString("name"));
+        tagTextView.setText(tagItem.name);
-        TextView tagCountTextView = (TextView) view.findViewById(R.id.tagCountTextView);
-        tagCountTextView.setText(tag.optString("count"));
 
         // Label color filtering
         ImageView labelImageView = (ImageView) view.findViewById(R.id.labelImageView);
         Drawable labelDrawable = labelImageView.getDrawable().mutate();
-        labelDrawable.setColorFilter(Color.parseColor(tag.optString("color")), PorterDuff.Mode.MULTIPLY);
+        labelDrawable.setColorFilter(Color.parseColor(tagItem.color), PorterDuff.Mode.MULTIPLY);
         labelImageView.setImageDrawable(labelDrawable);
         labelImageView.invalidate();
 
+        // Offset according to depth
+        Resources resources = parent.getContext().getResources();
+        ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) labelImageView.getLayoutParams();
+        layoutParams.leftMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, tagItem.depth * 12, resources.getDisplayMetrics());
+        labelImageView.setLayoutParams(layoutParams);
+        labelImageView.requestLayout();
+
         return view;
     }
+
+    /**
+     * A tag item in the tags list.
+     */
+    public static class TagItem {
+        private String id;
+        private String name;
+        private String color;
+        private int depth;
+
+        public String getName() {
+            return name;
+        }
+    }
 }

docs-android/app/src/main/java/com/sismics/docs/event/CommentAddEvent.java

@@ -0,0 +1,33 @@
+package com.sismics.docs.event;
+
+import org.json.JSONObject;
+
+/**
+ * Comment add event.
+ *
+ * @author bgamard.
+ */
+public class CommentAddEvent {
+    /**
+     * Comment.
+     */
+    private JSONObject comment;
+
+    /**
+     * Create a comment add event.
+     *
+     * @param comment Comment
+     */
+    public CommentAddEvent(JSONObject comment) {
+        this.comment = comment;
+    }
+
+    /**
+     * Getter of comment.
+     *
+     * @return comment
+     */
+    public JSONObject getComment() {
+        return comment;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/event/CommentDeleteEvent.java

@@ -0,0 +1,31 @@
+package com.sismics.docs.event;
+
+/**
+ * Comment delete event.
+ *
+ * @author bgamard.
+ */
+public class CommentDeleteEvent {
+    /**
+     * Comment ID.
+     */
+    private String commentId;
+
+    /**
+     * Create a comment add event.
+     *
+     * @param commentId Comment ID
+     */
+    public CommentDeleteEvent(String commentId) {
+        this.commentId = commentId;
+    }
+
+    /**
+     * Getter of commentId.
+     *
+     * @return commentId
+     */
+    public String getCommentId() {
+        return commentId;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/fragment/DocExportPdfFragment.java

@@ -0,0 +1,95 @@
+package com.sismics.docs.fragment;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.sismics.docs.R;
+import com.sismics.docs.util.NetworkUtil;
+import com.sismics.docs.util.PreferenceUtil;
+
+import java.util.Locale;
+
+/**
+ * Export PDF dialog fragment.
+ *
+ * @author bgamard.
+ */
+public class DocExportPdfFragment extends DialogFragment {
+    /**
+     * Export PDF dialog fragment.
+     *
+     * @param id Document ID
+     * @param title Document title
+     */
+    public static DocExportPdfFragment newInstance(String id, String title) {
+        DocExportPdfFragment fragment = new DocExportPdfFragment();
+        Bundle args = new Bundle();
+        args.putString("id", id);
+        args.putString("title", title);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        // Setup the view
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.document_export_pdf_dialog, null);
+        final SeekBar marginSeekBar = (SeekBar) view.findViewById(R.id.marginSeekBar);
+        final CheckBox exportMetadataCheckbox = (CheckBox) view.findViewById(R.id.exportMetadataCheckbox);
+        final CheckBox exportCommentsCheckbox = (CheckBox) view.findViewById(R.id.exportCommentsCheckbox);
+        final CheckBox fitToPageCheckbox = (CheckBox) view.findViewById(R.id.fitToPageCheckbox);
+        final TextView marginValueText = (TextView) view.findViewById(R.id.marginValueText);
+
+        // Margin label follow seekbar value
+        marginSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                marginValueText.setText(String.format(Locale.ENGLISH, "%d", progress));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+
+            }
+        });
+
+        // Build the dialog
+        builder.setView(view)
+                .setPositiveButton(R.string.download, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // Download the PDF
+                        String pdfUrl = PreferenceUtil.getServerUrl(getActivity()) + "/api/document/" + getArguments().getString("id") + "/pdf?" +
+                                "metadata=" + exportMetadataCheckbox.isChecked() + "&comments=" + exportCommentsCheckbox.isChecked() + "&fitimagetopage=" + fitToPageCheckbox.isChecked() +
+                                "&margin=" + marginSeekBar.getProgress();
+                        String title = getArguments().getString("title");
+                        NetworkUtil.downloadFile(getActivity(), pdfUrl, title + ".pdf", title, getString(R.string.download_pdf_title));
+
+                        getDialog().cancel();
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        getDialog().cancel();
+                    }
+                });
+        return builder.create();
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/fragment/DocListFragment.java

@@ -2,6 +2,7 @@ package com.sismics.docs.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
@@ -9,29 +10,27 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.sismics.docs.R;
-import com.sismics.docs.activity.DocumentEditActivity;
 import com.sismics.docs.activity.DocumentViewActivity;
 import com.sismics.docs.adapter.DocListAdapter;
 import com.sismics.docs.event.DocumentAddEvent;
 import com.sismics.docs.event.DocumentDeleteEvent;
 import com.sismics.docs.event.DocumentEditEvent;
 import com.sismics.docs.event.SearchEvent;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.listener.RecyclerItemClickListener;
 import com.sismics.docs.resource.DocumentResource;
 import com.sismics.docs.ui.view.DividerItemDecoration;
 import com.sismics.docs.ui.view.EmptyRecyclerView;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONObject;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * @author bgamard.
  */
@@ -46,11 +45,6 @@ public class DocListFragment extends Fragment {
      */
     private String query;
 
-    /**
-     * Request code of adding document.
-     */
-    private static final int REQUEST_CODE_ADD_DOCUMENT = 1;
-
     // View cache
     private EmptyRecyclerView recyclerView;
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -60,23 +54,22 @@ public class DocListFragment extends Fragment {
     private int previousTotal = 0;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.doc_list_fragment, container, false);
 
         // Configure the RecyclerView
-        recyclerView = (EmptyRecyclerView) view.findViewById(R.id.docList);
+        recyclerView = view.findViewById(R.id.docList);
         adapter = new DocListAdapter();
         recyclerView.setAdapter(adapter);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLongClickable(true);
-        recyclerView.addItemDecoration(new DividerItemDecoration(getResources().getDrawable(R.drawable.abc_list_divider_mtrl_alpha)));
 
         // Configure the LayoutManager
         final LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
         recyclerView.setLayoutManager(layoutManager);
 
         // Configure the swipe refresh layout
-        swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipeRefreshLayout);
+        swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout);
         swipeRefreshLayout.setColorSchemeResources(android.R.color.holo_blue_bright,
                 android.R.color.holo_green_light,
                 android.R.color.holo_orange_light,
@@ -100,7 +93,7 @@ public class DocListFragment extends Fragment {
         }));
 
         // Infinite scrolling
-        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
@@ -122,16 +115,6 @@ public class DocListFragment extends Fragment {
             }
         });
 
-        // Add document button
-        ImageButton addDocumentButton = (ImageButton) view.findViewById(R.id.addDocumentButton);
-        addDocumentButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), DocumentEditActivity.class);
-                startActivityForResult(intent, REQUEST_CODE_ADD_DOCUMENT);
-            }
-        });
-
         // Grab the documents
         loadDocuments(view, true);
 
@@ -150,6 +133,7 @@ public class DocListFragment extends Fragment {
      *
      * @param event Search event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(SearchEvent event) {
         query = event.getQuery();
         loadDocuments(getView(), true);
@@ -160,6 +144,7 @@ public class DocListFragment extends Fragment {
      *
      * @param event Document edit event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentEditEvent event) {
         adapter.updateDocument(event.getDocument());
     }
@@ -169,6 +154,7 @@ public class DocListFragment extends Fragment {
      *
      * @param event Document delete event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentDeleteEvent event) {
         adapter.deleteDocument(event.getDocumentId());
     }
@@ -178,6 +164,7 @@ public class DocListFragment extends Fragment {
      *
      * @param event Document add event
      */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(DocumentAddEvent event) {
         // Refresh the list, maybe the new document fit in it
         loadDocuments(getView(), true);
@@ -206,7 +193,7 @@ public class DocListFragment extends Fragment {
     private void loadDocuments(final View view, final boolean reset) {
         if (view == null) return;
         final View progressBar = view.findViewById(R.id.progressBar);
-        final TextView documentsEmptyView = (TextView) view.findViewById(R.id.documentsEmptyView);
+        final TextView documentsEmptyView = view.findViewById(R.id.documentsEmptyView);
 
         if (reset) {
             loading = true;
@@ -218,16 +205,16 @@ public class DocListFragment extends Fragment {
 
         recyclerView.setEmptyView(progressBar);
 
-        DocumentResource.list(getActivity(), reset ? 0 : adapter.getItemCount(), query, new JsonHttpResponseHandler() {
+        DocumentResource.list(getActivity(), reset ? 0 : adapter.getItemCount(), query, new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 adapter.addDocuments(response.optJSONArray("documents"));
                 documentsEmptyView.setText(R.string.no_documents);
                 recyclerView.setEmptyView(documentsEmptyView);
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject response, Exception e) {
                 documentsEmptyView.setText(R.string.error_loading_documents);
                 recyclerView.setEmptyView(documentsEmptyView);
 

docs-android/app/src/main/java/com/sismics/docs/fragment/DocShareFragment.java

@@ -21,17 +21,17 @@ import com.sismics.docs.R;
 import com.sismics.docs.adapter.ShareListAdapter;
 import com.sismics.docs.event.ShareDeleteEvent;
 import com.sismics.docs.event.ShareSendEvent;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.resource.DocumentResource;
 import com.sismics.docs.resource.ShareResource;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Document sharing dialog fragment.
  *
@@ -44,7 +44,8 @@ public class DocShareFragment extends DialogFragment {
     private JSONObject document;
 
     /**
-     * Document sharing dialog fragment
+     * Document sharing dialog fragment.
+     *
      * @param id Document ID
      */
     public static DocShareFragment newInstance(String id) {
@@ -74,15 +75,15 @@ public class DocShareFragment extends DialogFragment {
                 shareAddButton.setEnabled(false);
 
                 ShareResource.add(getActivity(), getArguments().getString("id"), shareNameEditText.getText().toString(),
-                        new JsonHttpResponseHandler() {
+                        new HttpCallback() {
                     @Override
-                    public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                    public void onSuccess(JSONObject response) {
                         shareNameEditText.setText("");
                         loadShares(getDialog().getWindow().getDecorView());
                     }
 
                     @Override
-                    public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                    public void onFailure(JSONObject json, Exception e) {
                         Toast.makeText(getActivity(), R.string.error_adding_share, Toast.LENGTH_SHORT).show();
                     }
 
@@ -121,9 +122,9 @@ public class DocShareFragment extends DialogFragment {
         final ProgressBar shareProgressBar = (ProgressBar) view.findViewById(R.id.shareProgressBar);
 
         shareListView.setEmptyView(shareProgressBar);
-        DocumentResource.get(getActivity(), getArguments().getString("id"), new JsonHttpResponseHandler() {
+        DocumentResource.get(getActivity(), getArguments().getString("id"), new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 document = response;
                 JSONArray acls = response.optJSONArray("acls");
                 shareProgressBar.setVisibility(View.GONE);
@@ -132,27 +133,39 @@ public class DocShareFragment extends DialogFragment {
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject json, Exception e) {
                 getDialog().cancel();
                 Toast.makeText(getActivity(), R.string.error_loading_shares, Toast.LENGTH_SHORT).show();
             }
         });
     }
 
+    /**
+     * A share delete event has been fired.
+     *
+     * @param event Share delete event
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(ShareDeleteEvent event) {
-        ShareResource.delete(getActivity(), event.getId(), new JsonHttpResponseHandler() {
+        ShareResource.delete(getActivity(), event.getId(), new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 loadShares(getDialog().getWindow().getDecorView());
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject json, Exception e) {
                 Toast.makeText(getActivity(), R.string.error_deleting_share, Toast.LENGTH_SHORT).show();
             }
         });
     }
 
+    /**
+     * A share send event has been fired.
+     *
+     * @param event Share send event
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(ShareSendEvent event) {
         if (document == null) return;
 

docs-android/app/src/main/java/com/sismics/docs/fragment/SearchFragment.java

@@ -22,14 +22,13 @@ import com.sismics.docs.ui.view.TagsCompleteTextView;
 import com.sismics.docs.util.PreferenceUtil;
 import com.sismics.docs.util.SearchQueryBuilder;
 
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * Advanced search fragment.
  *
@@ -56,6 +55,7 @@ public class SearchFragment extends DialogFragment {
         View view = inflater.inflate(R.layout.search_dialog, null);
         final EditText searchEditText = (EditText) view.findViewById(R.id.searchEditText);
         final EditText fulltextEditText = (EditText) view.findViewById(R.id.fulltextEditText);
+        final EditText creatorEditText = (EditText) view.findViewById(R.id.creatorEditText);
         final CheckBox sharedCheckbox = (CheckBox) view.findViewById(R.id.sharedCheckbox);
         final Spinner languageSpinner = (Spinner) view.findViewById(R.id.languageSpinner);
         final DatePickerView beforeDatePicker = (DatePickerView) view.findViewById(R.id.beforeDatePicker);
@@ -73,7 +73,7 @@ public class SearchFragment extends DialogFragment {
             dialog.cancel();
             return dialog;
         }
-        JSONArray tagArray = tags.optJSONArray("stats");
+        JSONArray tagArray = tags.optJSONArray("tags");
 
         List<JSONObject> tagList = new ArrayList<>();
         for (int i = 0; i < tagArray.length(); i++) {
@@ -90,6 +90,7 @@ public class SearchFragment extends DialogFragment {
                         // Build the simple criterias
                         SearchQueryBuilder queryBuilder = new SearchQueryBuilder()
                                 .simpleSearch(searchEditText.getText().toString())
+                                .creator(creatorEditText.getText().toString())
                                 .shared(sharedCheckbox.isChecked())
                                 .language(((LanguageAdapter.Language) languageSpinner.getSelectedItem()).getId())
                                 .before(beforeDatePicker.getDate())

docs-android/app/src/main/java/com/sismics/docs/fragment/SettingsFragment.java

@@ -9,10 +9,10 @@ import android.preference.PreferenceManager;
 import android.provider.SearchRecentSuggestions;
 import android.widget.Toast;
 
-import com.androidquery.util.AQUtility;
 import com.sismics.docs.R;
 import com.sismics.docs.provider.RecentSuggestionsProvider;
 import com.sismics.docs.util.ApplicationUtil;
+import com.sismics.docs.util.OkHttpUtil;
 import com.sismics.docs.util.PreferenceUtil;
 
 /**
@@ -52,7 +52,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         clearCachePref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                AQUtility.cleanCacheAsync(getActivity());
+                OkHttpUtil.clearCache(getActivity());
                 Toast.makeText(getActivity(), R.string.pref_clear_cache_success, Toast.LENGTH_LONG).show();
                 return true;
             }

docs-android/app/src/main/java/com/sismics/docs/listener/HttpCallback.java

@@ -0,0 +1,78 @@
+package com.sismics.docs.listener;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Response;
+
+/**
+ * An HTTP callback.
+ *
+ * @author bgamard.
+ */
+public class HttpCallback {
+    public void onSuccess(JSONObject json) {
+        // Implement me
+    }
+
+    public void onFailure(JSONObject json, Exception e) {
+        // Implement me
+    }
+
+    public void onFinish() {
+        // Implement me
+    }
+
+    /**
+     * Build an OkHttp Callback from a HttpCallback.
+     *
+     * @param httpCallback HttpCallback
+     * @return OkHttp Callback
+     */
+    public static Callback buildOkHttpCallback(final HttpCallback httpCallback) {
+        return new Callback() {
+            @Override
+            public void onResponse(final Call call, final Response response) throws IOException {
+                final String body = response.body().string();
+
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (response.isSuccessful()) {
+                            try {
+                                httpCallback.onSuccess(new JSONObject(body));
+                            } catch (Exception e) {
+                                httpCallback.onFailure(null, e);
+                            }
+                        } else {
+                            try {
+                                httpCallback.onFailure(new JSONObject(body), null);
+                            } catch (Exception e) {
+                                httpCallback.onFailure(null, e);
+                            }
+                        }
+
+                        httpCallback.onFinish();
+                    }
+                });
+            }
+
+            @Override
+            public void onFailure(final Call call, final IOException e) {
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        httpCallback.onFailure(null, e);
+                        httpCallback.onFinish();
+                    }
+                });
+            }
+        };
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/listener/JsonHttpResponseHandler.java

@@ -1,241 +0,0 @@
-/*
-    Android Asynchronous Http Client
-    Copyright (c) 2011 James Smith <james@loopj.com>
-    http://loopj.com
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-package com.sismics.docs.listener;
-
-import android.util.Log;
-
-import com.loopj.android.http.TextHttpResponseHandler;
-
-import org.apache.http.Header;
-import org.apache.http.HttpStatus;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/**
- * Used to intercept and handle the responses from requests made using {@link com.loopj.android.http.AsyncHttpClient}, with
- * automatic parsing into a {@link JSONObject} or {@link JSONArray}. <p>&nbsp;</p> This class is
- * designed to be passed to get, post, put and delete requests with the {@link #onSuccess(int,
- * org.apache.http.Header[], org.json.JSONArray)} or {@link #onSuccess(int,
- * org.apache.http.Header[], org.json.JSONObject)} methods anonymously overridden. <p>&nbsp;</p>
- * Additionally, you can override the other event methods from the parent class.
- */
-public class JsonHttpResponseHandler extends TextHttpResponseHandler {
-
-    private static final String LOG_TAG = "JsonHttpResponseHandler";
-
-    /**
-     * Creates new JsonHttpResponseHandler, with JSON String encoding UTF-8
-     */
-    public JsonHttpResponseHandler() {
-        super(DEFAULT_CHARSET);
-    }
-
-    /**
-     * Creates new JsonHttpRespnseHandler with given JSON String encoding
-     *
-     * @param encoding String encoding to be used when parsing JSON
-     */
-    public JsonHttpResponseHandler(String encoding) {
-        super(encoding);
-    }
-
-    /**
-     * Returns when request succeeds
-     *
-     * @param statusCode http response status line
-     * @param headers    response headers if any
-     * @param response   parsed response if any
-     */
-    public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
-        Log.w(LOG_TAG, "onSuccess(int, Header[], JSONObject) was not overriden, but callback was received");
-    }
-
-    /**
-     * Returns when request succeeds
-     *
-     * @param statusCode http response status line
-     * @param headers    response headers if any
-     * @param response   parsed response if any
-     */
-    public void onSuccess(int statusCode, Header[] headers, JSONArray response) {
-        Log.w(LOG_TAG, "onSuccess(int, Header[], JSONArray) was not overriden, but callback was received");
-    }
-
-    /**
-     * Returns when request failed
-     *
-     * @param statusCode    http response status line
-     * @param headers       response headers if any
-     * @param throwable     throwable describing the way request failed
-     * @param errorResponse parsed response if any
-     */
-    public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) {
-        Log.w(LOG_TAG, "onFailure(int, Header[], Throwable, JSONObject) was not overriden, but callback was received", throwable);
-    }
-
-    /**
-     * Returns when request failed
-     *
-     * @param statusCode    http response status line
-     * @param headers       response headers if any
-     * @param throwable     throwable describing the way request failed
-     * @param errorResponse parsed response if any
-     */
-    public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONArray errorResponse) {
-        Log.w(LOG_TAG, "onFailure(int, Header[], Throwable, JSONArray) was not overriden, but callback was received", throwable);
-    }
-
-    @Override
-    public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
-        Log.w(LOG_TAG, "onFailure(int, Header[], String, Throwable) was not overriden, but callback was received", throwable);
-    }
-
-    @Override
-    public void onSuccess(int statusCode, Header[] headers, String responseString) {
-        Log.w(LOG_TAG, "onSuccess(int, Header[], String) was not overriden, but callback was received");
-    }
-
-    @Override
-    public final void onSuccess(final int statusCode, final Header[] headers, final byte[] responseBytes) {
-        if (statusCode != HttpStatus.SC_NO_CONTENT) {
-            Runnable parser = new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        final Object jsonResponse = parseResponse(responseBytes);
-                        postRunnable(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (jsonResponse instanceof JSONObject) {
-                                    onSuccess(statusCode, headers, (JSONObject) jsonResponse);
-                                } else if (jsonResponse instanceof JSONArray) {
-                                    onSuccess(statusCode, headers, (JSONArray) jsonResponse);
-                                } else if (jsonResponse instanceof String) {
-                                    onFailure(statusCode, headers, (String) jsonResponse, new JSONException("Response cannot be parsed as JSON data"));
-                                } else {
-                                    onFailure(statusCode, headers, new JSONException("Unexpected response type " + jsonResponse.getClass().getName()), (JSONObject) null);
-                                }
-
-                            }
-                        });
-                    } catch (final JSONException ex) {
-                        postRunnable(new Runnable() {
-                            @Override
-                            public void run() {
-                                onFailure(statusCode, headers, ex, (JSONObject) null);
-                            }
-                        });
-                    }
-                }
-            };
-            if (!getUseSynchronousMode()) {
-                new Thread(parser).start();
-            } else {
-                // In synchronous mode everything should be run on one thread
-                parser.run();
-            }
-        } else {
-            onSuccess(statusCode, headers, new JSONObject());
-        }
-    }
-
-    @Override
-    public final void onFailure(final int statusCode, final Header[] headers, final byte[] responseBytes, final Throwable throwable) {
-        if (responseBytes != null) {
-            Runnable parser = new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        final Object jsonResponse = parseResponse(responseBytes);
-                        postRunnable(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (jsonResponse instanceof JSONObject) {
-                                    onFailure(statusCode, headers, throwable, (JSONObject) jsonResponse);
-                                } else if (jsonResponse instanceof JSONArray) {
-                                    onFailure(statusCode, headers, throwable, (JSONArray) jsonResponse);
-                                } else if (jsonResponse instanceof String) {
-                                    onFailure(statusCode, headers, (String) jsonResponse, throwable);
-                                } else {
-                                    onFailure(statusCode, headers, new JSONException("Unexpected response type " + jsonResponse.getClass().getName()), (JSONObject) null);
-                                }
-                            }
-                        });
-
-                    } catch (final JSONException ex) {
-                        postRunnable(new Runnable() {
-                            @Override
-                            public void run() {
-                                onFailure(statusCode, headers, ex, (JSONObject) null);
-                            }
-                        });
-
-                    }
-                }
-            };
-            if (!getUseSynchronousMode()) {
-                new Thread(parser).start();
-            } else {
-                // In synchronous mode everything should be run on one thread
-                parser.run();
-            }
-        } else {
-            Log.v(LOG_TAG, "response body is null, calling onFailure(Throwable, JSONObject)");
-            onFailure(statusCode, headers, throwable, (JSONObject) null);
-        }
-
-        // In all cases, call the default failure listener
-        onAllFailure(statusCode, headers, responseBytes, throwable);
-    }
-
-    public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
-        // All failures go there
-    }
-
-    /**
-     * Returns Object of type {@link JSONObject}, {@link JSONArray}, String, Boolean, Integer, Long,
-     * Double or {@link JSONObject#NULL}, see {@link org.json.JSONTokener#nextValue()}
-     *
-     * @param responseBody response bytes to be assembled in String and parsed as JSON
-     * @return Object parsedResponse
-     * @throws org.json.JSONException exception if thrown while parsing JSON
-     */
-    protected Object parseResponse(byte[] responseBody) throws JSONException {
-        if (null == responseBody)
-            return null;
-        Object result = null;
-        //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If JSON is not valid this will return null
-        String jsonString = getResponseString(responseBody, getCharset());
-        if (jsonString != null) {
-            jsonString = jsonString.trim();
-            if (jsonString.startsWith(UTF8_BOM)) {
-                jsonString = jsonString.substring(1);
-            }
-            if (jsonString.startsWith("{") || jsonString.startsWith("[")) {
-                result = new JSONTokener(jsonString).nextValue();
-            }
-        }
-        if (result == null) {
-            result = jsonString;
-        }
-        return result;
-    }
-}

docs-android/app/src/main/java/com/sismics/docs/listener/RecyclerItemClickListener.java

@@ -11,7 +11,7 @@ public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListen
   private OnItemClickListener mListener;
 
   public interface OnItemClickListener {
-    public void onItemClick(View view, int position);
+    void onItemClick(View view, int position);
   }
 
   GestureDetector mGestureDetector;
@@ -25,13 +25,18 @@ public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListen
     });
   }
 
-  @Override public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) {
+  @Override
+  public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) {
     View childView = view.findChildViewUnder(e.getX(), e.getY());
     if (childView != null && mListener != null && mGestureDetector.onTouchEvent(e)) {
-      mListener.onItemClick(childView, view.getChildPosition(childView));
+      mListener.onItemClick(childView, view.getChildAdapterPosition(childView));
     }
     return false;
   }
 
-  @Override public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) { }
+  @Override
+  public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) { }
+
+  @Override
+  public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { }
 }

docs-android/app/src/main/java/com/sismics/docs/model/application/ApplicationContext.java

@@ -4,11 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 
 import com.sismics.docs.listener.CallbackListener;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.resource.UserResource;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.Header;
 import org.json.JSONObject;
 
 /**
@@ -80,9 +79,9 @@ public class ApplicationContext {
      * @param callbackListener CallbackListener
      */
     public void fetchUserInfo(final Activity activity, final CallbackListener callbackListener) {
-        UserResource.info(activity.getApplicationContext(), new JsonHttpResponseHandler() {
+        UserResource.info(activity.getApplicationContext(), new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, final JSONObject json) {
+            public void onSuccess(JSONObject json) {
                 // Save data in application context
                 if (!json.optBoolean("anonymous", true)) {
                     setUserInfo(activity.getApplicationContext(), json);

docs-android/app/src/main/java/com/sismics/docs/resource/AuditLogResource.java

@@ -0,0 +1,38 @@
+package com.sismics.docs.resource;
+
+import android.content.Context;
+
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.util.OkHttpUtil;
+
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+
+/**
+ * Access to /auditlog API.
+ * 
+ * @author bgamard
+ */
+public class AuditLogResource extends BaseResource {
+    /**
+     * GET /auditlog.
+     *
+     * @param context Context
+     * @param documentId Document ID
+     * @param callback Callback
+     */
+    public static void list(Context context, String documentId, HttpCallback callback) {
+        HttpUrl.Builder httpUrlBuilder = HttpUrl.parse(getApiUrl(context) + "/auditlog")
+                .newBuilder();
+        if (documentId != null) {
+            httpUrlBuilder.addQueryParameter("document", documentId);
+        }
+        Request request = new Request.Builder()
+                .url(httpUrlBuilder.build())
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/resource/BaseResource.java

@@ -1,125 +1,15 @@
 package com.sismics.docs.resource;
 
 import android.content.Context;
-import android.os.Build;
 
-import com.androidquery.callback.AbstractAjaxCallback;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.PersistentCookieStore;
-import com.sismics.docs.util.ApplicationUtil;
 import com.sismics.docs.util.PreferenceUtil;
 
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Locale;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
 /**
  * Base class for API access.
  * 
  * @author bgamard
  */
 public class BaseResource {
-    
-    /**
-     * User-Agent to use.
-     */
-    protected static String USER_AGENT = null;
-    
-    /**
-     * Accept-Language header.
-     */
-    protected static String ACCEPT_LANGUAGE = null;
-    
-    /**
-     * HTTP client.
-     */
-    protected static AsyncHttpClient client = new AsyncHttpClient();
-    
-    static {
-        // 20sec default timeout
-        client.setTimeout(60000);
-        try {
-            KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            trustStore.load(null, null);
-            MySSLSocketFactory sf = new MySSLSocketFactory(trustStore);
-            sf.setHostnameVerifier(MySSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-            client.setSSLSocketFactory(sf);
-            AbstractAjaxCallback.setSSF(sf);
-        } catch (Exception e) {
-            // NOP
-        }
-    }
-    
-    /**
-     * Resource initialization.
-     *
-     * @param context Context
-     */
-    protected static void init(Context context) {
-        client.setCookieStore(new PersistentCookieStore(context));
-        
-        if (USER_AGENT == null) {
-            USER_AGENT = "Sismics Docs Android " + ApplicationUtil.getVersionName(context) + "/Android " + Build.VERSION.RELEASE + "/" + Build.MODEL;
-            client.setUserAgent(USER_AGENT);
-        }
-        
-        if (ACCEPT_LANGUAGE == null) {
-            Locale locale = Locale.getDefault();
-            ACCEPT_LANGUAGE = locale.getLanguage() + "_" + locale.getCountry();
-            client.addHeader("Accept-Language", ACCEPT_LANGUAGE);
-        }
-    }
-    
-    /**
-     * Socket factory to allow self-signed certificates.
-     * 
-     * @author bgamard
-     */
-    public static class MySSLSocketFactory extends SSLSocketFactory {
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-
-        public MySSLSocketFactory(KeyStore truststore) throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
-            super(truststore);
-
-            TrustManager tm = new X509TrustManager() {
-                public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-                }
-
-                public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-                }
-
-                public X509Certificate[] getAcceptedIssuers() {
-                    return null;
-                }
-            };
-
-            sslContext.init(null, new TrustManager[] { tm }, null);
-        }
-
-        @Override
-        public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
-            return sslContext.getSocketFactory().createSocket(socket, host, port, autoClose);
-        }
-
-        @Override
-        public Socket createSocket() throws IOException {
-            return sslContext.getSocketFactory().createSocket();
-        }
-    }
-    
     /**
      * Returns cleaned API URL.
      *

docs-android/app/src/main/java/com/sismics/docs/resource/CommentResource.java

@@ -0,0 +1,73 @@
+package com.sismics.docs.resource;
+
+import android.content.Context;
+
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.util.OkHttpUtil;
+
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+
+
+/**
+ * Access to /comment API.
+ * 
+ * @author bgamard
+ */
+public class CommentResource extends BaseResource {
+    /**
+     * GET /comment/id.
+     *
+     * @param context Context
+     * @param documentId Document ID
+     * @param callback Callback
+     */
+    public static void list(Context context, String documentId, HttpCallback callback) {
+        Request request = new Request.Builder()
+                .url(HttpUrl.parse(getApiUrl(context) + "/comment/" + documentId))
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
+    }
+
+    /**
+     * PUT /comment.
+     *
+     * @param context Context
+     * @param documentId Document ID
+     * @param content Comment content
+     * @param callback Callback
+     */
+    public static void add(Context context, String documentId, String content, HttpCallback callback) {
+        Request request = new Request.Builder()
+                .url(HttpUrl.parse(getApiUrl(context) + "/comment"))
+                .put(new FormBody.Builder()
+                        .add("id", documentId)
+                        .add("content", content)
+                        .build())
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
+    }
+
+    /**
+     * DELETE /comment/id.
+     *
+     * @param context Context
+     * @param commentId Comment ID
+     * @param callback Callback
+     */
+    public static void remove(Context context, String commentId, HttpCallback callback) {
+        Request request = new Request.Builder()
+                .url(HttpUrl.parse(getApiUrl(context) + "/comment/" + commentId))
+                .delete()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/resource/DocumentResource.java

@@ -2,11 +2,15 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
-import com.loopj.android.http.RequestParams;
+import com.sismics.docs.listener.HttpCallback;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.util.OkHttpUtil;
 
 import java.util.Set;
 
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+
 /**
  * Access to /document API.
  * 
@@ -19,18 +23,23 @@ public class DocumentResource extends BaseResource {
      * @param context Context
      * @param offset Offset
      * @param query Search query
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void list(Context context, int offset, String query, JsonHttpResponseHandler responseHandler) {
+    public static void list(Context context, int offset, String query, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-        
+                .url(HttpUrl.parse(getApiUrl(context) + "/document/list")
-        RequestParams params = new RequestParams();
+                        .newBuilder()
-        params.put("limit", 20);
+                        .addQueryParameter("limit", "20")
-        params.put("offset", offset);
+                        .addQueryParameter("offset", Integer.toString(offset))
-        params.put("sort_column", 3);
+                        .addQueryParameter("sort_column", "3")
-        params.put("asc", false);
+                        .addQueryParameter("asc", "false")
-        params.put("search", query);
+                        .addQueryParameter("search", query)
-        client.get(getApiUrl(context) + "/document/list", params, responseHandler);
+                        .build())
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -38,12 +47,16 @@ public class DocumentResource extends BaseResource {
      *
      * @param context Context
      * @param id ID
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void get(Context context, String id, JsonHttpResponseHandler responseHandler) {
+    public static void get(Context context, String id, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/document/" + id))
-        client.get(getApiUrl(context) + "/document/" + id, responseHandler);
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -51,12 +64,16 @@ public class DocumentResource extends BaseResource {
      *
      * @param context Context
      * @param id ID
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void delete(Context context, String id, JsonHttpResponseHandler responseHandler) {
+    public static void delete(Context context, String id, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/document/" + id))
-        client.delete(getApiUrl(context) + "/document/" + id, responseHandler);
+                .delete()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -68,19 +85,26 @@ public class DocumentResource extends BaseResource {
      * @param tagIdList Tags ID list
      * @param language Language
      * @param createDate Create date
-     * @param responseHandler Callback
+     * @param callback Callback
      */
     public static void add(Context context, String title, String description,
-                           Set<String> tagIdList, String language, long createDate, JsonHttpResponseHandler responseHandler) {
+                           Set<String> tagIdList, String language, long createDate, HttpCallback callback) {
-        init(context);
+        FormBody.Builder formBuilder = new FormBody.Builder()
+                .add("title", title)
+                .add("description", description)
+                .add("language", language)
+                .add("create_date", Long.toString(createDate));
+        for( String tagId : tagIdList) {
+            formBuilder.add("tags", tagId);
+        }
 
-        RequestParams params = new RequestParams();
+        Request request = new Request.Builder()
-        params.put("title", title);
+                .url(HttpUrl.parse(getApiUrl(context) + "/document"))
-        params.put("description", description);
+                .put(formBuilder.build())
-        params.put("tags", tagIdList);
+                .build();
-        params.put("language", language);
+        OkHttpUtil.buildClient(context)
-        params.put("create_date", createDate);
+                .newCall(request)
-        client.put(getApiUrl(context) + "/document", params, responseHandler);
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -93,27 +117,25 @@ public class DocumentResource extends BaseResource {
      * @param tagIdList Tags ID list
      * @param language Language
      * @param createDate Create date
-     * @param responseHandler Callback
+     * @param callback Callback
      */
     public static void edit(Context context, String id, String title, String description,
-                           Set<String> tagIdList, String language, long createDate, JsonHttpResponseHandler responseHandler) {
+                           Set<String> tagIdList, String language, long createDate, HttpCallback callback) {
-        init(context);
+        FormBody.Builder formBuilder = new FormBody.Builder()
-
+                .add("title", title)
-        RequestParams params = new RequestParams();
+                .add("description", description)
-        params.put("title", title);
+                .add("language", language)
-        params.put("description", description);
+                .add("create_date", Long.toString(createDate));
-        params.put("tags", tagIdList);
+        for( String tagId : tagIdList) {
-        params.put("language", language);
+            formBuilder.add("tags", tagId);
-        params.put("create_date", createDate);
-        client.post(getApiUrl(context) + "/document/" + id, params, responseHandler);
         }
 
-    /**
+        Request request = new Request.Builder()
-     * Cancel pending requests.
+                .url(HttpUrl.parse(getApiUrl(context) + "/document/" + id))
-     *
+                .post(formBuilder.build())
-     * @param context Context
+                .build();
-     */
+        OkHttpUtil.buildClient(context)
-    public static void cancel(Context context) {
+                .newCall(request)
-        client.cancelRequests(context, true);
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 }

docs-android/app/src/main/java/com/sismics/docs/resource/FileResource.java

@@ -2,13 +2,24 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
-import com.loopj.android.http.PersistentCookieStore;
+import com.sismics.docs.listener.HttpCallback;
-import com.loopj.android.http.RequestParams;
+import com.sismics.docs.util.OkHttpUtil;
-import com.loopj.android.http.SyncHttpClient;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
 
+import org.json.JSONObject;
+
+import java.io.IOException;
 import java.io.InputStream;
-import java.security.KeyStore;
+
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.internal.Util;
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Source;
 
 
 /**
@@ -22,12 +33,19 @@ public class FileResource extends BaseResource {
      *
      * @param context Context
      * @param documentId Document ID
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void list(Context context, String documentId, JsonHttpResponseHandler responseHandler) {
+    public static void list(Context context, String documentId, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/file/list")
-        client.get(getApiUrl(context) + "/file/list?id=" + documentId, responseHandler);
+                        .newBuilder()
+                        .addQueryParameter("id", documentId)
+                        .build())
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -35,12 +53,16 @@ public class FileResource extends BaseResource {
      *
      * @param context Context
      * @param id ID
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void delete(Context context, String id, JsonHttpResponseHandler responseHandler) {
+    public static void delete(Context context, String id, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/file/" + id))
-        client.delete(getApiUrl(context) + "/file/" + id, responseHandler);
+                .delete()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -49,34 +71,53 @@ public class FileResource extends BaseResource {
      * @param context Context
      * @param documentId Document ID
      * @param is Input stream
-     * @param responseHandler Callback
+     * @param callback Callback
      * @throws Exception
      */
-    public static void addSync(Context context, String documentId, InputStream is, JsonHttpResponseHandler responseHandler) throws Exception {
+    public static void addSync(Context context, String documentId, final InputStream is, HttpCallback callback) throws Exception {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/file"))
-        SyncHttpClient client = new SyncHttpClient();
+                .put(new MultipartBody.Builder()
-        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                        .setType(MultipartBody.FORM)
-        trustStore.load(null, null);
+                        .addFormDataPart("id", documentId)
-        MySSLSocketFactory sf = new MySSLSocketFactory(trustStore);
+                        .addFormDataPart("file", "file", new RequestBody() {
-        sf.setHostnameVerifier(MySSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+                            @Override
-        client.setSSLSocketFactory(sf);
+                            public MediaType contentType() {
-        client.setCookieStore(new PersistentCookieStore(context));
+                                return MediaType.parse("application/octet-stream");
-        client.setUserAgent(USER_AGENT);
-        client.addHeader("Accept-Language", ACCEPT_LANGUAGE);
-
-        RequestParams params = new RequestParams();
-        params.put("id", documentId);
-        params.put("file", is, "file", "application/octet-stream", true);
-        client.put(getApiUrl(context) + "/file", params, responseHandler);
                             }
 
-    /**
+                            @Override
-     * Cancel pending requests.
+                            public void writeTo(BufferedSink sink) throws IOException {
-     *
+                                Source source = Okio.source(is);
-     * @param context Context
+                                try {
-     */
+                                    sink.writeAll(source);
-    public static void cancel(Context context) {
+                                } finally {
-        client.cancelRequests(context, true);
+                                    Util.closeQuietly(source);
+                                }
+                            }
+                        })
+                        .build())
+                .build();
+        Response response = OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .execute();
+
+        // Call the right callback
+        final String body = response.body().string();
+        if (response.isSuccessful()) {
+            try {
+                callback.onSuccess(new JSONObject(body));
+            } catch (Exception e) {
+                callback.onFailure(null, e);
+            }
+        } else {
+            try {
+                callback.onFailure(new JSONObject(body), null);
+            } catch (Exception e) {
+                callback.onFailure(null, e);
+            }
+        }
+
+        callback.onFinish();
     }
 }

docs-android/app/src/main/java/com/sismics/docs/resource/ShareResource.java

@@ -2,8 +2,12 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
-import com.loopj.android.http.RequestParams;
+import com.sismics.docs.listener.HttpCallback;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.util.OkHttpUtil;
+
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
 
 
 /**
@@ -18,15 +22,19 @@ public class ShareResource extends BaseResource {
      * @param context Context
      * @param documentId Document ID
      * @param name Name
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void add(Context context, String documentId, String name, JsonHttpResponseHandler responseHandler) {
+    public static void add(Context context, String documentId, String name, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/share"))
-        RequestParams params = new RequestParams();
+                .put(new FormBody.Builder()
-        params.put("id", documentId);
+                        .add("id", documentId)
-        params.put("name", name);
+                        .add("name", name)
-        client.put(getApiUrl(context) + "/share", params, responseHandler);
+                        .build())
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
@@ -34,11 +42,15 @@ public class ShareResource extends BaseResource {
      *
      * @param context Context
      * @param id ID
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void delete(Context context, String id, JsonHttpResponseHandler responseHandler) {
+    public static void delete(Context context, String id, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/share/" + id))
-        client.delete(getApiUrl(context) + "/share/" + id, responseHandler);
+                .delete()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 }

docs-android/app/src/main/java/com/sismics/docs/resource/TagResource.java

@@ -2,7 +2,11 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
+import com.sismics.docs.util.OkHttpUtil;
+
+import okhttp3.HttpUrl;
+import okhttp3.Request;
 
 
 /**
@@ -12,14 +16,18 @@ import com.sismics.docs.listener.JsonHttpResponseHandler;
  */
 public class TagResource extends BaseResource {
     /**
-     * GET /tag/stats.
+     * GET /tag/list.
      *
      * @param context Context
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void stats(Context context, JsonHttpResponseHandler responseHandler) {
+    public static void list(Context context, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-
+                .url(HttpUrl.parse(getApiUrl(context) + "/tag/list"))
-        client.get(getApiUrl(context) + "/tag/stats", responseHandler);
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 }

docs-android/app/src/main/java/com/sismics/docs/resource/UserResource.java

@@ -2,8 +2,12 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
-import com.loopj.android.http.RequestParams;
+import com.sismics.docs.listener.HttpCallback;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.util.OkHttpUtil;
+
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
 
 /**
  * Access to /user API.
@@ -18,41 +22,69 @@ public class UserResource extends BaseResource {
      * @param context Context
      * @param username Username
      * @param password Password
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void login(Context context, String username, String password, JsonHttpResponseHandler responseHandler) {
+    public static void login(Context context, String username, String password, String code, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-        
+                .url(HttpUrl.parse(getApiUrl(context) + "/user/login"))
-        RequestParams params = new RequestParams();
+                .post(new FormBody.Builder()
-        params.put("username", username);
+                        .add("username", username)
-        params.put("password", password);
+                        .add("password", password)
-        params.put("remember", "true");
+                        .add("code", code)
-        client.post(getApiUrl(context) + "/user/login", params, responseHandler);
+                        .add("remember", "true")
+                        .build())
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 
     /**
      * GET /user.
      *
      * @param context Context
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void info(Context context, JsonHttpResponseHandler responseHandler) {
+    public static void info(Context context, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
+                .url(HttpUrl.parse(getApiUrl(context) + "/user"))
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
+    }
 
-        RequestParams params = new RequestParams();
+    /**
-        client.get(getApiUrl(context) + "/user", params, responseHandler);
+     * GET /user/username.
+     *
+     * @param context Context
+     * param username Username
+     * @param callback Callback
+     */
+    public static void get(Context context, String username, HttpCallback callback) {
+        Request request = new Request.Builder()
+                .url(HttpUrl.parse(getApiUrl(context) + "/user/" + username))
+                .get()
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
     
     /**
      * POST /user/logout.
      *
      * @param context Context
-     * @param responseHandler Callback
+     * @param callback Callback
      */
-    public static void logout(Context context, JsonHttpResponseHandler responseHandler) {
+    public static void logout(Context context, HttpCallback callback) {
-        init(context);
+        Request request = new Request.Builder()
-        
+                .url(HttpUrl.parse(getApiUrl(context) + "/user/logout"))
-        RequestParams params = new RequestParams();
+                .post(new FormBody.Builder().build())
-        client.post(getApiUrl(context) + "/user/logout", params, responseHandler);
+                .build();
+        OkHttpUtil.buildClient(context)
+                .newCall(request)
+                .enqueue(HttpCallback.buildOkHttpCallback(callback));
     }
 }

docs-android/app/src/main/java/com/sismics/docs/resource/cookie/PersistentCookieStore.java

@@ -0,0 +1,229 @@
+package com.sismics.docs.resource.cookie;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.CookieStore;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * A persistent cookie store which implements the Apache HttpClient CookieStore interface.
+ * Cookies are stored and will persist on the user's device between application sessions since they
+ * are serialized and stored in SharedPreferences.
+ */
+public class PersistentCookieStore implements CookieStore {
+
+    private static final String LOG_TAG = "PersistentCookieStore";
+    private static final String COOKIE_PREFS = "CookiePrefsFileOkHttp";
+    private static final String COOKIE_NAME_PREFIX = "cookie_okhttp_";
+
+    private final HashMap<String, ConcurrentHashMap<String, HttpCookie>> cookies;
+    private final SharedPreferences cookiePrefs;
+
+    /**
+     * Construct a persistent cookie store.
+     *
+     * @param context Context to attach cookie store to
+     */
+    public PersistentCookieStore(Context context) {
+        cookiePrefs = context.getSharedPreferences(COOKIE_PREFS, 0);
+        cookies = new HashMap<>();
+
+        // Load any previously stored cookies into the store
+        Map<String, ?> prefsMap = cookiePrefs.getAll();
+        for (Map.Entry<String, ?> entry : prefsMap.entrySet()) {
+            if (entry.getValue() != null && !((String) entry.getValue()).startsWith(COOKIE_NAME_PREFIX)) {
+                String[] cookieNames = TextUtils.split((String) entry.getValue(), ",");
+                for (String name : cookieNames) {
+                    String encodedCookie = cookiePrefs.getString(COOKIE_NAME_PREFIX + name, null);
+                    if (encodedCookie != null) {
+                        HttpCookie decodedCookie = decodeCookie(encodedCookie);
+                        if (decodedCookie != null) {
+                            if (!cookies.containsKey(entry.getKey()))
+                                cookies.put(entry.getKey(), new ConcurrentHashMap<String, HttpCookie>());
+                            cookies.get(entry.getKey()).put(name, decodedCookie);
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+
+    @Override
+    public void add(URI uri, HttpCookie cookie) {
+        String name = getCookieToken(uri, cookie);
+
+        // Save cookie into local store, or remove if expired
+        if (!cookie.hasExpired()) {
+            if (!cookies.containsKey(uri.getHost()))
+                cookies.put(uri.getHost(), new ConcurrentHashMap<String, HttpCookie>());
+            cookies.get(uri.getHost()).put(name, cookie);
+        } else {
+            if (cookies.containsKey(uri.toString()))
+                cookies.get(uri.getHost()).remove(name);
+        }
+
+        // Save cookie into persistent store
+        SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
+        prefsWriter.putString(uri.getHost(), TextUtils.join(",", cookies.get(uri.getHost()).keySet()));
+        prefsWriter.putString(COOKIE_NAME_PREFIX + name, encodeCookie(new SerializableHttpCookie(cookie)));
+        prefsWriter.apply();
+    }
+
+    protected String getCookieToken(URI uri, HttpCookie cookie) {
+        return cookie.getName() + cookie.getDomain();
+    }
+
+    @Override
+    public List<HttpCookie> get(URI uri) {
+        ArrayList<HttpCookie> ret = new ArrayList<>();
+        if (cookies.containsKey(uri.getHost()))
+            ret.addAll(cookies.get(uri.getHost()).values());
+        return ret;
+    }
+
+    @Override
+    public boolean removeAll() {
+        SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
+        prefsWriter.clear();
+        prefsWriter.apply();
+        cookies.clear();
+        return true;
+    }
+
+
+    @Override
+    public boolean remove(URI uri, HttpCookie cookie) {
+        String name = getCookieToken(uri, cookie);
+
+        if (cookies.containsKey(uri.getHost()) && cookies.get(uri.getHost()).containsKey(name)) {
+            cookies.get(uri.getHost()).remove(name);
+
+            SharedPreferences.Editor prefsWriter = cookiePrefs.edit();
+            if (cookiePrefs.contains(COOKIE_NAME_PREFIX + name)) {
+                prefsWriter.remove(COOKIE_NAME_PREFIX + name);
+            }
+            prefsWriter.putString(uri.getHost(), TextUtils.join(",", cookies.get(uri.getHost()).keySet()));
+            prefsWriter.apply();
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public List<HttpCookie> getCookies() {
+        ArrayList<HttpCookie> ret = new ArrayList<>();
+        for (String key : cookies.keySet())
+            ret.addAll(cookies.get(key).values());
+
+        return ret;
+    }
+
+    @Override
+    public List<URI> getURIs() {
+        ArrayList<URI> ret = new ArrayList<>();
+        for (String key : cookies.keySet())
+            try {
+                ret.add(new URI(key));
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+            }
+
+        return ret;
+    }
+
+    /**
+     * Serializes Cookie object into String
+     *
+     * @param cookie cookie to be encoded, can be null
+     * @return cookie encoded as String
+     */
+    protected String encodeCookie(SerializableHttpCookie cookie) {
+        if (cookie == null)
+            return null;
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        try {
+            ObjectOutputStream outputStream = new ObjectOutputStream(os);
+            outputStream.writeObject(cookie);
+        } catch (IOException e) {
+            Log.d(LOG_TAG, "IOException in encodeCookie", e);
+            return null;
+        }
+
+        return byteArrayToHexString(os.toByteArray());
+    }
+
+    /**
+     * Returns cookie decoded from cookie string
+     *
+     * @param cookieString string of cookie as returned from http request
+     * @return decoded cookie or null if exception occured
+     */
+    protected HttpCookie decodeCookie(String cookieString) {
+        byte[] bytes = hexStringToByteArray(cookieString);
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
+        HttpCookie cookie = null;
+        try {
+            ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
+            cookie = ((SerializableHttpCookie) objectInputStream.readObject()).getCookie();
+        } catch (IOException e) {
+            Log.d(LOG_TAG, "IOException in decodeCookie", e);
+        } catch (ClassNotFoundException e) {
+            Log.d(LOG_TAG, "ClassNotFoundException in decodeCookie", e);
+        }
+
+        return cookie;
+    }
+
+    /**
+     * Using some super basic byte array &lt;-&gt; hex conversions so we don't have to rely on any
+     * large Base64 libraries. Can be overridden if you like!
+     *
+     * @param bytes byte array to be converted
+     * @return string containing hex values
+     */
+    protected String byteArrayToHexString(byte[] bytes) {
+        StringBuilder sb = new StringBuilder(bytes.length * 2);
+        for (byte element : bytes) {
+            int v = element & 0xff;
+            if (v < 16) {
+                sb.append('0');
+            }
+            sb.append(Integer.toHexString(v));
+        }
+        return sb.toString().toUpperCase(Locale.US);
+    }
+
+    /**
+     * Converts hex values from strings to byte arra
+     *
+     * @param hexString string of hex-encoded values
+     * @return decoded byte array
+     */
+    protected byte[] hexStringToByteArray(String hexString) {
+        int len = hexString.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(hexString.charAt(i), 16) << 4) + Character.digit(hexString.charAt(i + 1), 16));
+        }
+        return data;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/resource/cookie/SerializableHttpCookie.java

@@ -0,0 +1,55 @@
+package com.sismics.docs.resource.cookie;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.net.HttpCookie;
+
+public class SerializableHttpCookie implements Serializable {
+    private static final long serialVersionUID = 6374381323722046732L;
+
+    private transient final HttpCookie cookie;
+    private transient HttpCookie clientCookie;
+
+    public SerializableHttpCookie(HttpCookie cookie) {
+        this.cookie = cookie;
+    }
+
+    public HttpCookie getCookie() {
+        HttpCookie bestCookie = cookie;
+        if (clientCookie != null) {
+            bestCookie = clientCookie;
+        }
+        return bestCookie;
+    }
+
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        out.writeObject(cookie.getName());
+        out.writeObject(cookie.getValue());
+        out.writeObject(cookie.getComment());
+        out.writeObject(cookie.getCommentURL());
+        out.writeObject(cookie.getDomain());
+        out.writeLong(cookie.getMaxAge());
+        out.writeObject(cookie.getPath());
+        out.writeObject(cookie.getPortlist());
+        out.writeInt(cookie.getVersion());
+        out.writeBoolean(cookie.getSecure());
+        out.writeBoolean(cookie.getDiscard());
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        String name = (String) in.readObject();
+        String value = (String) in.readObject();
+        clientCookie = new HttpCookie(name, value);
+        clientCookie.setComment((String) in.readObject());
+        clientCookie.setCommentURL((String) in.readObject());
+        clientCookie.setDomain((String) in.readObject());
+        clientCookie.setMaxAge(in.readLong());
+        clientCookie.setPath((String) in.readObject());
+        clientCookie.setPortlist((String) in.readObject());
+        clientCookie.setVersion(in.readInt());
+        clientCookie.setSecure(in.readBoolean());
+        clientCookie.setDiscard(in.readBoolean());
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/service/FileUploadService.java

@@ -1,10 +1,12 @@
 package com.sismics.docs.service;
 
 import android.app.IntentService;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.PowerManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
@@ -12,16 +14,16 @@ import android.util.Log;
 
 import com.sismics.docs.R;
 import com.sismics.docs.event.FileAddEvent;
-import com.sismics.docs.listener.JsonHttpResponseHandler;
+import com.sismics.docs.listener.HttpCallback;
 import com.sismics.docs.resource.FileResource;
 
-import org.apache.http.Header;
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import de.greenrobot.event.EventBus;
+import okhttp3.internal.Util;
 
 /**
  * Service to upload a file to a document in the background.
@@ -29,7 +31,8 @@ import de.greenrobot.event.EventBus;
  * @author bgamard
  */
 public class FileUploadService extends IntentService {
-    private static final String TAG = "FileUploadService";
+    private static final String TAG = "sismicsdocs:fileupload";
+    private static final String CHANNEL_ID = "FileUploadService";
 
     private static final int UPLOAD_NOTIFICATION_ID = 1;
     private static final int UPLOAD_NOTIFICATION_ID_DONE = 2;
@@ -49,18 +52,30 @@ public class FileUploadService extends IntentService {
         super.onCreate();
 
         notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-        notification = new NotificationCompat.Builder(this);
+        initChannels();
+        notification = new NotificationCompat.Builder(this, CHANNEL_ID);
         PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
         wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
     }
 
+    private void initChannels() {
+        if (Build.VERSION.SDK_INT < 26) {
+            return;
+        }
+
+        NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+                "File Upload", NotificationManager.IMPORTANCE_HIGH);
+        channel.setDescription("Used to show file upload progress");
+        notificationManager.createNotificationChannel(channel);
+    }
+
     @Override
     protected void onHandleIntent(Intent intent) {
         if (intent == null) {
             return;
         }
 
-        wakeLock.acquire();
+        wakeLock.acquire(60_000 * 30); // 30 minutes upload time maximum
         try {
             onStart();
             handleFileUpload(intent.getStringExtra(PARAM_DOCUMENT_ID), (Uri) intent.getParcelableExtra(PARAM_URI));
@@ -77,21 +92,26 @@ public class FileUploadService extends IntentService {
      *
      * @param documentId Document ID
      * @param uri Data URI
-     * @throws IOException
+     * @throws IOException e
      */
     private void handleFileUpload(final String documentId, final Uri uri) throws Exception {
         final InputStream is = getContentResolver().openInputStream(uri);
-        FileResource.addSync(this, documentId, is, new JsonHttpResponseHandler() {
+        FileResource.addSync(this, documentId, is, new HttpCallback() {
             @Override
-            public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+            public void onSuccess(JSONObject response) {
                 EventBus.getDefault().post(new FileAddEvent(documentId, response.optString("id")));
                 FileUploadService.this.onComplete();
             }
 
             @Override
-            public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+            public void onFailure(JSONObject json, Exception e) {
                 FileUploadService.this.onError();
             }
+
+            @Override
+            public void onFinish() {
+                Util.closeQuietly(is);
+            }
         });
     }
 

docs-android/app/src/main/java/com/sismics/docs/ui/ScrollingFABBehavior.java

@@ -0,0 +1,47 @@
+package com.sismics.docs.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.NonNull;
+import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.FloatingActionButton;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.sismics.docs.R;
+
+public class ScrollingFABBehavior extends CoordinatorLayout.Behavior<FloatingActionButton> {
+    private int toolbarHeight;
+
+    public ScrollingFABBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.toolbarHeight = getToolbarHeight(context);
+    }
+
+    @Override
+    public boolean layoutDependsOn(@NonNull CoordinatorLayout parent, @NonNull FloatingActionButton fab, @NonNull View dependency) {
+        return dependency instanceof AppBarLayout;
+    }
+
+    @Override
+    public boolean onDependentViewChanged(@NonNull CoordinatorLayout parent, @NonNull FloatingActionButton fab, @NonNull View dependency) {
+        if (dependency instanceof AppBarLayout) {
+                CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) fab.getLayoutParams();
+                int fabBottomMargin = lp.bottomMargin;
+                int distanceToScroll = fab.getHeight() + fabBottomMargin;
+                float ratio = dependency.getY() /(float) toolbarHeight;
+                fab.setTranslationY(- distanceToScroll * ratio);
+        }
+        return true;
+    }
+
+    private int getToolbarHeight(Context context) {
+        final TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(
+                new int[] { R.attr.actionBarSize });
+        int toolbarHeight = (int) styledAttributes.getDimension(0, 0);
+        styledAttributes.recycle();
+
+        return toolbarHeight;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/ui/view/NonScrollListView.java

@@ -0,0 +1,33 @@
+package com.sismics.docs.ui.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/**
+ * Non-scrollable ListView.
+ * All items are visible from the start.
+ *
+ * @author http://stackoverflow.com/questions/18813296/non-scrollable-listview-inside-scrollview/24629341#24629341
+ */
+public class NonScrollListView extends ListView {
+
+    public NonScrollListView(Context context) {
+        super(context);
+    }
+    public NonScrollListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public NonScrollListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            int heightMeasureSpec_custom = MeasureSpec.makeMeasureSpec(
+                    Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
+            ViewGroup.LayoutParams params = getLayoutParams();
+            params.height = getMeasuredHeight();    
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/util/ApplicationUtil.java

@@ -10,7 +10,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
  * @author bgamard
  */
 public class ApplicationUtil {
-
     /**
      * Returns version name.
      * 

docs-android/app/src/main/java/com/sismics/docs/util/DialogUtil.java

@@ -12,7 +12,6 @@ import com.sismics.docs.R;
  * @author bgamard
  */
 public class DialogUtil {
-
     /**
      * Create a dialog with an OK button.
      *

docs-android/app/src/main/java/com/sismics/docs/util/NetworkUtil.java

@@ -0,0 +1,43 @@
+package com.sismics.docs.util;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.DownloadManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Environment;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+
+/**
+ * Utility class for network actions.
+ *
+ * @author bgamard.
+ */
+public class NetworkUtil {
+    /**
+     * Download a file using Android download manager.
+     *
+     * @param url URL to download
+     * @param fileName Destination file name
+     * @param title Notification title
+     * @param description Notification description
+     */
+    public static void downloadFile(Activity activity, String url, String fileName, String title, String description) {
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(activity, new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, 0);
+            return;
+        }
+
+        String authToken = PreferenceUtil.getAuthToken(activity);
+        DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName);
+        request.addRequestHeader("Cookie", "auth_token=" + authToken);
+        request.setTitle(title);
+        request.setDescription(description);
+        downloadManager.enqueue(request);
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/util/OkHttpUtil.java

@@ -0,0 +1,187 @@
+package com.sismics.docs.util;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+import com.jakewharton.picasso.OkHttp3Downloader;
+import com.sismics.docs.resource.cookie.PersistentCookieStore;
+import com.squareup.picasso.Picasso;
+
+import java.io.IOException;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.security.cert.CertificateException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import okhttp3.Cache;
+import okhttp3.Interceptor;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * Utilities for OkHttp.
+ *
+ * @author bgamard.
+ */
+public class OkHttpUtil {
+    /**
+     * OkHttp singleton client.
+     */
+    private static OkHttpClient okHttpClient = new OkHttpClient();
+
+    /**
+     * Singleton cache.
+     */
+    private static Cache cache = null;
+
+    /**
+     * User-Agent to use.
+     */
+    protected static String userAgent = null;
+
+    /**
+     * Accept-Language header.
+     */
+    protected static String acceptLanguage = null;
+
+    static {
+        // OkHttp configuration
+        try {
+            // Create a trust manager that does not validate certificate chains
+            final TrustManager[] trustAllCerts = new TrustManager[] {
+                    new X509TrustManager() {
+                        @Override
+                        public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                        }
+
+                        @Override
+                        public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                        }
+
+                        @Override
+                        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                            return null;
+                        }
+                    }
+            };
+
+            // Install the all-trusting trust manager
+            final SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+            final javax.net.ssl.SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+            // Configure OkHttpClient
+            okHttpClient = okHttpClient.newBuilder()
+                    .connectTimeout(30, TimeUnit.SECONDS)
+                    .readTimeout(30, TimeUnit.SECONDS)
+                    .writeTimeout(30, TimeUnit.SECONDS)
+                    .sslSocketFactory(sslSocketFactory)
+                    .build();
+        } catch (Exception e) {
+            // NOP
+        }
+    }
+
+    /**
+     * Build a Picasso object with base config.
+     *
+     * @param context Context
+     * @return Picasso object
+     */
+    public static Picasso picasso(Context context) {
+        OkHttpClient okHttpClient = buildClient(context)
+                .newBuilder()
+                .addInterceptor(new Interceptor() {
+                    @Override
+                    public Response intercept(Interceptor.Chain chain) throws IOException { // Override cache configuration
+                        final Request original = chain.request();
+                        return chain.proceed(original.newBuilder()
+                                .header("Cache-Control", "max-age=" + (3600 * 24 * 365))
+                                .method(original.method(), original.body())
+                                .build());
+                    }
+                })
+                .cache(getCache(context))
+                .build();
+
+        Picasso picasso = new Picasso.Builder(context)
+                .downloader(new OkHttp3Downloader(okHttpClient))
+                .build();
+        picasso.setIndicatorsEnabled(false); // Debug stuff
+        return picasso;
+    }
+
+    /**
+     * Get and eventually build the singleton cache.
+     *
+     * @param context Context
+     * @return Cache
+     */
+    private static Cache getCache(Context context) {
+        if (cache == null) {
+            cache = new Cache(context.getCacheDir(),
+                    PreferenceUtil.getIntegerPreference(context, PreferenceUtil.PREF_CACHE_SIZE, 0) * 1000000);
+        }
+        return cache;
+    }
+
+    /**
+     * Clear the HTTP cache.
+     *
+     * @param context Context
+     */
+    public static void clearCache(Context context) {
+        Cache cache = getCache(context);
+        try {
+            cache.evictAll();
+        } catch (IOException e) {
+            Log.e("OKHttpUtil", "Error clearing cache", e);
+        }
+    }
+
+    /**
+     * Build an OkHttpClient.
+     *
+     * @param context Context
+     * @return OkHttpClient
+     */
+    public static OkHttpClient buildClient(final Context context) {
+        // One-time header computation
+        if (userAgent == null) {
+            userAgent = "Teedy Android " + ApplicationUtil.getVersionName(context) + "/Android " + Build.VERSION.RELEASE + "/" + Build.MODEL;
+        }
+
+        if (acceptLanguage == null) {
+            Locale locale = Locale.getDefault();
+            acceptLanguage = locale.getLanguage() + "_" + locale.getCountry();
+        }
+
+        // Cookie handling
+        PersistentCookieStore cookieStore = new PersistentCookieStore(context);
+        CookieManager cookieManager = new CookieManager(cookieStore, CookiePolicy.ACCEPT_ALL);
+
+        // Runtime configuration
+        return okHttpClient.newBuilder()
+                .cookieJar(new JavaNetCookieJar(cookieManager))
+                .addNetworkInterceptor(new Interceptor() {
+                    @Override
+                    public Response intercept(Chain chain) throws IOException {
+                        Request original = chain.request();
+                        return chain.proceed(original.newBuilder()
+                                .header("User-Agent", userAgent)
+                                .header("Accept-Language", acceptLanguage)
+                                .method(original.method(), original.body())
+                                .build());
+                    }
+                })
+                .build();
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/util/PreferenceUtil.java

@@ -5,11 +5,11 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
 
-import com.loopj.android.http.PersistentCookieStore;
+import com.sismics.docs.resource.cookie.PersistentCookieStore;
 
-import org.apache.http.cookie.Cookie;
 import org.json.JSONObject;
 
+import java.net.HttpCookie;
 import java.util.List;
 
 /**
@@ -26,6 +26,7 @@ public class PreferenceUtil {
 
     /**
      * Returns a preference of boolean type.
+     *
      * @param context Context
      * @param key Shared preference key
      * @return Shared preference value
@@ -37,6 +38,7 @@ public class PreferenceUtil {
     
     /**
      * Returns a preference of string type.
+     *
      * @param context Context
      * @param key Shared preference key
      * @return Shared preference value
@@ -48,6 +50,7 @@ public class PreferenceUtil {
     
     /**
      * Returns a preference of integer type.
+     *
      * @param context Context
      * @param key Shared preference key
      * @return Shared preference value
@@ -69,6 +72,7 @@ public class PreferenceUtil {
     
     /**
      * Update JSON cache.
+     *
      * @param context Context
      * @param key Shared preference key
      * @param json JSON data
@@ -80,6 +84,7 @@ public class PreferenceUtil {
     
     /**
      * Returns a JSON cache.
+     *
      * @param context Context
      * @param key Shared preference key
      * @return JSON data
@@ -96,6 +101,7 @@ public class PreferenceUtil {
     
     /**
      * Update server URL.
+     *
      * @param context Context
      */
     public static void setServerUrl(Context context, String serverUrl) {
@@ -105,6 +111,7 @@ public class PreferenceUtil {
     
     /**
      * Empty user caches.
+     *
      * @param context Context
      */
     public static void resetUserCache(Context context) {
@@ -118,12 +125,14 @@ public class PreferenceUtil {
     
     /**
      * Returns auth token cookie from shared preferences.
+     *
+     * @param context Context
      * @return Auth token
      */
     public static String getAuthToken(Context context) {
         PersistentCookieStore cookieStore = new PersistentCookieStore(context);
-        List<Cookie> cookieList = cookieStore.getCookies();
+        List<HttpCookie> cookieList = cookieStore.getCookies();
-        for (Cookie cookie : cookieList) {
+        for (HttpCookie cookie : cookieList) {
             if (cookie.getName().equals("auth_token")) {
                 return cookie.getValue();
             }
@@ -132,8 +141,19 @@ public class PreferenceUtil {
         return null;
     }
 
+    /**
+     * Clear all auth tokens.
+     *
+     * @param context Context
+     */
+    public static void clearAuthToken(Context context) {
+        PersistentCookieStore cookieStore = new PersistentCookieStore(context);
+        cookieStore.removeAll();
+    }
+
     /**
      * Returns cleaned server URL.
+     *
      * @param context Context
      * @return Server URL
      */

docs-android/app/src/main/java/com/sismics/docs/util/SearchQueryBuilder.java

@@ -39,7 +39,9 @@ public class SearchQueryBuilder {
      */
     public SearchQueryBuilder simpleSearch(String simpleSearch) {
         if (isValid(simpleSearch)) {
-            query.append(SEARCH_SEPARATOR).append(simpleSearch);
+            query.append(SEARCH_SEPARATOR)
+                    .append("simple:")
+                    .append(simpleSearch);
         }
         return this;
     }
@@ -59,6 +61,21 @@ public class SearchQueryBuilder {
         return this;
     }
 
+    /**
+     * Add a creator criteria.
+     *
+     * @param creator Creator criteria
+     * @return The builder
+     */
+    public SearchQueryBuilder creator(String creator) {
+        if (isValid(creator)) {
+            query.append(SEARCH_SEPARATOR)
+                    .append("by:")
+                    .append(creator);
+        }
+        return this;
+    }
+
     /**
      * Add a language criteria.
      *

docs-android/app/src/main/java/com/sismics/docs/util/SpannableUtil.java

@@ -0,0 +1,85 @@
+package com.sismics.docs.util;
+
+import android.graphics.Color;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+/**
+ * Utility class for spannable.
+ *
+ * @author bgamard.
+ */
+public class SpannableUtil {
+    /**
+     * Create a colored spannable from tags.
+     *
+     * @param tags Tags
+     * @return Colored spannable
+     */
+    public static Spannable buildSpannableTags(JSONArray tags) {
+        return buildSpannable(tags, "name", "color");
+    }
+
+    /**
+     * Create a spannable for contributors.
+     *
+     * @param contributors Contributors
+     * @return Spannable
+     */
+    public static Spannable buildSpannableContributors(JSONArray contributors) {
+        return buildSpannable(contributors, "username", null);
+    }
+
+    /**
+     * Create a spannable for relations.
+     *
+     * @param relations Relations
+     * @return Spannable
+     */
+    public static Spannable buildSpannableRelations(JSONArray relations) {
+        return buildSpannable(relations, "title", null);
+    }
+
+    /**
+     * Create a spannable from a JSONArray.
+     *
+     * @param array JSONArray
+     * @param valueName Name of the value part
+     * @param colorName Name of the color part (optional)
+     * @return Spannable
+     */
+    private static Spannable buildSpannable(JSONArray array, String valueName, String colorName) {
+        SpannableStringBuilder builder = new SpannableStringBuilder();
+
+        for (int i = 0; i < array.length(); i++) {
+            final JSONObject tag = array.optJSONObject(i);
+            int start = builder.length();
+            builder.append(" ").append(tag.optString(valueName)).append(" ");
+            builder.setSpan(new ForegroundColorSpan(Color.WHITE), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            builder.setSpan(new BackgroundColorSpan(Color.parseColor(tag.optString(colorName, "#5bc0de"))), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            /*
+            TODO : Make tags, relations and contributors clickable
+            builder.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(View widget) {
+                }
+
+                @Override
+                public void updateDrawState(TextPaint ds) {
+                    super.updateDrawState(ds);
+                    ds.setColor(Color.WHITE);
+                    ds.setUnderlineText(false);
+                }
+            }, start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
+            builder.append(" ");
+        }
+
+        return builder;
+    }
+}

docs-android/app/src/main/java/com/sismics/docs/util/TagUtil.java

@@ -1,39 +0,0 @@
-package com.sismics.docs.util;
-
-import android.graphics.Color;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ForegroundColorSpan;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-/**
- * Utility class for tags.
- *
- * @author bgamard.
- */
-public class TagUtil {
-    /**
-     * Create a colored spannable from tags.
-     *
-     * @param tags Tags
-     * @return Colored spannable
-     */
-    public static Spannable buildSpannable(JSONArray tags) {
-        SpannableStringBuilder builder = new SpannableStringBuilder();
-
-        for (int i = 0; i < tags.length(); i++) {
-            JSONObject tag = tags.optJSONObject(i);
-            int start = builder.length();
-            builder.append(" ").append(tag.optString("name")).append(" ");
-            builder.setSpan(new ForegroundColorSpan(Color.WHITE), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            builder.setSpan(new BackgroundColorSpan(Color.parseColor(tag.optString("color"))), start, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            builder.append(" ");
-        }
-
-        return builder;
-    }
-}

docs-android/app/src/main/res/layout/auditlog_activity.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ListView
+            android:id="@+id/auditLogListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:choiceMode="singleChoice"
+            android:dividerHeight="0dp"
+            android:visibility="gone">
+        </ListView>
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:layout_centerInParent="true"
+        android:indeterminate="true" />
+
+</RelativeLayout>

docs-android/app/src/main/res/layout/auditlog_list_item.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="12dp"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/assignImageView"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginRight="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_assignment_grey600_48dp"/>
+
+    <TextView
+        android:id="@+id/usernameTextView"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@+id/assignImageView"
+        android:layout_toEndOf="@+id/assignImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-light"
+        android:textColor="#212121"
+        android:text="admin"
+        android:textSize="16sp"
+        android:ellipsize="end"
+        android:maxLines="1"/>
+
+    <TextView
+        android:id="@+id/messageTextView"
+        android:layout_below="@+id/usernameTextView"
+        android:layout_toRightOf="@+id/assignImageView"
+        android:layout_toEndOf="@+id/assignImageView"
+        android:layout_marginTop="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-light"
+        android:textColor="#777777"
+        android:text="Document created : test doc 1"
+        android:textSize="16sp"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <TextView
+        android:id="@+id/dateTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2014-12-02"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:textColor="#777777"
+        android:fontFamily="sans-serif-light"/>
+
+</RelativeLayout>

docs-android/app/src/main/res/layout/comment_list_item.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="12dp"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/gravatarImageView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="12dp"/>
+
+    <TextView
+        android:id="@+id/creatorTextView"
+        android:layout_toRightOf="@id/gravatarImageView"
+        android:layout_toEndOf="@id/gravatarImageView"
+        android:layout_alignParentTop="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:textStyle="bold"
+        android:textColor="#212121"
+        android:text="Creator"
+        android:textSize="14sp"/>
+
+    <TextView
+        android:id="@+id/contentTextView"
+        android:layout_toRightOf="@id/gravatarImageView"
+        android:layout_toEndOf="@id/gravatarImageView"
+        android:layout_below="@id/creatorTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:fontFamily="sans-serif"
+        android:textColor="#212121"
+        android:text="Comment content"
+        android:textSize="14sp"/>
+
+    <TextView
+        android:id="@+id/dateTextView"
+        android:layout_toRightOf="@id/gravatarImageView"
+        android:layout_toEndOf="@id/gravatarImageView"
+        android:layout_below="@id/contentTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:fontFamily="sans-serif"
+        android:textColor="#888"
+        android:text="2015-11-10"
+        android:textSize="14sp"/>
+
+</RelativeLayout>

docs-android/app/src/main/res/layout/doc_list_fragment.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -37,17 +36,4 @@
         android:textSize="16sp"
         android:layout_centerInParent="true"/>
 
-    <com.shamanland.fab.FloatingActionButton
-        android:id="@+id/addDocumentButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="20dp"
-        android:src="@drawable/ic_add_white_24dp"
-        app:floatingActionButtonColor="#263238"/>
-
 </RelativeLayout>

docs-android/app/src/main/res/layout/doc_list_item.xml

@@ -13,6 +13,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_marginRight="12dp"
+        android:layout_marginEnd="12dp"
         android:id="@+id/folderImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -22,11 +23,13 @@
         android:id="@+id/titleTextView"
         android:layout_alignParentTop="true"
         android:layout_toRightOf="@+id/folderImageView"
+        android:layout_toEndOf="@+id/folderImageView"
         android:layout_toLeftOf="@+id/dateTextView"
+        android:layout_toStartOf="@+id/dateTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-light"
-        android:textColor="#212121"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="Test"
         android:textSize="16sp"
         android:ellipsize="end"
@@ -43,7 +46,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-light"
-        android:textColor="#777777"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="test2"
         android:textSize="16sp"
         android:maxLines="1"
@@ -66,7 +69,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:textColor="#777777"
+        android:textColor="?android:attr/textColorPrimary"
         android:fontFamily="sans-serif-light"/>
     
 </RelativeLayout>

docs-android/app/src/main/res/layout/document_export_pdf_dialog.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="12dp">
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        android:text="@string/export_metadata"
+        android:id="@+id/exportMetadataCheckbox" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        android:text="@string/export_comments"
+        android:id="@+id/exportCommentsCheckbox" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        android:checked="true"
+        android:text="@string/fit_image_to_page"
+        android:id="@+id/fitToPageCheckbox" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/margin"
+            android:layout_weight="0"/>
+
+        <SeekBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:id="@+id/marginSeekBar"
+            android:progress="10"
+            android:max="50"/>
+
+        <TextView
+            android:id="@+id/marginValueText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="10"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"
+            android:layout_weight="0"
+            android:text="@string/mm"/>
+
+    </LinearLayout>
+</LinearLayout>

docs-android/app/src/main/res/layout/document_view_activity.xml

@@ -37,18 +37,125 @@
 
     </RelativeLayout>
 
-    <!-- Right drawer -->
+    <!-- Left drawer -->
 
     <LinearLayout
-        android:id="@+id/right_drawer"
+        android:id="@+id/left_drawer"
         android:layout_width="300dp"
         android:layout_height="match_parent"
-        android:layout_gravity="end"
+        android:layout_gravity="start"
         android:orientation="vertical"
         android:clickable="true"
         android:background="#fff"
         android:elevation="5dp">
 
+        <!-- Comments -->
+
+        <TextView
+            android:drawableStart="@drawable/ic_comment_grey600_24dp"
+            android:drawableLeft="@drawable/ic_comment_grey600_24dp"
+            android:drawablePadding="6dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:textColor="#de000000"
+            android:text="@string/comments"
+            android:layout_margin="12dp"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#eee"/>
+
+        <ListView
+            android:layout_weight="1"
+            android:id="@+id/commentListView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:choiceMode="singleChoice"
+            android:divider="@android:color/transparent"
+            android:transcriptMode="normal"
+            android:dividerHeight="0dp"/>
+
+        <RelativeLayout
+            android:layout_weight="1"
+            android:id="@+id/commentProgressView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="gone">
+
+            <ProgressBar
+                style="?android:progressBarStyle"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/commentEmptyView"
+            android:visibility="gone"
+            android:padding="12dp"
+            android:gravity="center"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:fontFamily="sans-serif-light"
+            android:text="@string/no_comments"
+            android:textSize="14sp"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#eee"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="6dp"
+            android:gravity="center">
+
+            <EditText
+                android:id="@+id/commentEditText"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="text"
+                android:hint="@string/add_comment"
+                android:maxLength="4000"/>
+
+            <ImageButton
+                android:id="@+id/addCommentBtn"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_send_grey600_24dp"
+                android:contentDescription="@string/send"
+                android:background="?android:selectableItemBackground"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Right drawer -->
+
+    <ScrollView
+        android:id="@+id/right_drawer"
+        android:layout_width="300dp"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:background="#fff"
+        android:elevation="5dp"
+        android:layout_gravity="end">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
             <!-- Actions -->
 
             <LinearLayout
@@ -63,28 +170,6 @@
                     android:orientation="horizontal"
                     style="?android:buttonBarStyle">
 
-                <Button
-                    android:id="@+id/actionEditDocument"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_create_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/edit_document"
-                    android:textColor="@color/button_material_dark"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
-
-                <Button
-                    android:id="@+id/actionUploadFile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/upload_file"
-                    android:textColor="@color/button_material_dark"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
-
                     <Button
                         android:id="@+id/actionDownload"
                         android:layout_width="wrap_content"
@@ -92,7 +177,29 @@
                         android:drawableTop="@drawable/ic_file_download_grey600_24dp"
                         style="?android:buttonBarButtonStyle"
                         android:text="@string/download_document"
-                    android:textColor="@color/button_material_dark"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="8dp"/>
+
+                    <Button
+                        android:id="@+id/actionExportPdf"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_description_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/export_pdf"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="8dp"/>
+
+                    <Button
+                        android:id="@+id/actionAuditLog"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_assignment_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/activity"
+                        android:textColor="#ff5a595b"
                         android:textAllCaps="false"
                         android:layout_margin="8dp"/>
 
@@ -104,6 +211,28 @@
                     android:orientation="horizontal"
                     style="?android:buttonBarStyle">
 
+                    <Button
+                        android:id="@+id/actionEditDocument"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_create_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/edit_document"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
+                    <Button
+                        android:id="@+id/actionUploadFile"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
+                        style="?android:buttonBarButtonStyle"
+                        android:text="@string/upload_file"
+                        android:textColor="#ff5a595b"
+                        android:textAllCaps="false"
+                        android:layout_margin="0dp"/>
+
                     <Button
                         android:id="@+id/actionSharing"
                         android:layout_width="wrap_content"
@@ -111,9 +240,9 @@
                         android:drawableTop="@drawable/ic_share_grey600_24dp"
                         style="?android:buttonBarButtonStyle"
                         android:text="@string/share"
-                    android:textColor="@color/button_material_dark"
+                        android:textColor="#ff5a595b"
                         android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
+                        android:layout_margin="0dp"/>
 
                     <Button
                         android:id="@+id/actionDelete"
@@ -122,9 +251,9 @@
                         android:drawableTop="@drawable/ic_delete_grey600_24dp"
                         style="?android:buttonBarButtonStyle"
                         android:text="@string/delete_document"
-                    android:textColor="@color/button_material_dark"
+                        android:textColor="#ff5a595b"
                         android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
+                        android:layout_margin="0dp"/>
 
                 </LinearLayout>
 
@@ -160,18 +289,41 @@
                     android:id="@+id/createdDateTextView"
                     android:layout_toRightOf="@id/createdDateLabel"
                     android:layout_toEndOf="@id/createdDateLabel"
+                    android:layout_toLeftOf="@id/sharedImageView"
+                    android:layout_toStartOf="@id/sharedImageView"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
                     android:gravity="center_vertical"
                     android:layout_alignParentTop="true"
                     android:fontFamily="sans-serif-light"/>
 
+                <TextView
+                    android:id="@+id/creatorLabel"
+                    android:layout_width="100dp"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_below="@+id/createdDateLabel"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/creator"/>
+
+                <TextView
+                    android:id="@+id/creatorTextView"
+                    android:layout_toRightOf="@id/creatorLabel"
+                    android:layout_toEndOf="@id/creatorLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_below="@+id/createdDateTextView"
+                    android:fontFamily="sans-serif-light"/>
+
                 <TextView
                     android:id="@+id/tagTextView"
                     android:layout_marginTop="8dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:layout_below="@id/createdDateLabel"
+                    android:layout_below="@id/creatorLabel"
                     android:layout_marginRight="8dp"
                     android:layout_marginEnd="8dp"
                     android:maxLines="1"
@@ -186,6 +338,7 @@
                     android:fontFamily="sans-serif-light"/>
 
                 <ImageView
+                    android:contentDescription="@string/shared"
                     android:id="@+id/sharedImageView"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -197,6 +350,7 @@
                     android:layout_toStartOf="@+id/languageImageView"/>
 
                 <ImageView
+                    android:contentDescription="@string/language"
                     android:id="@+id/languageImageView"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -206,6 +360,278 @@
 
             </RelativeLayout>
 
+            <!-- Additional dublincore metadata -->
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:paddingBottom="12dp">
+
+                <!-- Subject -->
+
+                <LinearLayout
+                    android:id="@+id/subjectLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/subject"/>
+
+                    <TextView
+                        android:id="@+id/subjectTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Identifier -->
+
+                <LinearLayout
+                    android:id="@+id/identifierLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/identifier"/>
+
+                    <TextView
+                        android:id="@+id/identifierTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Publisher -->
+
+                <LinearLayout
+                    android:id="@+id/publisherLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/publisher"/>
+
+                    <TextView
+                        android:id="@+id/publisherTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Format -->
+
+                <LinearLayout
+                    android:id="@+id/formatLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/format"/>
+
+                    <TextView
+                        android:id="@+id/formatTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Source -->
+
+                <LinearLayout
+                    android:id="@+id/sourceLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/source"/>
+
+                    <TextView
+                        android:id="@+id/sourceTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Type -->
+
+                <LinearLayout
+                    android:id="@+id/typeLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/type"/>
+
+                    <TextView
+                        android:id="@+id/typeTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Coverage -->
+
+                <LinearLayout
+                    android:id="@+id/coverageLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/coverage"/>
+
+                    <TextView
+                        android:id="@+id/coverageTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Rights -->
+
+                <LinearLayout
+                    android:id="@+id/rightsLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/rights"/>
+
+                    <TextView
+                        android:id="@+id/rightsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Contributors -->
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/contributors"/>
+
+                    <TextView
+                        android:id="@+id/contributorsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+                <!-- Relations -->
+
+                <LinearLayout
+                    android:id="@+id/relationsLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="2dp">
+
+                    <TextView
+                        android:layout_weight="0.33"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/relations"/>
+
+                    <TextView
+                        android:id="@+id/relationsTextView"
+                        android:layout_weight="0.67"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="sans-serif-light"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
@@ -219,18 +645,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="16sp"
-            android:textColor="@color/primary_text_default_material_light"
+                android:textColor="#de000000"
                 android:text="@string/who_can_access"
                 android:layout_margin="12dp"/>
 
-        <ListView
+            <com.sismics.docs.ui.view.NonScrollListView
                 android:id="@+id/aclListView"
                 android:layout_width="match_parent"
-            android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:choiceMode="singleChoice"
                 android:divider="@android:color/transparent"
                 android:dividerHeight="0dp"/>
 
         </LinearLayout>
 
+    </ScrollView>
+
 </android.support.v4.widget.DrawerLayout>

docs-android/app/src/main/res/layout/file_viewpager_item.xml

@@ -9,7 +9,7 @@
         android:layout_width="200dp"
         android:layout_height="15dip"
         android:id="@+id/fileProgressBar"
-        android:indeterminate="false"
+        android:indeterminate="true"
         android:layout_centerInParent="true"/>
 
     <it.sephiroth.android.library.imagezoom.ImageViewTouch

docs-android/app/src/main/res/layout/groupprofile_activity.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <LinearLayout
+        android:id="@+id/layout"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/membersTextView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:layout_centerInParent="true"
+        android:indeterminate="true" />
+
+</RelativeLayout>

docs-android/app/src/main/res/layout/login_activity.xml

@@ -61,6 +61,17 @@
             android:inputType="textPassword">
         </EditText>
 
+        <EditText
+            android:visibility="gone"
+            android:id="@+id/txtValidationCode"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:ems="10"
+            android:hint="@string/validation_code"
+            android:inputType="number">
+        </EditText>
+
         <Button
             android:id="@+id/btnConnect"
             android:layout_width="fill_parent"

docs-android/app/src/main/res/layout/main_activity.xml

@@ -6,12 +6,47 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <android.support.design.widget.CoordinatorLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/overview_coordinator_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:popupTheme="@style/AppTheme"
+                app:layout_scrollFlags="enterAlways|scroll|snap" />
+
+        </android.support.design.widget.AppBarLayout>
+
         <fragment
             android:id="@+id/main_fragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
             class="com.sismics.docs.fragment.DocListFragment"/>
 
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/addDocumentButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_add_white_24dp"
+            app:layout_anchor="@id/main_fragment"
+            app:layout_behavior="com.sismics.docs.ui.ScrollingFABBehavior"
+            app:layout_anchorGravity="bottom|right|end"
+            app:fabSize="normal"/>
+
+    </android.support.design.widget.CoordinatorLayout>
+
     <LinearLayout
         android:id="@+id/left_drawer"
         android:layout_width="240dp"
@@ -117,6 +152,40 @@
 
         </RelativeLayout>
 
+        <!-- Audit log -->
+
+        <RelativeLayout
+            android:id="@+id/auditLogLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground">
+
+            <ImageView
+                android:id="@+id/auditLogImageView"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_assignment_grey600_24dp"/>
+
+            <TextView
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/auditLogImageView"
+                android:layout_toEndOf="@+id/auditLogImageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:textColor="#212121"
+                android:text="@string/latest_activity"
+                android:textSize="14sp"/>
+
+        </RelativeLayout>
+
         <!-- Separator -->
 
         <View

docs-android/app/src/main/res/layout/search_dialog.xml

@@ -27,6 +27,15 @@
             android:textSize="18sp"
             android:hint="@string/fulltext_search"/>
 
+        <!-- Creator -->
+        <EditText
+            android:id="@+id/creatorEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:textSize="18sp"
+            android:hint="@string/creator"/>
+
         <!-- Language -->
         <Spinner
             android:id="@+id/languageSpinner"

docs-android/app/src/main/res/layout/tag_list_item.xml

@@ -29,16 +29,4 @@
         android:text="Appartement"
         android:textSize="14sp"/>
     
-    <TextView
-        android:id="@+id/tagCountTextView"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:textColor="#888"
-        android:text="5"
-        android:textSize="14sp"/>
-    
 </RelativeLayout>

docs-android/app/src/main/res/layout/userprofile_activity.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <LinearLayout
+        android:id="@+id/layout"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:gravity="end"
+                android:textSize="16sp"
+                android:text="@string/email"/>
+
+            <TextView
+                android:id="@+id/emailTextView"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="16sp"
+                android:text="user1@sismicsdocs.com"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:gravity="end"
+                android:textSize="16sp"
+                android:text="@string/storage_quota"/>
+
+            <TextView
+                android:id="@+id/quotaTextView"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="16sp"
+                android:text="35/500 MB"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:layout_centerInParent="true"
+        android:indeterminate="true" />
+
+</RelativeLayout>

docs-android/app/src/main/res/menu/document_view_activity.xml

@@ -9,6 +9,12 @@
         android:title="@string/toggle_informations">
     </item>
 
+    <item
+        android:id="@+id/comments"
+        app:showAsAction="collapseActionView"
+        android:title="@string/comments">
+    </item>
+
     <item
         android:id="@+id/download_file"
         app:showAsAction="collapseActionView"

docs-android/app/src/main/res/values-de/strings.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Validation -->
+    <string name="validate_error_email">Ungültige E-Mail</string>
+    <string name="validate_error_length_min">Zu kurz (min. %d)</string>
+    <string name="validate_error_length_max">Zu lang (max. %d)</string>
+    <string name="validate_error_required">Erforderlich</string>
+    <string name="validate_error_alphanumeric">Nur Buchstaben und Zahlen</string>
+
+    <!-- App -->
+    <string name="drawer_open">Navigationsleiste öffnen</string>
+    <string name="drawer_close">Navigationsleiste schließen</string>
+    <string name="login_explain"><![CDATA[Um zu beginnen, müssen Sie Teedy Server herunterladen und installieren <a href="https://github.com/sismics/docs">github.com/sismics/docs</a>, sowie die Login-Daten unten eingeben]]></string>
+    <string name="server">Server</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
+    <string name="login">Login</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="login_fail_title">Login gescheitert</string>
+    <string name="login_fail">Benutzername oder Passwort falsch</string>
+    <string name="network_error_title">Netzwerkfehler</string>
+    <string name="network_error">Netzwerkfehler, überprüfen Sie die Internetverbindung und die Server-URL</string>
+    <string name="invalid_url_title">Ungültige URL</string>
+    <string name="invalid_url">Bitte überprüfen Sie die Server-URL und versuchen Sie es erneut</string>
+    <string name="crash_toast_text">Ein Absturz ist aufgetreten, ein Bericht wurde gesendet, um dieses Problem zu beheben</string>
+    <string name="created_date">Erstellungsdatum</string>
+    <string name="download_file">Aktuelle Datei herunterladen</string>
+    <string name="download_document">Herunterladen</string>
+    <string name="action_search">Dokumente durchsuchen</string>
+    <string name="all_documents">Alle Dokumente</string>
+    <string name="shared_documents">Geteilte Dokumente</string>
+    <string name="all_tags">Alle Tags</string>
+    <string name="no_tags">Keine Tags</string>
+    <string name="error_loading_tags">Fehler beim Laden von Tags</string>
+    <string name="no_documents">Keine Dokumente</string>
+    <string name="error_loading_documents">Fehler beim Laden von Dokumenten</string>
+    <string name="no_files">Keine Dateien</string>
+    <string name="error_loading_files">Fehler beim Laden von Dateien</string>
+    <string name="new_document">Neues Dokument</string>
+    <string name="share">Teilen</string>
+    <string name="close">Schließen</string>
+    <string name="add">Hinzufügen</string>
+    <string name="add_share_hint">Freigabename (optional)</string>
+    <string name="document_not_shared">Dieses Dokument wird derzeit nicht freigegeben</string>
+    <string name="delete_share">Diese Freigabe löschen</string>
+    <string name="send_share">Send this share link</string>
+    <string name="error_loading_shares">Fehler beim Laden von Freigaben</string>
+    <string name="error_adding_share">Fehler beim Hinzufügen der Freigabe</string>
+    <string name="share_default_name">Freigabe Link</string>
+    <string name="error_deleting_share">Fehler beim Löschen der Freigabe</string>
+    <string name="send_share_to">Freigabe senden an</string>
+    <string name="upload_file">Datei hinzufügen</string>
+    <string name="upload_from">Datei hochladen von</string>
+    <string name="settings">Einstellungen</string>
+    <string name="logout">Ausloggen</string>
+    <string name="version">Version</string>
+    <string name="build">Build</string>
+    <string name="pref_advanced_category">Erweiterte Einstellungen</string>
+    <string name="pref_about_category">Über</string>
+    <string name="pref_github">GitHub</string>
+    <string name="pref_issue">Fehler berichten</string>
+    <string name="pref_clear_cache_title">Cache leeren</string>
+    <string name="pref_clear_cache_summary">Zwischengespeicherte Dateien löschen</string>
+    <string name="pref_clear_cache_success">Cache wurde geleert</string>
+    <string name="pref_clear_history_title">Suchhistorie löschen</string>
+    <string name="pref_clear_history_summary">Leert die aktuellen Suchvorschläge</string>
+    <string name="pref_clear_history_success">Suchvorschläge wurden gelöscht</string>
+    <string name="pref_cache_size">Cache Größe</string>
+    <string name="save">Speichern</string>
+    <string name="edit_document">Bearbeiten</string>
+    <string name="error_editing_document">Netzwerkfehler, bitte versuchen Sie es erneut</string>
+    <string name="please_wait">Bitte warten</string>
+    <string name="document_editing_message">Daten werden gesendet</string>
+    <string name="delete_document">Löschen</string>
+    <string name="delete_document_title">Dokument löschen</string>
+    <string name="delete_document_message">Dieses Dokument und alle zugehörigen Dateien wirklich löschen?</string>
+    <string name="document_delete_failure">Netzwerkfehler beim Löschen des Dokuments</string>
+    <string name="document_deleting_message">Lösche Dokument</string>
+    <string name="delete_file_title">Datei löschen</string>
+    <string name="delete_file_message">Die aktuelle Datei wirklich löschen?</string>
+    <string name="file_delete_failure">Netzwerkfehler beim Löschen der Datei</string>
+    <string name="file_deleting_message">Lösche Datei</string>
+    <string name="error_reading_file">Fehler beim Lesen der Datei</string>
+    <string name="upload_notification_title">Teedy</string>
+    <string name="upload_notification_message">Neue Datei in das Dokument hochladen</string>
+    <string name="upload_notification_error">Fehler beim Hochladen der neuen Datei</string>
+    <string name="delete_file">Aktuelle Datei löschen</string>
+    <string name="advanced_search">Erweiterte Suche</string>
+    <string name="search">Suche</string>
+    <string name="add_tags">Tags hinzufügen</string>
+    <string name="creation_date">Erstellungsdatum</string>
+    <string name="description">Beschreibung</string>
+    <string name="title">Titel</string>
+    <string name="simple_search">Einfache Suche</string>
+    <string name="fulltext_search">Volltextsuche</string>
+    <string name="creator">Ersteller</string>
+    <string name="after_date">Nach Datum</string>
+    <string name="before_date">Vor Datum</string>
+    <string name="search_tags">Tags durchsuchen</string>
+    <string name="all_languages">Alle Sprachen</string>
+    <string name="toggle_informations">Informationen anzeigen</string>
+    <string name="who_can_access">Wer kann darauf zugreifen?</string>
+    <string name="comments">Kommentare</string>
+    <string name="no_comments">Keine Kommentare</string>
+    <string name="error_loading_comments">Fehler beim Laden von Kommentaren</string>
+    <string name="send">Senden</string>
+    <string name="add_comment">Kommentar hinzufügen</string>
+    <string name="comment_add_failure">Fehler beim Hinzufügen des Kommentars</string>
+    <string name="adding_comment">Füge Kommentar hinzu</string>
+    <string name="comment_delete">Kommentar löschen</string>
+    <string name="deleting_comment">Lösche Kommentar</string>
+    <string name="error_deleting_comment">Fehler beim Löschen des Kommentars</string>
+    <string name="export_pdf">PDF</string>
+    <string name="download">Download</string>
+    <string name="margin">Rand</string>
+    <string name="fit_image_to_page">Bild an Seite anpassen</string>
+    <string name="export_comments">Kommentare exportieren</string>
+    <string name="export_metadata">Metadaten exportieren</string>
+    <string name="mm">mm</string>
+    <string name="download_file_title">Teedy Datei Export</string>
+    <string name="download_document_title">Teedy Dokumentenexport</string>
+    <string name="download_pdf_title">Teedy PDF Export</string>
+    <string name="latest_activity">Letzte Aktivität</string>
+    <string name="activity">Aktivitäten</string>
+    <string name="email">E-Mail</string>
+    <string name="storage_quota">Speicherbegrenzung</string>
+    <string name="storage_display">%1$d/%2$d MB</string>
+    <string name="validation_code">Validierungscode</string>
+    <string name="shared">Geteilt</string>
+    <string name="language">Sprache</string>
+    <string name="coverage">Geltungsbereich</string>
+    <string name="type">Typ</string>
+    <string name="source">Quelle</string>
+    <string name="format">Format</string>
+    <string name="publisher">Verleger</string>
+    <string name="identifier">Identifikator</string>
+    <string name="subject">Thema</string>
+    <string name="rights">Rechte</string>
+    <string name="contributors">Mitwirkende</string>
+    <string name="relations">Beziehungen</string>
+
+    <!-- Audit log -->
+    <string name="auditlog_Acl">ACL</string>
+    <string name="auditlog_Comment">Kommentar</string>
+    <string name="auditlog_Document">Dokument</string>
+    <string name="auditlog_File">Datei</string>
+    <string name="auditlog_Group">Gruppe</string>
+    <string name="auditlog_Route">Workflow</string>
+    <string name="auditlog_RouteModel">Workflow-Muster</string>
+    <string name="auditlog_Tag">Tag</string>
+    <string name="auditlog_User">Benutzer</string>
+    <string name="auditlog_Webhook">Webhook</string>
+    <string name="auditlog_created">erstellt</string>
+    <string name="auditlog_updated">aktualisiert</string>
+    <string name="auditlog_deleted">gelöscht</string>
+
+</resources>

docs-android/app/src/main/res/values-fr/strings.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Validation -->
+    <string name="validate_error_email">Email invalide</string>
+    <string name="validate_error_length_min">Trop court (min. %d)</string>
+    <string name="validate_error_length_max">Trop long (max. %d)</string>
+    <string name="validate_error_required">Requis</string>
+    <string name="validate_error_alphanumeric">Seuls les lettres et les nombres sont autorisés</string>
+
+    <!-- App -->
+    <string name="drawer_open">Ouvrir le menu de navigation</string>
+    <string name="drawer_close">Fermer le menu de navigation</string>
+    <string name="login_explain"><![CDATA[Pour commencer, vous devez télécharger et installer le serveur Teedy sur <a href="https://github.com/sismics/docs">github.com/sismics/docs</a> et entrer son URL ci-dessous]]></string>
+    <string name="server">Serveur</string>
+    <string name="username">Nom d\'utilisateur</string>
+    <string name="password">Mot de passe</string>
+    <string name="login">Connexion</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Annuler</string>
+    <string name="login_fail_title">Echec de la connexion</string>
+    <string name="login_fail">Mauvais nom d\'utilisateur ou de mot de passe</string>
+    <string name="network_error_title">Erreur réseau</string>
+    <string name="network_error">Erreur réseau, veuillez vérifier votre connexion internet et l\'URL du serveur</string>
+    <string name="invalid_url_title">URL invalide</string>
+    <string name="invalid_url">Veuillez vérifier l\URL du serveur et réessayer</string>
+    <string name="crash_toast_text">Une erreur s\'est produite, un rapport a été envoyé afin de corriger ce problème</string>
+    <string name="created_date">Date création</string>
+    <string name="download_file">Télécharger ce fichier</string>
+    <string name="download_document">Télécharger</string>
+    <string name="action_search">Rechercher dans les documents</string>
+    <string name="all_documents">Tous les documents</string>
+    <string name="shared_documents">Documents partagés</string>
+    <string name="all_tags">Tous les tags</string>
+    <string name="no_tags">Aucun tag</string>
+    <string name="error_loading_tags">Erreur de chargement des tags</string>
+    <string name="no_documents">Aucun document</string>
+    <string name="error_loading_documents">Erreur de chargement des documents</string>
+    <string name="no_files">Aucun fichier</string>
+    <string name="error_loading_files">Erreur de chargement des fichiers</string>
+    <string name="new_document">Nouveau document</string>
+    <string name="share">Partage</string>
+    <string name="close">Fermer</string>
+    <string name="add">Ajouter</string>
+    <string name="add_share_hint">Nom du partage (facultatif)</string>
+    <string name="document_not_shared">Ce document n\'est pas partagé</string>
+    <string name="delete_share">Supprimer ce partage</string>
+    <string name="send_share">Envoi ce lien de partage</string>
+    <string name="error_loading_shares">Erreur de chargement des partages</string>
+    <string name="error_adding_share">Erreur lors de l\'ajout du partage</string>
+    <string name="share_default_name">Lien de partage</string>
+    <string name="error_deleting_share">Erreur lors de la suppression de ce partage</string>
+    <string name="send_share_to">Envoi ce lien de partage à</string>
+    <string name="upload_file">Aj. fichier</string>
+    <string name="upload_from">Envoyer un fichier depuis</string>
+    <string name="settings">Paramètres</string>
+    <string name="logout">Déconnexion</string>
+    <string name="version">Version</string>
+    <string name="build">Build</string>
+    <string name="pref_advanced_category">Paramètres avancés</string>
+    <string name="pref_about_category">A propors</string>
+    <string name="pref_github">GitHub</string>
+    <string name="pref_issue">Rapporter un bug</string>
+    <string name="pref_clear_cache_title">Vider le cache</string>
+    <string name="pref_clear_cache_summary">Nettoyer les fichiers en cache</string>
+    <string name="pref_clear_cache_success">Cache vidé</string>
+    <string name="pref_clear_history_title">Vider l\'historique de recherche</string>
+    <string name="pref_clear_history_summary">Supprimer les recherches récentes</string>
+    <string name="pref_clear_history_success">Historique de recherche vidé</string>
+    <string name="pref_cache_size">Taille du cache</string>
+    <string name="save">Enregistrer</string>
+    <string name="edit_document">Modifier</string>
+    <string name="error_editing_document">Erreur réseau, veuillez réessayer</string>
+    <string name="please_wait">Veuillez patienter</string>
+    <string name="document_editing_message">Envoi des données</string>
+    <string name="delete_document">Suppr.</string>
+    <string name="delete_document_title">Supprimer le document</string>
+    <string name="delete_document_message">Etes-vous sûr de vouloir supprimer ce document et tous les fichiers associés ?</string>
+    <string name="document_delete_failure">Erreur réseau lors de la suppression de ce document</string>
+    <string name="document_deleting_message">Suppression du document</string>
+    <string name="delete_file_title">Supprimer le fichier</string>
+    <string name="delete_file_message">Etes-vous sûr de vouloir supprimer ce fichier ?</string>
+    <string name="file_delete_failure">Erreur réseau lors de la suppression du fichier</string>
+    <string name="file_deleting_message">Suppression du fichier</string>
+    <string name="error_reading_file">Erreur lors de la lecture du fichier</string>
+    <string name="upload_notification_title">Teedy</string>
+    <string name="upload_notification_message">Envoi du nouveau fichier</string>
+    <string name="upload_notification_error">Erreur lors de l\'envoi du nouveau fichier</string>
+    <string name="delete_file">Supprimer ce fichier</string>
+    <string name="advanced_search">Recherche avancée</string>
+    <string name="search">Rechercher</string>
+    <string name="add_tags">Ajouter des tags</string>
+    <string name="creation_date">Date de création</string>
+    <string name="description">Description</string>
+    <string name="title">Titre</string>
+    <string name="simple_search">Recherche simple</string>
+    <string name="fulltext_search">Recherche texte intégral</string>
+    <string name="creator">Créateur</string>
+    <string name="after_date">Après cette date</string>
+    <string name="before_date">Avant cette date</string>
+    <string name="search_tags">Rechercher dans les tags</string>
+    <string name="all_languages">Toutes les langues</string>
+    <string name="toggle_informations">Afficher/masquer les informations</string>
+    <string name="who_can_access">Qui a accès</string>
+    <string name="comments">Commentaires</string>
+    <string name="no_comments">Aucun commentaire</string>
+    <string name="error_loading_comments">Erreur de chargement des commentaires</string>
+    <string name="send">Envoyer</string>
+    <string name="add_comment">Ajouter un commentaire</string>
+    <string name="comment_add_failure">Erreur lors de l\'ajout du commentaire</string>
+    <string name="adding_comment">Ajout du commentaire</string>
+    <string name="comment_delete">Supprimer le commentaire</string>
+    <string name="deleting_comment">Suppression du commentaire</string>
+    <string name="error_deleting_comment">Erreur lors de la suppression du commentaire</string>
+    <string name="export_pdf">PDF</string>
+    <string name="download">Télécharger</string>
+    <string name="margin">Marge</string>
+    <string name="fit_image_to_page">Ajuster les images à la page</string>
+    <string name="export_comments">Exporter les commentaires</string>
+    <string name="export_metadata">Exporter les métadonnées</string>
+    <string name="mm">mm</string>
+    <string name="download_file_title">Export de fichier Teedy</string>
+    <string name="download_document_title">Export de document Teedy</string>
+    <string name="download_pdf_title">Export PDF Teedy</string>
+    <string name="latest_activity">Activité récente</string>
+    <string name="activity">Activité</string>
+    <string name="email">E-mail</string>
+    <string name="storage_quota">Quota de stockage</string>
+    <string name="storage_display">%1$d/%2$d Mo</string>
+    <string name="validation_code">Code de validation</string>
+    <string name="shared">Partagé</string>
+    <string name="language">Langue</string>
+    <string name="coverage">Couverture</string>
+    <string name="type">Type</string>
+    <string name="source">Source</string>
+    <string name="format">Format</string>
+    <string name="publisher">Editeur</string>
+    <string name="identifier">Identifiant</string>
+    <string name="subject">Sujet</string>
+    <string name="rights">Droits</string>
+    <string name="contributors">Contributeurs</string>
+    <string name="relations">Relations</string>
+
+    <!-- Audit log -->
+    <string name="auditlog_Acl">ACL</string>
+    <string name="auditlog_Comment">Commentaire</string>
+    <string name="auditlog_Document">Document</string>
+    <string name="auditlog_File">Fichier</string>
+    <string name="auditlog_Group">Groupe</string>
+    <string name="auditlog_Route">Workflow</string>
+    <string name="auditlog_RouteModel">Modèle de workflow</string>
+    <string name="auditlog_Tag">Tag</string>
+    <string name="auditlog_User">Utilisateur</string>
+    <string name="auditlog_Webhook">Webhook</string>
+    <string name="auditlog_created">créé</string>
+    <string name="auditlog_updated">mis à jour</string>
+    <string name="auditlog_deleted">supprimé</string>
+
+</resources>

docs-android/app/src/main/res/values-pl/strings.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Validation -->
+    <string name="validate_error_email">Nieprawidłowy email</string>
+    <string name="validate_error_length_min">Za krótki (min. %d)</string>
+    <string name="validate_error_length_max">Za długi (max. %d)</string>
+    <string name="validate_error_required">Wymagany</string>
+    <string name="validate_error_alphanumeric">Tylko litery i cyfry</string>
+
+    <!-- App -->
+    <string name="app_name" translatable="false">Teedy</string>
+    <string name="drawer_open">Otwórz szufladę nawigacji</string>
+    <string name="drawer_close">Zamknij szufladę nawigacji</string>
+    <string name="login_explain"><![CDATA[Aby rozpocząć, musisz pobrać i zainstalować serwer Teedy na <a href="https://github.com/sismics/docs">github.com/sismics/docs</a> i poniżej wprowadzić adres]]></string>
+    <string name="server">Serwer</string>
+    <string name="username">Użytkownik</string>
+    <string name="password">Hasło</string>
+    <string name="login">Zaloguj</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Anuluj</string>
+    <string name="login_fail_title">Błąd logowania</string>
+    <string name="login_fail">Nieprawidłowa nazwa użytkownika lub hasło</string>
+    <string name="network_error_title">Błąd sieci</string>
+    <string name="network_error">Błąd sieci, sprawdź połączenie z interneterm oraz adres URL serwera</string>
+    <string name="invalid_url_title">Nieprawidłowy adres URL</string>
+    <string name="invalid_url">Sprawdź adres URL serwera i spróbuj ponownie</string>
+    <string name="crash_toast_text">Wystąpiła awaria, wysłano raport w celu rozwiązania tego problemu</string>
+    <string name="created_date">Data utworzenia</string>
+    <string name="download_file">Pobierz bieżący plik</string>
+    <string name="download_document">Pobierz</string>
+    <string name="action_search">Znadź dokumenty</string>
+    <string name="all_documents">Wszystkie dokumenty</string>
+    <string name="shared_documents">Udostępnione dokumenty</string>
+    <string name="all_tags">Wszystkie etykiety</string>
+    <string name="no_tags">Brak etykiet</string>
+    <string name="error_loading_tags">Błąd ładowania etykiet</string>
+    <string name="no_documents">Brak dokumentów</string>
+    <string name="error_loading_documents">Błąd ładowania dokumentów</string>
+    <string name="no_files">Brak plików</string>
+    <string name="error_loading_files">Błąd ładowania plików</string>
+    <string name="new_document">Nowy dokument</string>
+    <string name="share">Udostępnij</string>
+    <string name="close">Zamknij</string>
+    <string name="add">Dodaj</string>
+    <string name="add_share_hint">Nazwa udostępnienia (opcjonalnie)</string>
+    <string name="document_not_shared">Ten dokument nie jest obecnie udostępniony</string>
+    <string name="delete_share">Usuń udostępnienie</string>
+    <string name="send_share">Wyślij link udostępnienia</string>
+    <string name="error_loading_shares">Błąd ładowania udostępnień</string>
+    <string name="error_adding_share">Błąd dodawania udostępnienia</string>
+    <string name="share_default_name">Udostępnij link</string>
+    <string name="error_deleting_share">Błąd usuwania udostępnienia</string>
+    <string name="send_share_to">Wyślij link udostępnienia do</string>
+    <string name="upload_file">dodaj plik</string>
+    <string name="upload_from">Przeslij plik z</string>
+    <string name="settings">ustawienia</string>
+    <string name="logout">Wyloguj</string>
+    <string name="version">Wersja</string>
+    <string name="build">Kompilacja</string>
+    <string name="pref_advanced_category">Ustawienia zaawansowane</string>
+    <string name="pref_about_category">O programie</string>
+    <string name="pref_github">GitHub</string>
+    <string name="pref_issue">Zgłoś błąd</string>
+    <string name="pref_clear_cache_title">Wyczyść cache</string>
+    <string name="pref_clear_cache_summary">Wyczyść podręczne pliki</string>
+    <string name="pref_clear_cache_success">Cache wyczyszczony</string>
+    <string name="pref_clear_history_title">Wyczyść historię wyszukiwania</string>
+    <string name="pref_clear_history_summary">Opróżnij ostatnie sugestie wyszukiwania</string>
+    <string name="pref_clear_history_success">Historia wyszukiwania wyczyszczona</string>
+    <string name="pref_cache_size">Rozmiar cache</string>
+    <string name="language_french" translatable="false">Francuski</string>
+    <string name="language_english" translatable="false">Angielski</string>
+    <string name="language_german" translatable="false">Niemiecki</string>
+    <string name="language_polish" translatable="false">Polski</string>
+    <string name="save">Zapisz</string>
+    <string name="edit_document">Edytuj</string>
+    <string name="error_editing_document">Błąd sieci, spróbuj ponownie</string>
+    <string name="please_wait">Proszę czekać</string>
+    <string name="document_editing_message">Wysyłam twoje dane</string>
+    <string name="delete_document">Usuń</string>
+    <string name="delete_document_title">Usuń dokument</string>
+    <string name="delete_document_message">Naprawdę chcesz usunąć dokument i powiązane z nim pliki?</string>
+    <string name="document_delete_failure">Błąd sieci w czasie usuwania tego dokumentu</string>
+    <string name="document_deleting_message">Usuwanie dokumentu</string>
+    <string name="delete_file_title">Usuń plik</string>
+    <string name="delete_file_message">Naprawdę chcesz usunąć ten plik?</string>
+    <string name="file_delete_failure">Błąd sieci w czasie usuwania bieżącego pliku</string>
+    <string name="file_deleting_message">Usuwanie pliku</string>
+    <string name="error_reading_file">Błąd podczas odczytu pliku</string>
+    <string name="upload_notification_title">Teedy</string>
+    <string name="upload_notification_message">Przesyłanie nowego pliku do dokumentu</string>
+    <string name="upload_notification_error">Błąd przsyłania nowego pliku</string>
+    <string name="delete_file">Usuń bieżący plik</string>
+    <string name="advanced_search">Zaawansowane wyszukiwanie</string>
+    <string name="search">Znajdź</string>
+    <string name="add_tags">Dodaj eytkiety</string>
+    <string name="creation_date">Data utworzenia</string>
+    <string name="description">Opis</string>
+    <string name="title">Tytuł</string>
+    <string name="simple_search">Proste wyszukiwanie</string>
+    <string name="fulltext_search">Wyszukiwanie pełnotekstowe</string>
+    <string name="creator">Autor</string>
+    <string name="after_date">Po dacie</string>
+    <string name="before_date">Przed datą</string>
+    <string name="search_tags">Znajdź etykiety</string>
+    <string name="all_languages">Wszystkie języki</string>
+    <string name="toggle_informations">Przełącz informacje</string>
+    <string name="who_can_access">Kto ma dostęp</string>
+    <string name="comments">Komentarze</string>
+    <string name="no_comments">Brak komentarzy</string>
+    <string name="error_loading_comments">Błąd ładowania komentarzy</string>
+    <string name="send">Wyślij</string>
+    <string name="add_comment">Dodaj komentarz</string>
+    <string name="comment_add_failure">Błąd dodawania komentarza</string>
+    <string name="adding_comment">Dodawanie komentarza</string>
+    <string name="comment_delete">Usuń komentarz</string>
+    <string name="deleting_comment">Usuwanie komentarza</string>
+    <string name="error_deleting_comment">Błąd usuwania komentarza</string>
+    <string name="export_pdf">PDF</string>
+    <string name="download">Pobierz</string>
+    <string name="margin">Margines</string>
+    <string name="fit_image_to_page">Dostosuj obraz do strony</string>
+    <string name="export_comments">Eksport komentarzy</string>
+    <string name="export_metadata">Eksport metadanych</string>
+    <string name="mm">mm</string>
+    <string name="download_file_title">Eksport plików Teedy</string>
+    <string name="download_document_title">Eksport dokumentu Teedy</string>
+    <string name="download_pdf_title">Eksport Teedy jako PDF</string>
+    <string name="latest_activity">Ostatnie aktywności</string>
+    <string name="activity">Aktywności</string>
+    <string name="email">E-mail</string>
+    <string name="storage_quota">Limit magazynu</string>
+    <string name="storage_display">%1$d/%2$d MB</string>
+    <string name="validation_code">Kod weryfikujący</string>
+    <string name="shared">Udostępnienie</string>
+    <string name="language">Język</string>
+    <string name="coverage">Zakres</string>
+    <string name="type">Rodzaj</string>
+    <string name="source">Źródło</string>
+    <string name="format">Format</string>
+    <string name="publisher">Udostępniający</string>
+    <string name="identifier">Identifikator</string>
+    <string name="subject">temat</string>
+    <string name="rights">Prawa</string>
+    <string name="contributors">Współtwórcy</string>
+    <string name="relations">Powiązania</string>
+
+    <!-- Audit log -->
+    <string name="auditlog_Acl">ACL</string>
+    <string name="auditlog_Comment">Komentarz</string>
+    <string name="auditlog_Document">Dokument</string>
+    <string name="auditlog_File">Plik</string>
+    <string name="auditlog_Group">Grupa</string>
+    <string name="auditlog_Route">Przepływ</string>
+    <string name="auditlog_RouteModel">Model przepływu</string>
+    <string name="auditlog_Tag">Etykieta</string>
+    <string name="auditlog_User">Użytkownik</string>
+    <string name="auditlog_Webhook">Webhook</string>
+    <string name="auditlog_created">utworzony</string>
+    <string name="auditlog_updated">zaktualizowany</string>
+    <string name="auditlog_deleted">usunięty</string>
+
+</resources>

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

@@ -9,10 +9,10 @@
     <string name="validate_error_alphanumeric">Only letters and numbers</string>
 
     <!-- App -->
-    <string name="app_name">Sismics Docs</string>
+    <string name="app_name" translatable="false">Teedy</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
-    <string name="login_explain"><![CDATA[To start, you must download and install Sismics Docs Server on <a href="http://www.sismics.com/docs">www.sismics.com/docs</a> and enter your server URL below]]></string>
+    <string name="login_explain"><![CDATA[To start, you must download and install Teedy Server on <a href="https://github.com/sismics/docs">github.com/sismics/docs</a> and enter its below]]></string>
     <string name="server">Server</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -28,9 +28,7 @@
     <string name="crash_toast_text">A crash occurred, a report has been sent to resolve this problem</string>
     <string name="created_date">Created date</string>
     <string name="download_file">Download current file</string>
-    <string name="downloading_file">Downloading file number %1s</string>
     <string name="download_document">Download</string>
-    <string name="downloading_document">Downloading document</string>
     <string name="action_search">Search documents</string>
     <string name="all_documents">All documents</string>
     <string name="shared_documents">Shared documents</string>
@@ -48,7 +46,7 @@
     <string name="add_share_hint">Name the share (optional)</string>
     <string name="document_not_shared">This document is not currently shared</string>
     <string name="delete_share">Delete this share</string>
-    <string name="send_share">Send this share</string>
+    <string name="send_share">Send this share link</string>
     <string name="error_loading_shares">Error loading shares</string>
     <string name="error_adding_share">Error adding share</string>
     <string name="share_default_name">Share link</string>
@@ -71,9 +69,10 @@
     <string name="pref_clear_history_summary">Wipe the recent search suggestions</string>
     <string name="pref_clear_history_success">Search history cleared</string>
     <string name="pref_cache_size">Cache size</string>
-    <string name="language_french">French</string>
+    <string name="language_french" translatable="false">Français</string>
-    <string name="language_english">English</string>
+    <string name="language_english" translatable="false">English</string>
-    <string name="language_japanese">Japanese</string>
+    <string name="language_german" translatable="false">Deutsch</string>
+    <string name="language_polish" translatable="false">Polski</string>
     <string name="save">Save</string>
     <string name="edit_document">Edit</string>
     <string name="error_editing_document">Network error, please try again</string>
@@ -89,7 +88,7 @@
     <string name="file_delete_failure">Network error while deleting the current file</string>
     <string name="file_deleting_message">Deleting file</string>
     <string name="error_reading_file">Error while reading the file</string>
-    <string name="upload_notification_title">Sismics Docs</string>
+    <string name="upload_notification_title">Teedy</string>
     <string name="upload_notification_message">Uploading the new file to the document</string>
     <string name="upload_notification_error">Error uploading the new file</string>
     <string name="delete_file">Delete current file</string>
@@ -101,12 +100,65 @@
     <string name="title">Title</string>
     <string name="simple_search">Simple search</string>
     <string name="fulltext_search">Fulltext search</string>
+    <string name="creator">Creator</string>
     <string name="after_date">After date</string>
     <string name="before_date">Before date</string>
     <string name="search_tags">Search tags</string>
     <string name="all_languages">All languages</string>
     <string name="toggle_informations">Toggle informations</string>
     <string name="who_can_access">Who can access</string>
+    <string name="comments">Comments</string>
+    <string name="no_comments">No comments</string>
+    <string name="error_loading_comments">Error loading comments</string>
+    <string name="send">Send</string>
+    <string name="add_comment">Add a comment</string>
+    <string name="comment_add_failure">Error adding a comment</string>
+    <string name="adding_comment">Adding a comment</string>
+    <string name="comment_delete">Delete comment</string>
+    <string name="deleting_comment">Deleting comment</string>
+    <string name="error_deleting_comment">Error deleting comment</string>
+    <string name="export_pdf">PDF</string>
+    <string name="download">Download</string>
+    <string name="margin">Margin</string>
+    <string name="fit_image_to_page">Fit image to page</string>
+    <string name="export_comments">Export comments</string>
+    <string name="export_metadata">Export metadata</string>
+    <string name="mm">mm</string>
+    <string name="download_file_title">Teedy file export</string>
+    <string name="download_document_title">Teedy document export</string>
+    <string name="download_pdf_title">Teedy PDF export</string>
+    <string name="latest_activity">Latest activity</string>
+    <string name="activity">Activity</string>
+    <string name="email">E-mail</string>
+    <string name="storage_quota">Storage quota</string>
+    <string name="storage_display">%1$d/%2$d MB</string>
+    <string name="validation_code">Validation code</string>
+    <string name="shared">Shared</string>
+    <string name="language">Language</string>
+    <string name="coverage">Coverage</string>
+    <string name="type">Type</string>
+    <string name="source">Source</string>
+    <string name="format">Format</string>
+    <string name="publisher">Publisher</string>
+    <string name="identifier">Identifier</string>
+    <string name="subject">Subject</string>
+    <string name="rights">Rights</string>
+    <string name="contributors">Contributors</string>
+    <string name="relations">Relations</string>
 
+    <!-- Audit log -->
+    <string name="auditlog_Acl">ACL</string>
+    <string name="auditlog_Comment">Comment</string>
+    <string name="auditlog_Document">Document</string>
+    <string name="auditlog_File">File</string>
+    <string name="auditlog_Group">Group</string>
+    <string name="auditlog_Route">Workflow</string>
+    <string name="auditlog_RouteModel">Workflow model</string>
+    <string name="auditlog_Tag">Tag</string>
+    <string name="auditlog_User">User</string>
+    <string name="auditlog_Webhook">Webhook</string>
+    <string name="auditlog_created">created</string>
+    <string name="auditlog_updated">updated</string>
+    <string name="auditlog_deleted">deleted</string>
 
 </resources>

docs-android/app/src/main/res/values/styles.xml

@@ -1,12 +1,20 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppThemeDark" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

docs-android/gradle.properties

@@ -12,6 +12,8 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
+org.gradle.jvmargs=-Xmx3072m
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

docs-android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 26 21:58:48 CET 2014
+#Tue May 07 11:49:13 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip