Merge branch 'release/1.11.0'

Author: SailReal

Gemfile

@@ -4,6 +4,7 @@ gem "fastlane"
 gem "net-sftp"
 gem "ed25519"
 gem "bcrypt_pbkdf"
+gem 'fastlane-plugin-bundletool'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -118,6 +118,7 @@ GEM
  apktools (~> 0.7)
  aws-sdk-s3 (~> 1)
  mime-types (~> 3.3)
+ fastlane-plugin-bundletool (1.1.0)
  fastlane-plugin-get_version_name (0.2.2)
  fastlane-sirp (1.0.0)
  sysrandom (~> 1.0)
@@ -236,6 +237,7 @@ DEPENDENCIES
  ed25519
  fastlane
  fastlane-plugin-aws_s3
+ fastlane-plugin-bundletool
  fastlane-plugin-get_version_name
  net-sftp
 

README.md

@@ -1,6 +1,6 @@
 ![cryptomator-android](cryptomator-android.png)
 
-[![Twitter](https://img.shields.io/badge/twitter-@Cryptomator-blue.svg?style=flat)](http://twitter.com/Cryptomator)
+[![Mastodon](https://img.shields.io/mastodon/follow/176112?domain=mastodon.online&style=flat)](https://mastodon.online/@cryptomator)
 [![Community](https://img.shields.io/badge/help-Community-orange.svg)](https://community.cryptomator.org)
 [![Documentation](https://img.shields.io/badge/help-Docs-orange.svg)](https://docs.cryptomator.org)
 [![Crowdin](https://badges.crowdin.net/cryptomator/localized.svg)](https://translate.cryptomator.org/)

build.gradle

@@ -36,8 +36,8 @@ def getVersionCode = { ->
 allprojects {
 ext {
 androidApplicationId = 'org.cryptomator'
-androidVersionCode = 2971 // must be getVersionCode(). only at release tag set the actual value
-androidVersionName = '1.10.4'
+androidVersionCode = getVersionCode()
+androidVersionName = '1.11.0'
 }
 repositories {
 mavenCentral()

data/build.gradle

@@ -56,6 +56,10 @@ android {
 lite {
 dimension "version"
 }
+
+accrescent {
+dimension "version"
+}
 }
 
 sourceSets {
@@ -68,12 +72,16 @@ android {
 }
 
 fdroid {
-java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/fdroid/java/']
+java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/fdroidAccrescent/java/']
 }
 
 lite {
 java.srcDirs = ['src/main/java/', 'src/lite/java/']
 }
+
+accrescent {
+java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/fdroidAccrescent/java/']
+}
 }
 packagingOptions {
 resources {
@@ -106,6 +114,7 @@ dependencies {
 playstoreImplementation dependencies.pcloud
 apkstoreImplementation dependencies.pcloud
 fdroidImplementation dependencies.pcloud
+accrescentImplementation dependencies.pcloud
 
 coreLibraryDesugaring dependencies.coreDesugaring
 
@@ -127,14 +136,18 @@ dependencies {
 apkstoreImplementation dependencies.dropboxAndroid
 fdroidImplementation dependencies.dropboxCore
 fdroidImplementation dependencies.dropboxAndroid
+accrescentImplementation dependencies.dropboxCore
+accrescentImplementation dependencies.dropboxAndroid
 
 
 playstoreImplementation dependencies.msgraphAuth
 apkstoreImplementation dependencies.msgraphAuth
 fdroidImplementation dependencies.msgraphAuth
+accrescentImplementation dependencies.msgraphAuth
 playstoreImplementation dependencies.msgraph
 apkstoreImplementation dependencies.msgraph
 fdroidImplementation dependencies.msgraph
+accrescentImplementation dependencies.msgraph
 
 implementation dependencies.stax
 api dependencies.minIo

data/src/fdroid/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java renamed to data/src/fdroidAccrescent/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java

@@ -38,6 +38,7 @@ platform :android do |options|
  deployToServer(alpha:options[:alpha], beta:options[:beta])
  deployToFDroid(alpha:options[:alpha], beta:options[:beta])
  deployLite(alpha:options[:alpha], beta:options[:beta])
+ deployToAccrescent(alpha:options[:alpha], beta:options[:beta])
  createGitHubDraftRelease(alpha:options[:alpha], beta:options[:beta])
 
  slack(
@@ -292,6 +293,41 @@ platform :android do |options|
  FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_fdroid_signed.apk")
  end
 
+ desc "Deploy new version to Accrescent"
+ private_lane :deployToAccrescent do |options|
+ gradle(task: "clean")
+
+ gradle(
+ task: "bundle",
+ build_type: "Release",
+ flavor: "accrescent",
+ print_command: false,
+ properties: {
+ "android.injected.signing.store.file" => ENV["SIGNING_KEYSTORE_PATH"],
+ "android.injected.signing.store.password" => ENV["SIGNING_KEYSTORE_PASSWORD"],
+ "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+ "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+ }
+ )
+
+ FileUtils.cp(lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH], "release/Cryptomator-#{version}_signed.aab")
+
+ bundletool(
+ ks_path: ENV["SIGNING_KEYSTORE_PATH"],
+ ks_password: ENV["SIGNING_KEYSTORE_PASSWORD"],
+ ks_key_alias: ENV["SIGNING_KEY_ALIAS"],
+ ks_key_alias_password: ENV["SIGNING_KEY_PASSWORD"],
+ bundletool_version: '1.10.0',
+ aab_path: lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH],
+ apk_output_path: "fastlane/release/Cryptomator-#{version}_signed.apks",
+ verbose: true,
+ cache_path: "~/.cache/bundletool",
+ universal_apk: false
+ )
+
+ puts "Upload fastlane/release/Cryptomator-#{version}_signed.apks to Accrescent"
+ end
+
  desc "Deploy new lite version"
  private_lane :deployLite do |options|
  sh("docker build -t cryptomator-android ../buildsystem")

fastlane/Fastfile

@@ -104,6 +104,10 @@ android {
 applicationIdSuffix ".lite"
 resValue "string", "app_id", androidApplicationId + applicationIdSuffix
 }
+
+accrescent {
+dimension "version"
+}
 }
 
 sourceSets {
@@ -116,11 +120,15 @@ android {
 }
 
 fdroid {
-java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/fdroid/java/', 'src/fdroidAndLite/java/']
+java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/fdroid/java/', 'src/fdroidLiteAccrescent/java/']
 }
 
 lite {
-java.srcDirs = ['src/main/java/', 'src/lite/java/', 'src/fdroidAndLite/java/']
+java.srcDirs = ['src/main/java/', 'src/lite/java/', 'src/fdroidLiteAccrescent/java/']
+}
+
+accrescent {
+java.srcDirs = ['src/main/java/', 'src/apiKey/java/', 'src/accrescent/java/', 'src/fdroidLiteAccrescent/java/']
 }
 }
 
@@ -184,13 +192,17 @@ dependencies {
 apkstoreImplementation dependencies.dropboxAndroid
 fdroidImplementation dependencies.dropboxCore
 fdroidImplementation dependencies.dropboxAndroid
+accrescentImplementation dependencies.dropboxCore
+accrescentImplementation dependencies.dropboxAndroid
 
 playstoreImplementation dependencies.msgraphAuth
 apkstoreImplementation dependencies.msgraphAuth
 fdroidImplementation dependencies.msgraphAuth
+accrescentImplementation dependencies.msgraphAuth
 playstoreImplementation dependencies.msgraph
 apkstoreImplementation dependencies.msgraph
 fdroidImplementation dependencies.msgraph
+accrescentImplementation dependencies.msgraph
 
 playstoreImplementation(dependencies.googleApiServicesDrive) {
 exclude module: 'guava-jdk5'

presentation/build.gradle

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+<!-- Keep in sync with apkstore, playstore and fdroid -->
+<application>
+<activity
+android:name="com.dropbox.core.android.AuthActivity"
+android:configChanges="orientation|keyboard"
+android:exported="true"
+android:launchMode="singleTask">
+<intent-filter>
+<data android:scheme="db-${DROPBOX_API_KEY}" />
+
+<action android:name="android.intent.action.VIEW" />
+
+<category android:name="android.intent.category.BROWSABLE" />
+<category android:name="android.intent.category.DEFAULT" />
+</intent-filter>
+</activity>
+
+<activity
+android:name="com.microsoft.identity.client.BrowserTabActivity"
+android:exported="true">
+<intent-filter>
+<action android:name="android.intent.action.VIEW" />
+
+<category android:name="android.intent.category.DEFAULT" />
+<category android:name="android.intent.category.BROWSABLE" />
+
+<data
+android:host="org.cryptomator"
+android:path="/${ONEDRIVE_API_KEY_DECODED}"
+android:scheme="msauth" />
+</intent-filter>
+</activity>
+
+</application>
+
+</manifest>