AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Julian Raufelder 2021-11-16 13:12:22 +01:00
commit d5486463a8
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -39,7 +39,7 @@ allprojects {
ext { ext {
androidApplicationId = 'org.cryptomator' androidApplicationId = 'org.cryptomator'
androidVersionCode = getVersionCode() androidVersionCode = getVersionCode()
androidVersionName = '1.6.4' androidVersionName = '1.7.0-SNAPSHOT'
} }
repositories { repositories {
mavenCentral() mavenCentral()

7
presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
View File

@ -12,7 +12,6 @@ import androidx.multidex.MultiDexApplication
import org.cryptomator.data.cloud.crypto.Cryptors import org.cryptomator.data.cloud.crypto.Cryptors
import org.cryptomator.data.cloud.crypto.CryptorsModule import org.cryptomator.data.cloud.crypto.CryptorsModule
import org.cryptomator.data.repository.RepositoryModule import org.cryptomator.data.repository.RepositoryModule
import org.cryptomator.domain.Vault
import org.cryptomator.presentation.di.HasComponent import org.cryptomator.presentation.di.HasComponent
import org.cryptomator.presentation.di.component.ApplicationComponent import org.cryptomator.presentation.di.component.ApplicationComponent
import org.cryptomator.presentation.di.component.DaggerApplicationComponent import org.cryptomator.presentation.di.component.DaggerApplicationComponent
@ -124,7 +123,11 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
fun startAutoUpload() { fun startAutoUpload() {
val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext()) val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext())
if (checkToStartAutoImageUpload(sharedPreferencesHandler)) { if (checkToStartAutoImageUpload(sharedPreferencesHandler)) {
val vault: Vault? = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault()) val vault = try {
applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault())
} catch (e: NullPointerException) {
null
}
if (vault?.isUnlocked == true) { if (vault?.isUnlocked == true) {
val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault) val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
applicationContext().startService(AutoUploadService.startAutoUploadIntent(applicationContext(), cloud)) applicationContext().startService(AutoUploadService.startAutoUploadIntent(applicationContext(), cloud))