diff --git a/.gitignore b/.gitignore
index a18d2645..a4db20d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,11 +31,7 @@ build/
local.properties
# fastlane
-secret_key_file.json
-**/**/fastlane/fastlane/**
-**/**/fastlane/metadata/**
-**/**/fastlane/report.xml
-**/**/fastlane/mappings/**
-**/**/fastlane/release_notes/**
-**/**/fastlane/latest_versions/**
-.env.default
+**/fastlane/.env
+**/fastlane/metadata/**/images/**
+**/fastlane/report.xml
+**/fastlane/latest_versions/**
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..448c34f4
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem "net-sftp"
+gem "ed25519"
+gem "bcrypt_pbkdf"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..97697954
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,211 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (3.0.3)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ artifactory (3.0.15)
+ atomos (0.1.3)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.424.0)
+ aws-sdk-core (3.112.0)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-kms (1.42.0)
+ aws-sdk-core (~> 3, >= 3.112.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.88.0)
+ aws-sdk-core (~> 3, >= 3.112.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.2.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ babosa (1.0.4)
+ bcrypt_pbkdf (1.0.1)
+ claide (1.0.3)
+ colored (1.2)
+ colored2 (3.1.2)
+ commander-fastlane (4.4.6)
+ highline (~> 1.7.2)
+ declarative (0.0.20)
+ declarative-option (0.1.0)
+ digest-crc (0.6.3)
+ rake (>= 12.0.0, < 14.0.0)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.7.6)
+ ed25519 (1.2.4)
+ emoji_regex (3.2.1)
+ excon (0.79.0)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
+ multipart-post (>= 1.2, < 3)
+ ruby2_keywords
+ faraday-cookie_jar (0.0.7)
+ faraday (>= 0.8.0)
+ http-cookie (~> 1.0.0)
+ faraday-net_http (1.0.1)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
+ fastimage (2.2.2)
+ fastlane (2.173.0)
+ CFPropertyList (>= 2.3, < 4.0.0)
+ addressable (>= 2.3, < 3.0.0)
+ artifactory (~> 3.0)
+ aws-sdk-s3 (~> 1.0)
+ babosa (>= 1.0.3, < 2.0.0)
+ bundler (>= 1.12.0, < 3.0.0)
+ colored
+ commander-fastlane (>= 4.4.6, < 5.0.0)
+ dotenv (>= 2.1.1, < 3.0.0)
+ emoji_regex (>= 0.1, < 4.0)
+ excon (>= 0.71.0, < 1.0.0)
+ faraday (~> 1.0)
+ faraday-cookie_jar (~> 0.0.6)
+ faraday_middleware (~> 1.0)
+ fastimage (>= 2.1.0, < 3.0.0)
+ gh_inspector (>= 1.1.2, < 2.0.0)
+ google-api-client (>= 0.37.0, < 0.39.0)
+ google-cloud-storage (>= 1.15.0, < 2.0.0)
+ highline (>= 1.7.2, < 2.0.0)
+ json (< 3.0.0)
+ jwt (>= 2.1.0, < 3)
+ mini_magick (>= 4.9.4, < 5.0.0)
+ multipart-post (~> 2.0.0)
+ plist (>= 3.1.0, < 4.0.0)
+ rubyzip (>= 2.0.0, < 3.0.0)
+ security (= 0.1.3)
+ simctl (~> 1.6.3)
+ slack-notifier (>= 2.0.0, < 3.0.0)
+ terminal-notifier (>= 2.0.0, < 3.0.0)
+ terminal-table (>= 1.4.5, < 2.0.0)
+ tty-screen (>= 0.6.3, < 1.0.0)
+ tty-spinner (>= 0.8.0, < 1.0.0)
+ word_wrap (~> 1.0.0)
+ xcodeproj (>= 1.13.0, < 2.0.0)
+ xcpretty (~> 0.3.0)
+ xcpretty-travis-formatter (>= 0.0.3)
+ fastlane-plugin-get_version_name (0.2.2)
+ gh_inspector (1.1.3)
+ google-api-client (0.38.0)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.9)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ signet (~> 0.12)
+ google-apis-core (0.2.1)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.14)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ rexml
+ signet (~> 0.14)
+ webrick
+ google-apis-iamcredentials_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-apis-storage_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-cloud-core (1.5.0)
+ google-cloud-env (~> 1.0)
+ google-cloud-errors (~> 1.0)
+ google-cloud-env (1.4.0)
+ faraday (>= 0.17.3, < 2.0)
+ google-cloud-errors (1.0.1)
+ google-cloud-storage (1.30.0)
+ addressable (~> 2.5)
+ digest-crc (~> 0.4)
+ google-apis-iamcredentials_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.1)
+ google-cloud-core (~> 1.2)
+ googleauth (~> 0.9)
+ mini_mime (~> 1.0)
+ googleauth (0.15.0)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.4, < 3.0)
+ memoist (~> 0.16)
+ multi_json (~> 1.11)
+ os (>= 0.9, < 2.0)
+ signet (~> 0.14)
+ highline (1.7.10)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
+ httpclient (2.8.3)
+ jmespath (1.4.0)
+ json (2.5.1)
+ jwt (2.2.2)
+ memoist (0.16.2)
+ mini_magick (4.11.0)
+ mini_mime (1.0.2)
+ multi_json (1.15.0)
+ multipart-post (2.0.0)
+ nanaimo (0.3.0)
+ naturally (2.2.1)
+ net-sftp (2.1.2)
+ net-ssh (>= 2.6.5)
+ net-ssh (5.2.0)
+ os (1.1.1)
+ plist (3.6.0)
+ public_suffix (4.0.6)
+ rake (13.0.3)
+ representable (3.0.4)
+ declarative (< 0.1.0)
+ declarative-option (< 0.2.0)
+ uber (< 0.2.0)
+ retriable (3.1.2)
+ rexml (3.2.4)
+ rouge (2.0.7)
+ ruby2_keywords (0.0.4)
+ rubyzip (2.3.0)
+ security (0.1.3)
+ signet (0.14.1)
+ addressable (~> 2.3)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.5, < 3.0)
+ multi_json (~> 1.10)
+ simctl (1.6.8)
+ CFPropertyList
+ naturally
+ slack-notifier (2.3.2)
+ terminal-notifier (2.0.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ tty-cursor (0.7.1)
+ tty-screen (0.8.1)
+ tty-spinner (0.9.3)
+ tty-cursor (~> 0.7)
+ uber (0.1.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.7)
+ unicode-display_width (1.7.0)
+ webrick (1.7.0)
+ word_wrap (1.0.0)
+ xcodeproj (1.19.0)
+ CFPropertyList (>= 2.3.3, < 4.0)
+ atomos (~> 0.1.3)
+ claide (>= 1.0.2, < 2.0)
+ colored2 (~> 3.1)
+ nanaimo (~> 0.3.0)
+ xcpretty (0.3.0)
+ rouge (~> 2.0.7)
+ xcpretty-travis-formatter (1.0.1)
+ xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bcrypt_pbkdf
+ ed25519
+ fastlane
+ fastlane-plugin-get_version_name
+ net-sftp
+
+BUNDLED WITH
+ 2.2.5
diff --git a/fastlane/.default.env b/fastlane/.default.env
new file mode 100644
index 00000000..d79b8d49
--- /dev/null
+++ b/fastlane/.default.env
@@ -0,0 +1,19 @@
+# This file is just a template and should remain untouched
+# COPY this file to .env and fill out the env variables
+
+GOOGLE_PLAYSTORE_PRIVATE_KEY_FILE_PATH=
+
+SIGNING_KEYSOTRE_PATH=
+SIGNING_KEYSOTRE_PASSWORD=
+SIGNING_KEY_ALIAS=
+SIGNING_KEY_PASSWORD=
+
+SIGNING_UPDATE_APK_STORE_KEY_PATH=
+SIGNING_UPDATE_APK_STORE_PUB_KEY_PATH=
+APK_STORE_BASIC_URL=
+
+FTP_SERVER_USERNAME=
+FTP_SERVER_KEY_FILE=
+FTP_SERVER_PORT=
+
+SLACK_URL=
diff --git a/fastlane/Appfile b/fastlane/Appfile
new file mode 100644
index 00000000..864808dc
--- /dev/null
+++ b/fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file(ENV["GOOGLE_PLAYSTORE_PRIVATE_KEY_FILE_PATH"])
+package_name("org.cryptomator")
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 00000000..6ac8b339
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,174 @@
+fastlane_require 'dotenv'
+fastlane_require 'jwt'
+fastlane_require 'base64'
+fastlane_require 'net/sftp'
+
+default_platform(:android)
+
+branch_name = `git rev-parse --abbrev-ref HEAD`
+build = `git rev-list --count #{branch_name} | tr -d " \t\n\r"`
+build = build.to_i + 1958 # adding 1958 for legacy reasons. Must be in sync with getVersionCode() from build.gradle
+version = get_version_name(
+ gradle_file_path:"build.gradle",
+ ext_constant_name:"androidVersionName")
+version = version.delete "'"
+
+platform :android do |options|
+
+ desc "Run all the tests"
+ lane :test do |options|
+ gradle(task: "test")
+ end
+
+ desc "Deploy new version to Google Play and APK Store options: beta:false scheduled:false (default)"
+ lane :deploy do |options|
+ release_note_path_en = "metadata/android/en-US/changelogs/default.txt"
+
+ # use english-change-log for french language too
+ FileUtils.cp(release_note_path_en, "metadata/android/fr-FR/changelogs/default.txt")
+
+ deployToPlaystore(scheduled:options[:scheduled], beta:options[:beta])
+
+ if options[:beta]
+ puts "Skipping deployment to server cause there isn't currently a beta channel"
+
+ slack(
+ default_payloads: [], # reduce the notification to the minimum
+ message: ":rocket: Successfully deployed #{version} with code #{build} to the Play Store :cryptomator:",
+ payload: {
+ "Changes" => File.read(release_note_path_en)
+ }
+ )
+ else
+ deployToServer(scheduled:options[:scheduled], beta:options[:beta])
+
+ slack(
+ default_payloads: [], # reduce the notification to the minimum
+ message: ":rocket: Successfully deployed #{version} with code #{build} to the Play Store and APK store :cryptomator:",
+ payload: {
+ "Changes" => File.read(release_note_path_en)
+ }
+ )
+ end
+
+ end
+
+ desc "Deploy new version to Playstore"
+ private_lane :deployToPlaystore do |options|
+ deploy_target = "production"
+
+ if options[:beta]
+ deploy_target = "beta"
+ end
+
+ gradle(task: "clean")
+
+ gradle(
+ task: "assemble",
+ build_type: "Release",
+ flavor: "playstore",
+ print_command: false,
+ properties: {
+ "android.injected.signing.store.file" => ENV["SIGNING_KEYSOTRE_PATH"],
+ "android.injected.signing.store.password" => ENV["SIGNING_KEYSOTRE_PASSWORD"],
+ "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+ "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+ }
+ )
+
+ upload_to_play_store(
+ package_name: 'org.cryptomator',
+ track: deploy_target,
+ apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH],
+ mapping: lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH],
+ version_name: version,
+ version_code: build,
+ release_status: "draft",
+ json_key: ENV["GOOGLE_PLAYSTORE_PRIVATE_KEY_FILE_PATH"],
+ skip_upload_aab: true,
+ skip_upload_metadata: false,
+ skip_upload_images: true,
+ skip_upload_screenshots: true,
+ metadata_path: "fastlane/metadata/android"
+ )
+ end
+
+ desc "Deploy new version to server"
+ private_lane :deployToServer do |options|
+ gradle(task: "clean")
+
+ gradle(
+ task: "assemble",
+ build_type: "Release",
+ flavor: "apkstore",
+ print_command: false,
+ properties: {
+ "android.injected.signing.store.file" => ENV["SIGNING_KEYSOTRE_PATH"],
+ "android.injected.signing.store.password" => ENV["SIGNING_KEYSOTRE_PASSWORD"],
+ "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+ "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+ }
+ )
+
+ server_host = ENV["APK_STORE_BASIC_URL"]
+ server_relative_folder = "/mnt/data/android/"
+ base_url = "https://#{server_host}/android/"
+ apk_url = "#{base_url}#{version}/Cryptomator-#{version}.apk"
+ relative_apk_url = "#{server_relative_folder}#{version}/Cryptomator-#{version}.apk"
+ release_note_url = "#{base_url}#{version}/release-notes.html"
+ relative_release_note_url = "#{server_relative_folder}#{version}/release-notes.html"
+
+ claims = {
+ "version": version,
+ "url": apk_url,
+ "release_notes": release_note_url
+ }
+
+ private_key = OpenSSL::PKey.read(File.read(ENV["SIGNING_UPDATE_APK_STORE_KEY_PATH"]))
+ token = JWT.encode claims, private_key, "ES256"
+
+ latest_version_filename = "latest-version.json"
+ if options[:scheduled]
+ latest_version_filename = "latest-version-#{version}.json"
+ puts "Scheduled upload activated, uploading latest-version.json to #{latest_version_filename} with claims #{claims}"
+ else
+ puts "#{latest_version_filename} has claims #{claims}"
+ end
+
+ latest_version_jsn = File.new("latest_versions/#{latest_version_filename}","w")
+ latest_version_jsn.write(token)
+ latest_version_jsn.close
+ latest_version_jsn = File.open("latest_versions/#{latest_version_filename}","r")
+
+ release_note_path = "release_notes_apkstore_en.html"
+ release_note_file = File.open(release_note_path,"r")
+
+ puts latest_version_filename
+
+ Net::SFTP.start(
+ ENV["FTP_SERVER_URL"],
+ ENV["FTP_SERVER_USERNAME"],
+ :keys=>[ENV["FTP_SERVER_KEY_FILE"]],
+ keys_only: true,
+ verify_host_key: :never,
+ :port=>ENV["FTP_SERVER_PORT"]
+ ) do |sftp|
+ puts "Uploading files to server..."
+ sftp.mkdir! "#{server_relative_folder}#{version}"
+ sftp.upload!(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], relative_apk_url)
+ sftp.upload!(release_note_file, relative_release_note_url)
+ sftp.upload!(latest_version_jsn, "#{server_relative_folder}#{latest_version_filename}")
+ end
+
+ latest_version_jsn.close
+ release_note_file.close
+ end
+
+ after_all do |lane|
+ #error do |lane, exception|
+ # slack(
+ # message: exception.message,
+ # success:false
+ # )
+ end
+end
diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile
new file mode 100644
index 00000000..45823f1d
--- /dev/null
+++ b/fastlane/Pluginfile
@@ -0,0 +1,5 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-get_version_name'
diff --git a/fastlane/README.md b/fastlane/README.md
new file mode 100644
index 00000000..0302bf6f
--- /dev/null
+++ b/fastlane/README.md
@@ -0,0 +1,34 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew install fastlane`
+
+# Available Actions
+## Android
+### android test
+```
+fastlane android test
+```
+Run all the tests
+### android deploy
+```
+fastlane android deploy
+```
+Deploy new version to Google Play and APK Store options: beta:false scheduled:false (default)
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt
new file mode 100644
index 00000000..96332f4f
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -0,0 +1 @@
+- Foo
\ No newline at end of file
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
new file mode 100644
index 00000000..bebbf920
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -0,0 +1,39 @@
+Cryptomator macht Cloud-Speicher vertrauenswürdig. Die App verschlüsselt Dateien auf Ihrem Smartphone, bevor diese in die Cloud gelangen. Selbst im Falle eines unberechtigten Zugriffs auf Ihre Cloud (z.B. Hacker-Angriffe), sind Ihre Dateien durch die Verschlüsselung trotzdem sicher geschützt.
+
+EINFACHHEIT
+
+Bei der Entwicklung von Cryptomator steht die Benutzerfreundlichkeit im Fokus.
+
+• Erstellen Sie einen Tresor und vergeben Sie ein Passwort
+• Keine komplizierte Konfiguration und keine weiteren Accounts notwendig
+• Entsperren Sie Tresore mit Ihrem Fingerabdruck*
+
+* ab Android 6.0 and Smartphones mit Fingerabdruck-Sensor
+
+KOMPATIBILITÄT
+
+Cryptomator ist kompatibel mit den meistgenutzten Cloud-Speichern und verfügbar für alle gängigen Betriebssysteme.
+
+• Kompatibel mit Dropbox, Google Drive, OneDrive und WebDAV-basierten Cloudspeicher-Diensten
+• Erstellen Sie auch Tresore in Androids lokalem Speicher (funktioniert bspw. zusammen mit Sync-Apps von Drittanbietern)
+• Greifen Sie auf Ihre Tresore von allen Ihren mobilen Endgeräten und Computern zu
+
+SICHERHEIT
+
+Cryptomator für Android basiert auf dem bewährten Open-Source-Fundament Cryptomator für Desktop.
+
+• Verschlüsselung der Dateiinhalte und Dateinamen mit AES und 256-Bit-Schlüssellänge
+• Erhöhte Brute-Force-Resistenz des Tresor-Passworts durch Einsatz von scrypt
+• Tresore werden automatisch gesperrt, wenn die App in den Hintergrund geschickt wird
+• Verschlüsselungsimplementierung basiert auf der Open-Source-Bibliothek CryptoLib und ist öffentlich dokumentiert
+
+SENSATIONELLE VERSCHLÜSSELUNGSTECHNOLOGIEIMPLEMENTIERUNG
+
+Cryptomator wurde mit dem CeBIT Innovation Award 2016 for Usable Security and Privacy ausgezeichnet. Wir freuen uns, hunderttausenden Cryptomator-Nutzern Sicherheit und Privatsphärenschutz bieten zu können.
+
+CRYPTOMATOR COMMUNITY
+
+Treten Sie der Cryptomator Community bei und tauschen Sie sich mit Cryptomator-Nutzern aus: https://community.cryptomator.org
+
+• Folgen Sie uns auf Twitter @Cryptomator
+• Liken Sie uns auf Facebook /Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
new file mode 100644
index 00000000..591a40e1
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -0,0 +1 @@
+Nimm die Sicherung deiner Cloud-Daten selbst in die Hand
\ No newline at end of file
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
new file mode 100644
index 00000000..f9944b4a
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -0,0 +1 @@
+Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/de-DE/video.txt b/fastlane/metadata/android/de-DE/video.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
new file mode 100644
index 00000000..96332f4f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -0,0 +1 @@
+- Foo
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 00000000..eef1cf2d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,39 @@
+Cryptomator makes your cloud storage trustworthy. The app encrypts files on your mobile device before they are uploaded to your cloud. Even if a third party gained unauthorized access to your files (e.g., hacker attack), your files are secure from prying eyes.
+
+SIMPLICITY
+
+Cryptomator has been developed with a strong focus on user-friendliness.
+
+• Simply create a vault and assign a password
+• No additional account or configuration needed
+• Unlock vaults with your fingerprint*
+
+* from Android 6.0 and smartphones with fingerprint sensor
+
+COMPATIBILITY
+
+Cryptomator is compatible with the most commonly used cloud storages and available for all major operating systems.
+
+• Compatible with Dropbox, Google Drive, OneDrive, and WebDAV-based cloud storage services
+• Create vaults in Android’s local storage (e.g., works with third-party sync apps)
+• Access your vaults on all your mobile devices and computers
+
+SECURITY
+
+Cryptomator for Android is based on the solid open-source foundation of Cryptomator for Desktop.
+
+• File content and filename encryption with AES and 256 bit key length
+• Vault password is secured with scrypt for enhanced brute-force resistance
+• Vaults are automatically locked after sending app to background
+• Crypto implementation is based on the open-source library CryptoLib and is publicly documented
+
+GENERAL AWESOMENESS
+
+Cryptomator received the CeBIT Innovation Award 2016 for Usable Security and Privacy. We're proud to provide security and privacy for hundreds of thousands of Cryptomator users.
+
+CRYPTOMATOR COMMUNITY
+
+Join the Cryptomator Community and participate in the conversations with other Cryptomator users.
+
+• Follow us on Twitter @Cryptomator
+• Like us on Facebook /Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 00000000..7a0ae9a7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Put a lock on your cloud: Take the security of your data into your own hands
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 00000000..f9944b4a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/fastlane/metadata/android/fr-FR/changelogs/default.txt b/fastlane/metadata/android/fr-FR/changelogs/default.txt
new file mode 100644
index 00000000..96332f4f
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -0,0 +1 @@
+- Foo
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
new file mode 100644
index 00000000..3da0e77f
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -0,0 +1,39 @@
+Cryptomator rend votre stockage dans le cloud beaucoup plus sûr. L'application chiffre les fichiers sur votre appareil mobile avant qu'ils ne soient envoyés dans votre cloud. Même si une tierce partie obtient un accès non autorisé à vos fichiers (par exemple, une attaque de pirates informatiques), vos fichiers sont à l'abri des regards indiscrets.
+
+SIMPLICITÉ
+
+Cryptomator a été développé en mettant l'accent sur la convivialité.
+
+• Il suffit de créer un coffre-fort et d'y attribuer un mot de passe
+• Aucun compte ou configuration supplémentaire n'est nécessaire
+• Déverrouillez les coffres-forts avec votre empreinte digitale*.
+
+* à partir d'Android 6.0 et sur smartphones avec capteur biométrique d'empreintes digitales
+
+COMPATIBILITÉ
+
+Cryptomator est compatible avec les systèmes de stockage dans le cloud les plus couramment utilisés et disponible pour tous les principaux systèmes d'exploitation.
+
+• Compatible avec Dropbox, Google Drive, OneDrive et les services de stockage dans le nuage basés sur WebDAV
+• Créer des coffres-forts dans le stockage local d'Android (par exemple, fonctionne avec des applications de synchronisation tierces)
+• Accédez à vos coffres-forts sur tous vos appareils mobiles et ordinateurs
+
+SÉCURITÉ
+
+Cryptomator pour Android est basé sur le projet open-source de Cryptomator pour Ordinateur de bureau.
+
+• Chiffrement du contenu et des noms de fichiers via AES et une longueur de clé de 256 bits
+• Le mot de passe du coffre-fort est sécurisé par cryptage pour une meilleure résistance aux attaque par force brut
+• Les coffre-forts sont automatiquement verrouillées après la mise en arrière-plan de l'application
+• La mise en œuvre de Crypto est basée sur la bibliothèque open-source CryptoLib et est documentée publiquement
+
+UNE GÉNIALITUDE GÉNÉRAL
+
+Cryptomator a reçu le prix de l'innovation CeBIT 2016 pour la sécurité pratique et la confidentialité. Nous sommes fiers d'assurer la sécurité et la confidentialité des centaines de milliers d'utilisateurs du Cryptomator.
+
+LA COMMUNAUTÉ CRYPTOMATOR
+
+Rejoignez la communauté de Cryptomator et participez aux conversations avec les autres utilisateurs de Cryptomator: https://community.cryptomator.org
+
+- Suivez-nous sur Twitter @Cryptomator
+- Comme nous sur Facebook/Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
new file mode 100644
index 00000000..0a4252a1
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -0,0 +1 @@
+Verrouillé votre cloud: Prenez en mains la sécurité de vos données
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
new file mode 100644
index 00000000..f9944b4a
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/title.txt
@@ -0,0 +1 @@
+Cryptomator
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/video.txt b/fastlane/metadata/android/fr-FR/video.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/fastlane/release_notes_apkstore_en.html b/fastlane/release_notes_apkstore_en.html
new file mode 100644
index 00000000..8066f97b
--- /dev/null
+++ b/fastlane/release_notes_apkstore_en.html
@@ -0,0 +1,3 @@
+
\ No newline at end of file