Merge branch 'develop' into feature/thumbnail-playground

Author: JustFanta01

.github/CONTRIBUTING.md

@@ -1,15 +1,26 @@
-# Contributing to Cryptomator
+# Contributing to Cryptomator for Android
 
 ## Did you find a bug?
 
-- Ensure you're running the latest version of Cryptomator.
-- Ensure the bug is related to the Android version of Cryptomator. Bugs concerning the Cryptomator desktop application and iOS app can be reported on the [Cryptomator issues list](https://github.com/cryptomator/cryptomator/issues) and [Cryptomator for iOS issues list](https://github.com/cryptomator/cryptomator-ios/issues) respectively.
-- Ensure the bug was not [already reported](https://github.com/cryptomator/android/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
-- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/android/issues/new).
+- Ensure the bug was not [already reported](https://github.com/cryptomator/android/issues?q=).
+- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/android/issues/new/choose).
+
+## Did you write a patch that fixes a bug?
+
+- Open a new pull request with the patch.
+- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+## Do you intend to add a new feature or change an existing one?
+
+- Suggest your change by [submitting a new issue](https://github.com/cryptomator/android/issues/new/choose) and start writing code.
+
+## Do you intend to add a new translation or change an existing one?
+
+Translations are not managed directly in this repository. Instead, we use [Crowdin](https://translate.cryptomator.org/), which automatically synchronizes translations with this repository. If you want to help us with translations, please visit our translation project on Crowdin.
 
 ## Code of Conduct
 
-Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/android/blob/develop/.github/CODE_OF_CONDUCT.md).
+Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](CODE_OF_CONDUCT.md).
 
 ## Above all, thank you for your contributions
 

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/[email protected]?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/)
@@ -13,7 +13,8 @@ Cryptomator for Android is currently available in the following  distribution ch
 2. [Using Cryptomator's Website](https://cryptomator.org/android/)
 3. [Using Cryptomator's F-Droid Repository](https://cryptomator.org/android/)
 4. [Using F-Droid's Main Repository](https://f-droid.org/en/packages/org.cryptomator.lite)
-5. Building from source using Gradle (instructions below)
+5. [Using Accrescent](https://accrescent.app/app/org.cryptomator)
+6. Building from source using Gradle (instructions below)
 
 ## Building
 

build.gradle

@@ -37,7 +37,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode() // must be getVersionCode(). only at release tag set the actual value
-		androidVersionName = '1.11.0-SNAPSHOT'
+		androidVersionName = '1.12.0-SNAPSHOT'
 	}
 	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

@@ -58,6 +58,7 @@ private Interceptor httpLoggingInterceptor(Context context) {
 	public String getVaultKeyJwe(UnverifiedHubVaultConfig unverifiedHubVaultConfig, String accessToken) throws BackendException {
 		var request = new Request.Builder().get() //
 				.header("Authorization", "Bearer " + accessToken) //
+				.header("Hub-Device-ID", getHubDeviceCryptor().getDeviceId()) //
 				.url(unverifiedHubVaultConfig.getApiBaseUrl() + "vaults/" + unverifiedHubVaultConfig.vaultId() + "/access-token") //
 				.build();
 		try (var response = getHttpClient().newCall(request).execute()) {

data/src/main/java/org/cryptomator/data/repository/HubRepositoryImpl.java

@@ -0,0 +1,7 @@
+package org.cryptomator.domain.exception;
+
+public class IllegalFileNameException extends BackendException {
+
+	public IllegalFileNameException() {
+	}
+}

domain/src/main/java/org/cryptomator/domain/exception/IllegalFileNameException.java

@@ -0,0 +1,46 @@
+package org.cryptomator.domain.usecases;
+
+import android.content.Context;
+import android.net.Uri;
+
+import org.cryptomator.domain.exception.BackendException;
+import org.cryptomator.domain.exception.FatalBackendException;
+import org.cryptomator.generator.Parameter;
+import org.cryptomator.generator.UseCase;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+@UseCase
+public class CalculateFileHash {
+
+	private final Context context;
+	private final Uri uri;
+
+	CalculateFileHash(final Context context, @Parameter Uri uri) {
+		this.context = context;
+		this.uri = uri;
+	}
+
+	public byte[] execute() throws BackendException, FileNotFoundException {
+		try {
+			MessageDigest digest = MessageDigest.getInstance("MD5");
+			try (InputStream inputStream = context.getContentResolver().openInputStream(uri); //
+				 DigestInputStream dis = new DigestInputStream(inputStream, digest)) {
+				byte[] buffer = new byte[4096];
+				while (dis.read(buffer) != -1) {
+				}
+				return digest.digest();
+			} catch (IOException e) {
+				throw new FatalBackendException(e);
+			}
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+}

domain/src/main/java/org/cryptomator/domain/usecases/CalculateFileHash.java

@@ -0,0 +1,104 @@
+package org.cryptomator.domain.usecases;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.provider.DocumentsContract;
+
+import org.cryptomator.domain.CloudFile;
+import org.cryptomator.domain.exception.BackendException;
+import org.cryptomator.domain.exception.FatalBackendException;
+import org.cryptomator.domain.exception.IllegalFileNameException;
+import org.cryptomator.domain.exception.NoSuchCloudFileException;
+import org.cryptomator.generator.Parameter;
+import org.cryptomator.generator.UseCase;
+import org.cryptomator.util.file.MimeType;
+import org.cryptomator.util.file.MimeTypes;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+@UseCase
+public class PrepareDownloadFiles {
+
+	private final Context context;
+	private final MimeTypes mimeTypes;
+	private final List<CloudFile> filesToExport;
+	private final Uri parentUri;
+	private final ContentResolver contentResolver;
+	private final CloudNodeRecursiveListing cloudNodeRecursiveListing;
+
+	private List<DownloadFile> downloadFiles = new ArrayList<>();
+
+	PrepareDownloadFiles(Context context, MimeTypes mimeTypes, @Parameter List<CloudFile> filesToExport, @Parameter Uri parentUri, @Parameter CloudNodeRecursiveListing cloudNodeRecursiveListing) {
+		this.context = context;
+		this.mimeTypes = mimeTypes;
+		this.filesToExport = filesToExport;
+		this.parentUri = parentUri;
+		this.contentResolver = context.getContentResolver();
+		this.cloudNodeRecursiveListing = cloudNodeRecursiveListing;
+	}
+
+	List<DownloadFile> execute() throws BackendException, FileNotFoundException {
+		downloadFiles = prepareFilesForExport(filesToExport, parentUri);
+		for (CloudFolderRecursiveListing folderRecursiveListing : cloudNodeRecursiveListing.getFoldersContent()) {
+			prepareFolderContentForExport(folderRecursiveListing, parentUri);
+		}
+		return downloadFiles;
+	}
+
+	private List<DownloadFile> prepareFilesForExport(List<CloudFile> filesToExport, Uri parentUri) throws NoSuchCloudFileException, FileNotFoundException, IllegalFileNameException {
+		List<DownloadFile> downloadFiles = new ArrayList<>();
+		for (CloudFile cloudFile : filesToExport) {
+			DownloadFile downloadFile = createDownloadFile(cloudFile, parentUri);
+			downloadFiles.add(downloadFile);
+		}
+		return downloadFiles;
+	}
+
+	private void prepareFolderContentForExport(CloudFolderRecursiveListing folderRecursiveListing, Uri parentUri) throws FileNotFoundException, NoSuchCloudFileException, IllegalFileNameException {
+		Uri createdFolder = createFolder(parentUri, folderRecursiveListing.getParent().getName());
+		if (createdFolder != null) {
+			downloadFiles.addAll(prepareFilesForExport(folderRecursiveListing.getFiles(), createdFolder));
+			for (CloudFolderRecursiveListing childFolder : folderRecursiveListing.getFolders()) {
+				prepareFolderContentForExport(childFolder, createdFolder);
+			}
+		} else {
+			throw new FatalBackendException("Failed to create parent folder for export");
+		}
+	}
+
+	private Uri createFolder(Uri parentUri, String folderName) throws NoSuchCloudFileException {
+		try {
+			return DocumentsContract.createDocument(contentResolver, parentUri, DocumentsContract.Document.MIME_TYPE_DIR, folderName);
+		} catch (FileNotFoundException e) {
+			throw new NoSuchCloudFileException("Creating folder failed");
+		}
+	}
+
+	private DownloadFile createDownloadFile(CloudFile file, Uri documentUri) throws NoSuchCloudFileException, IllegalFileNameException {
+		try {
+			return new DownloadFile.Builder().setDownloadFile(file).setDataSink(contentResolver.openOutputStream(createNewDocumentUri(documentUri, file.getName()))).build();
+		} catch (FileNotFoundException e) {
+			throw new NoSuchCloudFileException(file.getName());
+		}
+	}
+
+	private Uri createNewDocumentUri(Uri parentUri, String fileName) throws IllegalFileNameException, NoSuchCloudFileException {
+		MimeType mimeType = mimeTypes.fromFilename(fileName);
+		if (mimeType == null) {
+			mimeType = MimeType.APPLICATION_OCTET_STREAM;
+		}
+		try {
+			Uri documentUri = DocumentsContract.createDocument(context.getContentResolver(), parentUri, mimeType.toString(), fileName);
+			if (documentUri == null) {
+				throw new IllegalFileNameException();
+			}
+			return documentUri;
+		} catch (FileNotFoundException e) {
+			throw new NoSuchCloudFileException(fileName);
+		}
+	}
+
+}

domain/src/main/java/org/cryptomator/domain/usecases/PrepareDownloadFiles.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

@@ -1 +1,2 @@
-- Hub-Unterstützung hinzugefügt
+- Cryptomator Hub erhält nun die Geräte-ID während der Tresorschlüsselabfrage
+- Potenzieller Absturz beim Öffnen großer Dateien und Exportieren großer Ordner behoben

fastlane/release-notes-de.txt

@@ -1 +1,2 @@
-- Add Hub support
+- Cryptomator Hub now receives the Device ID during vault key retrieval
+- Fixed potential crash when handling large files and exporting large folders

fastlane/release-notes-en.txt

@@ -1,3 +1,4 @@
 <ul>
-  <li>Add Hub support</li>
+  <li>Cryptomator Hub now receives the Device ID during vault key retrieval</li>
+  <li>Fixed potential crash when handling large files and exporting large folders</li>
 </ul>