Merge branch 'release/1.10.0'

README.md

@@ -12,7 +12,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. [Using Cryptomator's F-Droid Repository](https://cryptomator.org/android/)
-4. Building from source using Gradle (instructions below)
+4. [Using F-Droid's Main Repository](https://f-droid.org/en/packages/org.cryptomator.lite)
+5. Building from source using Gradle (instructions below)
 
 ## Building
 

build.gradle

@@ -38,8 +38,8 @@ def getVersionCode = { ->
 allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
-		androidVersionCode = 2807 // must be getVersionCode(). only at release tag set the actual value
-		androidVersionName = '1.9.1'
+		androidVersionCode = 2824 // must be getVersionCode(). only at release tag set the actual value
+		androidVersionName = '1.10.0'
 	}
 	repositories {
 		mavenCentral()

fastlane/release-notes-de.txt

@@ -1,2 +1,4 @@
-- Weitere Anpassungen zur Integration in das F-Droid Haupt-Repository
+- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
+- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
+- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
 - Übersetzungen aktualisiert

fastlane/release-notes-en.txt

@@ -1,2 +1,4 @@
-- Further customizations for integration into the F-Droid main repository
+- Add workaround for editing files in Microsoft Office apps
+- Add support for themed Cryptomator icon
+- Refresh stale authentication token during auto upload
 - Update translations

fastlane/release-notes.html

@@ -1,4 +1,6 @@
 <ul>
-  <li>Further customizations for integration into the F-Droid main repository</li>
+  <li>Add workaround for editing files in Microsoft Office apps</li>
+  <li>Add support for themed Cryptomator icon</li>
+  <li>Refresh stale authentication token during auto upload</li>
   <li>Update translations</li>
 </ul>

presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>

presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>

presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>

presentation/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
 	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 	<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
 
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
 	<uses-permission
 		android:name="android.permission.GET_ACCOUNTS"
@@ -92,6 +92,9 @@
 			android:exported="false"
 			android:theme="@style/TransparentPopUp" />
 
+		<activity
+			android:name=".ui.activity.AutoUploadRefreshTokenActivity"
+			android:exported="false" />
 		<!-- Settings -->
 		<activity
 			android:name=".ui.activity.AutoUploadChooseVaultActivity"

presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Build
 import android.os.IBinder
+import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDexApplication
 import org.cryptomator.data.cloud.crypto.Cryptors
@@ -70,6 +71,11 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 		AppCompatDelegate.setDefaultNightMode(SharedPreferencesHandler(applicationContext()).screenStyleMode)
 		cleanupCache()
 
+		if (SharedPreferencesHandler(applicationContext()).microsoftWorkaround()) {
+			val builder: StrictMode.VmPolicy.Builder = StrictMode.VmPolicy.Builder()
+			StrictMode.setVmPolicy(builder.build())
+		}
+
 		RxJavaPlugins.setErrorHandler { e: Throwable? -> Timber.tag("CryptomatorApp").e(e, "BaseErrorHandler detected a problem") }
 	}
 

presentation/src/main/java/org/cryptomator/presentation/di/component/ActivityComponent.java

@@ -7,6 +7,7 @@
 import org.cryptomator.presentation.ui.activity.AuthenticateCloudActivity;
 import org.cryptomator.presentation.ui.activity.AuthenticatePCloudActivity;
 import org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity;
+import org.cryptomator.presentation.ui.activity.AutoUploadRefreshTokenActivity;
 import org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity;
 import org.cryptomator.presentation.ui.activity.BrowseFilesActivity;
 import org.cryptomator.presentation.ui.activity.ChooseCloudServiceActivity;
@@ -112,6 +113,8 @@ public interface ActivityComponent {
 
 	void inject(AutoUploadChooseVaultFragment autoUploadChooseVaultFragment);
 
+	void inject(AutoUploadRefreshTokenActivity autoUploadRefreshTokenActivity);
+
 	void inject(LicenseCheckActivity licenseCheckActivity);
 
 	void inject(UnlockVaultActivity unlockVaultActivity);

presentation/src/main/java/org/cryptomator/presentation/presenter/AutoUploadRefreshTokenPresenter.kt

@@ -0,0 +1,36 @@
+package org.cryptomator.presentation.presenter
+
+import org.cryptomator.domain.Cloud
+import org.cryptomator.domain.di.PerView
+import org.cryptomator.domain.exception.authentication.AuthenticationException
+import org.cryptomator.generator.Callback
+import org.cryptomator.presentation.CryptomatorApp
+import org.cryptomator.presentation.exception.ExceptionHandlers
+import org.cryptomator.presentation.ui.activity.view.AutoUploadRefreshTokenView
+import org.cryptomator.presentation.workflow.ActivityResult
+import org.cryptomator.presentation.workflow.AuthenticationExceptionHandler
+import javax.inject.Inject
+
+@PerView
+class AutoUploadRefreshTokenPresenter @Inject constructor(
+	exceptionHandlers: ExceptionHandlers,  //
+	private val authenticationExceptionHandler: AuthenticationExceptionHandler,  //
+) : Presenter<AutoUploadRefreshTokenView>(exceptionHandlers) {
+
+	fun refreshCloudToken(authenticationException: AuthenticationException) {
+		authenticationExceptionHandler.handleAuthenticationException( //
+			this@AutoUploadRefreshTokenPresenter,  //
+			authenticationException,  //
+			ActivityResultCallbacks.onAutoUploadCloudAuthenticated(authenticationException.cloud)
+		)
+	}
+
+	@Callback(dispatchResultOkOnly = false)
+	fun onAutoUploadCloudAuthenticated(result: ActivityResult, cloud: Cloud) {
+		if (result.isResultOk) {
+			val cryptomatorApp = activity().application as CryptomatorApp
+			cryptomatorApp.startAutoUpload(cloud)
+		}
+		finish()
+	}
+}