Merge branch 'develop'

.gitignore

@@ -45,3 +45,7 @@ local.properties
 **/fastlane/.env
 **/fastlane/metadata/**/images/**
 **/fastlane/report.xml
+
+# fdroid
+**/fastlane/repo/**
+**/fastlane/tmp/**

Gemfile.lock

@@ -9,16 +9,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.1.1)
-    aws-partitions (1.437.0)
-    aws-sdk-core (3.113.1)
+    aws-partitions (1.444.0)
+    aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.0)
+    aws-sdk-s3 (1.93.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -32,15 +32,14 @@ GEM
     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.2)
-    excon (0.79.0)
+    excon (0.80.0)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
@@ -52,7 +51,7 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.3)
-    fastlane (2.179.0)
+    fastlane (2.180.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       artifactory (~> 3.0)
@@ -90,7 +89,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-aws_s3 (1.8.0)
+    fastlane-plugin-aws_s3 (2.0.2)
       apktools (~> 0.7)
       aws-sdk-s3 (~> 1)
       mime-types (~> 3.3)
@@ -114,7 +113,7 @@ GEM
       rexml
       signet (~> 0.14)
       webrick
-    google-apis-iamcredentials_v1 (0.2.0)
+    google-apis-iamcredentials_v1 (0.3.0)
       google-apis-core (~> 0.1)
     google-apis-storage_v1 (0.3.0)
       google-apis-core (~> 0.1)
@@ -132,7 +131,7 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.16.0)
+    googleauth (0.16.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -149,9 +148,9 @@ GEM
     memoist (0.16.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
-    mini_mime (1.0.3)
+    mini_mime (1.1.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
@@ -163,12 +162,12 @@ GEM
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.3)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rouge (2.0.7)
     ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
@@ -185,6 +184,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)

README.md

@@ -11,7 +11,8 @@ Cryptomator for Android is currently available in the following  distribution ch
 
 1. [Using Google Play](https://play.google.com/store/apps/details?id=org.cryptomator)
 2. [Using Cryptomator's Website](https://cryptomator.org/android/)
-3. Building from source using Gradle (instructions below)
+3. [Using Cryptomator's F-Droid Repository](https://cryptomator.org/android/)
+4. Building from source using Gradle (instructions below)
 
 ## Building
 
@@ -79,6 +80,7 @@ There are further targets and options like `beta`, see [fastlane/README.md](http
 1. Make sure you copied `.default.env` to `.env` in the `fastlane` folder and filled out those variables.
 1. Install Ruby (depends on OS, Ubuntu): `sudo apt install ruby-dev`
 1. Install fastlane (depends on OS, Ubuntu): `gem install fastlane -N`
+1. Install `fdroidserver` using `apt`, `pacman`, ..., see https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/
 
 ## License
 

build.gradle

@@ -42,7 +42,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.5.14'
+		androidVersionName = '1.5.15'
 	}
 	repositories {
 		mavenCentral()

buildsystem/dependencies.gradle

@@ -26,7 +26,7 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'
 
-	daggerVersion = '2.34'
+	daggerVersion = '2.34.1'
 
 	gsonVersion = '2.8.6'
 
@@ -37,7 +37,7 @@ ext {
 
 	timberVersion = '4.7.1'
 
-	zxcvbnVersion = '1.4.0'
+	zxcvbnVersion = '1.4.1'
 
 	scaleImageViewVersion = '3.10.0'
 
@@ -58,7 +58,6 @@ ext {
 	googleClientVersion = '1.31.4'
 
 	msgraphVersion = '2.10.0'
-	msaAuthVersion = '0.10.0'
 
 	commonsCodecVersion = '1.15'
 
@@ -126,7 +125,6 @@ ext {
 			junit4                : "org.junit.jupiter:junit-jupiter:${jUnit4Version}",
 			junit4Engine          : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}",
 			msgraph               : "com.microsoft.graph:microsoft-graph:${msgraphVersion}",
-			msaAuth               : "com.microsoft.graph:msa-auth-for-android-adapter:${msaAuthVersion}",
 			mockito               : "org.mockito:mockito-core:${mockitoVersion}",
 			mockitoInline         : "org.mockito:mockito-inline:${mockitoInlineVersion}",
 			multidex              : "androidx.multidex:multidex:${multidexVersion}",

fastlane/.default.env

@@ -20,4 +20,4 @@ S3_SECRET_ACCESS_KEY=
 
 SLACK_URL=
 
-GITHUB_TOKEN=
+GITHUB_PERSONAL_ACCESS_TOKEN=

fastlane/Fastfile

@@ -32,7 +32,7 @@ platform :android do |options|
 
     slack(
       default_payloads: [], # reduce the notification to the minimum
-      message: ":rocket: Successfully deployed #{version} with code #{build} to the Play Store :cryptomator:",
+      message: ":rocket: Successfully deployed #{version} with code #{build} :cryptomator:",
       payload: {
         "Changes" => File.read(release_note_path_en)
       }
@@ -176,7 +176,27 @@ platform :android do |options|
         "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
       }
     )
-
+
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "repo/Cryptomator.apk")
+
+    sh("cp -r metadata/android/ metadata/org.cryptomator/")
+    FileUtils.cp("metadata/org.cryptomator/en-US/changelogs/default.txt", "metadata/org.cryptomator/en-US/changelogs/#{version}.txt")
+    FileUtils.cp("metadata/org.cryptomator/de-DE/changelogs/default.txt", "metadata/org.cryptomator/de-DE/changelogs/#{version}.txt")
+    sh("fdroid update && fdroid rewritemeta")
+    sh("rm -r metadata/org.cryptomator/")
+
+    aws_s3(
+        bucket: ENV['S3_BUCKET'],
+        endpoint: ENV['S3_ENDPOINT'],
+        region: ENV['S3_REGION'],
+        access_key: ENV['S3_ACCESS_KEY'],
+        secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
+        path: "android/fdroid",
+        folder: "fastlane/repo",
+        skip_html_upload: true,
+        apk: ''
+      )
+
     FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_fdroid_signed.apk")
   end