diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1ed39b2bf..7928f60d5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -11,6 +11,40 @@
+
+
+
+
@@ -186,4 +220,4 @@
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 94c3e122d..e8d6b2b21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ def liteFlavor() {
}
def getApiKeyLocal(key) {
- if(!rootProject.file("local.properties").exists()) {
+ if (!rootProject.file("local.properties").exists()) {
return ""
}
def localPropertyList = new Properties()
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
index 101330e58..090f12dc1 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
@@ -28,7 +28,7 @@ import java.io.File
import java.io.IOException
import java.io.OutputStream
-internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, context: Context) : InterceptingCloudContentRepository(Intercepted(cloud, context)){
+internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, context: Context) : InterceptingCloudContentRepository(Intercepted(cloud, context)) {
@Throws(BackendException::class)
override fun throwWrappedIfRequired(e: Exception) {
@@ -164,13 +164,12 @@ internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, co
}
}
- private fun mapToNoSuchCloudFileExceptionIfMatches(e: Exception, file: DropboxFile) : NoSuchCloudFileException? {
+ private fun mapToNoSuchCloudFileExceptionIfMatches(e: Exception, file: DropboxFile): NoSuchCloudFileException? {
if (ExceptionUtil.contains(e, GetMetadataErrorException::class.java)) {
if (ExceptionUtil.extract(e, GetMetadataErrorException::class.java).get().errorValue.pathValue.isNotFound) {
return NoSuchCloudFileException(file.name)
}
- }
- else if (ExceptionUtil.contains(e, DownloadErrorException::class.java)) {
+ } else if (ExceptionUtil.contains(e, DownloadErrorException::class.java)) {
if (ExceptionUtil.extract(e, DownloadErrorException::class.java).get().errorValue.pathValue.isNotFound) {
return NoSuchCloudFileException(file.name)
}
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
index 6db5fbc7d..c2abd0f69 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.dropbox;
-import static org.cryptomator.domain.CloudType.DROPBOX;
-
import android.content.Context;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static org.cryptomator.domain.CloudType.DROPBOX;
+
@Singleton
public class DropboxCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
index ee4a310b6..dffa87f3f 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
@@ -24,8 +24,8 @@ import java.io.OutputStream
import java.net.SocketTimeoutException
import okhttp3.Request
-internal class OnedriveCloudContentRepository(private val cloud: OnedriveCloud, graphServiceClient: GraphServiceClient, context: Context)
- : InterceptingCloudContentRepository(Intercepted(cloud, graphServiceClient, context)) {
+internal class OnedriveCloudContentRepository(private val cloud: OnedriveCloud, graphServiceClient: GraphServiceClient, context: Context) :
+ InterceptingCloudContentRepository(Intercepted(cloud, graphServiceClient, context)) {
@Throws(BackendException::class)
override fun throwWrappedIfRequired(e: Exception) {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
index 202111855..148d4d646 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.onedrive;
-import static org.cryptomator.domain.CloudType.ONEDRIVE;
-
import android.content.Context;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static org.cryptomator.domain.CloudType.ONEDRIVE;
+
@Singleton
public class OnedriveCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
index 087554301..574749810 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
@@ -8,5 +8,5 @@ interface OnedriveNode : CloudNode {
override val name: String
override val path: String
override val parent: OnedriveFolder?
-
+
}
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
index 11a9407ee..a2e6deebc 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.pcloud
-import java.util.HashSet
-
object PCloudApiError {
@JvmField
@@ -14,6 +12,7 @@ object PCloudApiError {
PCloudApiErrorCodes.INVALID_FILE_OR_FOLDER_NAME.value //
)
)
+
@JvmField
val ignoreMoveSet = HashSet( //
listOf( //
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
index 27a3cef11..d3ddc1427 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
@@ -19,7 +19,8 @@ import java.io.File
import java.io.IOException
import java.io.OutputStream
-internal class PCloudContentRepository(private val cloud: PCloud, client: ApiClient, context: Context) : InterceptingCloudContentRepository(Intercepted(cloud, client, context)) {
+internal class PCloudContentRepository(private val cloud: PCloud, client: ApiClient, context: Context) :
+ InterceptingCloudContentRepository(Intercepted(cloud, client, context)) {
@Throws(BackendException::class)
override fun throwWrappedIfRequired(e: Exception) {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
index 61ab2ca9c..ad64e0653 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.pcloud;
-import static org.cryptomator.domain.CloudType.PCLOUD;
-
import android.content.Context;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static org.cryptomator.domain.CloudType.PCLOUD;
+
@Singleton
public class PCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
index 4e7a72847..918d4dfb2 100644
--- a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
+++ b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud;
-import static java.util.Arrays.asList;
-
import org.cryptomator.data.cloud.crypto.CryptoCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.dropbox.DropboxCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.googledrive.GoogleDriveCloudContentRepositoryFactory;
@@ -18,6 +16,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static java.util.Arrays.asList;
+
@Singleton
public class CloudContentRepositoryFactories implements Iterable {
diff --git a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
index 77d426594..75c06090d 100644
--- a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
+++ b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
@@ -98,7 +98,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
folder?.let {
if (GoogleDriveCloudNodeFactory.isFolder(it)) {
return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, it))
- } else if(GoogleDriveCloudNodeFactory.isShortcutFolder(it)) {
+ } else if (GoogleDriveCloudNodeFactory.isShortcutFolder(it)) {
return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, name, path, it.shortcutDetails.targetId))
}
}
diff --git a/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java b/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
index 748dea6ed..b058c305b 100644
--- a/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
+++ b/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
@@ -20,8 +20,7 @@ public class CloudContentRepositoryFactories implements Iterable factories;
@Inject
- public CloudContentRepositoryFactories(
- S3CloudContentRepositoryFactory s3Factory, //
+ public CloudContentRepositoryFactories(S3CloudContentRepositoryFactory s3Factory, //
CryptoCloudContentRepositoryFactory cryptoFactory, //
LocalStorageContentRepositoryFactory localStorageFactory, //
WebDavCloudContentRepositoryFactory webDavFactory) {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
index eb6bcaf06..87ff7d316 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
@@ -16,8 +16,8 @@
import dagger.Lazy;
-import static java.lang.String.format;
import static org.cryptomator.domain.CloudType.CRYPTO;
+import static java.lang.String.format;
@Singleton
public class CryptoCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
index 4a5eabbb7..97cb7eb43 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
@@ -76,7 +76,7 @@ internal class LocalStorageAccessFrameworkImpl(private val context: Context, pri
return file(parent, name, path, size, nodeInfo.id)
}
listFilesWithNameFilter(parent, name).getOrNull(0)?.let {
- if(it is LocalStorageAccessFile) {
+ if (it is LocalStorageAccessFile) {
return idCache.cache(it)
}
}
@@ -94,7 +94,7 @@ internal class LocalStorageAccessFrameworkImpl(private val context: Context, pri
return folder(parent, name, nodeInfo.id)
}
listFilesWithNameFilter(parent, name).getOrNull(0)?.let {
- if(it is LocalStorageAccessFolder) {
+ if (it is LocalStorageAccessFolder) {
return idCache.cache(it)
}
}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
index b07bfebbb..97c4b18ef 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.local;
-import static org.cryptomator.domain.CloudType.LOCAL;
-
import android.content.Context;
import android.content.UriPermission;
@@ -17,6 +15,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static org.cryptomator.domain.CloudType.LOCAL;
+
@Singleton
public class LocalStorageContentRepositoryFactory implements CloudContentRepositoryFactory {
@@ -38,7 +38,7 @@ public boolean supports(Cloud cloud) {
public CloudContentRepository cloudContentRepositoryFor(Cloud cloud) {
List permissions = context.getContentResolver().getPersistedUriPermissions();
for (UriPermission permission : permissions) {
- if(permission.getUri().toString().equals(((LocalStorageCloud) cloud).rootUri())) {
+ if (permission.getUri().toString().equals(((LocalStorageCloud) cloud).rootUri())) {
return new LocalStorageAccessFrameworkContentRepository(context, mimeTypes, (LocalStorageCloud) cloud);
}
}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
index 885b854e7..70c309eaa 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.okhttplogging
-import java.util.HashSet
-
internal class HeaderNames(vararg headerNames: String) {
private val lowercaseNames: MutableSet = HashSet()
diff --git a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
index b388fbb8e..52c4fec21 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
@@ -114,6 +114,7 @@ class HttpLoggingInterceptor(private val logger: Logger, private val context: Co
}
interface Logger {
+
fun log(message: String)
}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
index 647ae0c1f..6c41e2702 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
package org.cryptomator.data.cloud.s3;
-import static org.cryptomator.domain.CloudType.S3;
-
import android.content.Context;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -13,6 +11,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
+import static org.cryptomator.domain.CloudType.S3;
+
@Singleton
public class S3CloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
index 1c6432b6f..e977e795b 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
@@ -7,7 +7,7 @@ internal object S3CloudNodeFactory {
private const val DELIMITER = "/"
fun file(parent: S3Folder, name: String): S3File {
- return S3File(parent, name, getNodePath(parent, name), null, null)
+ return S3File(parent, name, getNodePath(parent, name), null, null)
}
fun file(parent: S3Folder, name: String, size: Long?): S3File {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
index 9a7875463..0c00cb9eb 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
@@ -18,6 +18,7 @@ internal open class S3Folder(override val parent: S3Folder?, override val name:
}
companion object {
+
private const val DELIMITER = "/"
}
}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
index e86736b02..55eef9509 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
@@ -342,21 +342,21 @@ internal class S3Impl(private val cloud: S3Cloud, private val client: MinioClien
}
private fun handleApiError(e: ErrorResponseException, name: String): Exception {
- val errorCode = e.errorResponse().code()
- return when {
- isAccessProblem(errorCode) -> {
- ForbiddenException()
- }
- S3CloudApiErrorCodes.NO_SUCH_BUCKET.value == errorCode -> {
- NoSuchBucketException(name)
- }
- S3CloudApiErrorCodes.NO_SUCH_KEY.value == errorCode -> {
- NoSuchCloudFileException(name)
- }
- else -> {
- FatalBackendException(e)
- }
+ val errorCode = e.errorResponse().code()
+ return when {
+ isAccessProblem(errorCode) -> {
+ ForbiddenException()
}
+ S3CloudApiErrorCodes.NO_SUCH_BUCKET.value == errorCode -> {
+ NoSuchBucketException(name)
+ }
+ S3CloudApiErrorCodes.NO_SUCH_KEY.value == errorCode -> {
+ NoSuchCloudFileException(name)
+ }
+ else -> {
+ FatalBackendException(e)
+ }
+ }
}
fun logout() {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
index 51448cd1c..0e99cae0e 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
@@ -39,7 +39,7 @@ internal class PropfindEntryData {
fun setPath(pathOrUri: String) {
path = extractPath(pathOrUri).also {
var pathSegs = it.split("/")
- if(pathSegs.last() == "") {
+ if (pathSegs.last() == "") {
pathSegs = pathSegs.subList(0, pathSegs.size - 1)
}
pathSegments = pathSegs.toTypedArray()
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
index 1e9856c62..8bd1185ad 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
@@ -7,7 +7,6 @@ import org.xmlpull.v1.XmlPullParserException
import org.xmlpull.v1.XmlPullParserFactory
import java.io.IOException
import java.io.InputStream
-import java.util.ArrayList
import java.util.Date
import timber.log.Timber
diff --git a/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt b/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
index 9ad874201..7b07fca1a 100644
--- a/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
+++ b/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
@@ -27,7 +27,7 @@ class NetworkConnectionCheck @Inject internal constructor(private val context: C
fun checkWifiOnAndConnected(): Boolean {
val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
- val activeNetwork = connectivityManager.activeNetwork
- return connectivityManager.getNetworkCapabilities(activeNetwork)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+ val activeNetwork = connectivityManager.activeNetwork
+ return connectivityManager.getNetworkCapabilities(activeNetwork)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
}
}
diff --git a/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java b/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
index 71df4b48a..7752e058e 100644
--- a/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
+++ b/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
@@ -18,7 +18,6 @@
import java.util.Date;
import java.util.List;
-import static java.util.Collections.sort;
import static org.cryptomator.data.cloud.CloudFileMatcher.cloudFile;
import static org.cryptomator.data.cloud.CloudFolderMatcher.cloudFolder;
import static org.hamcrest.CoreMatchers.is;
@@ -26,6 +25,7 @@
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static java.util.Collections.sort;
@Disabled
public class PropfindResponseParserTest {
diff --git a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
index 0c0c6833c..7f6d3d8a6 100644
--- a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
@@ -3,4 +3,5 @@
import org.cryptomator.domain.exception.BackendException;
public class MissingVaultConfigFileException extends BackendException {
+
}
diff --git a/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java b/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
index 469b2ac86..e3147f931 100644
--- a/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
+++ b/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
@@ -1,5 +1,7 @@
package org.cryptomator.domain.repository;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.Cloud;
import org.cryptomator.domain.CloudFolder;
import org.cryptomator.domain.CloudType;
@@ -8,7 +10,6 @@
import org.cryptomator.domain.exception.BackendException;
import org.cryptomator.domain.usecases.cloud.Flag;
import org.cryptomator.domain.usecases.vault.UnlockToken;
-import com.google.common.base.Optional;
import java.util.List;
diff --git a/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java b/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
index f43957636..3ab1d3f28 100644
--- a/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
+++ b/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
@@ -1,9 +1,10 @@
package org.cryptomator.domain.repository;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.exception.BackendException;
import org.cryptomator.domain.exception.update.GeneralUpdateErrorException;
import org.cryptomator.domain.usecases.UpdateCheck;
-import com.google.common.base.Optional;
import java.io.File;
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java b/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
index 01f158ac9..73e193824 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
@@ -1,10 +1,11 @@
package org.cryptomator.domain.usecases;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.exception.BackendException;
import org.cryptomator.domain.repository.UpdateCheckRepository;
import org.cryptomator.generator.Parameter;
import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
@UseCase
public class DoUpdateCheck {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
index 198002d10..b3b16e7b5 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
@@ -1,5 +1,7 @@
package org.cryptomator.domain.usecases.vault;
+import com.google.common.base.Optional;
+
import org.cryptomator.cryptolib.api.InvalidPassphraseException;
import org.cryptomator.domain.UnverifiedVaultConfig;
import org.cryptomator.domain.Vault;
@@ -9,7 +11,6 @@
import org.cryptomator.domain.repository.CloudRepository;
import org.cryptomator.generator.Parameter;
import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
import static org.cryptomator.util.ExceptionUtil.contains;
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
index 994f3f9ec..b7630c422 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
@@ -1,12 +1,13 @@
package org.cryptomator.domain.usecases.vault;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.UnverifiedVaultConfig;
import org.cryptomator.domain.Vault;
import org.cryptomator.domain.exception.BackendException;
import org.cryptomator.domain.repository.CloudRepository;
import org.cryptomator.generator.Parameter;
import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
@UseCase
class CheckVaultPassword {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt b/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
index 3e5977e63..51146966b 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
@@ -39,7 +39,7 @@ class MoveVaultHelper {
}
fun updateVaultsInDatabase(vaults: List, vaultRepository: VaultRepository): List {
- for(vault in vaults) {
+ for (vault in vaults) {
vaultRepository.store(vault)
}
return vaultRepository.vaults()
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
index ca2a24643..7031aba66 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
@@ -1,5 +1,7 @@
package org.cryptomator.domain.usecases.vault;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.UnverifiedVaultConfig;
import org.cryptomator.domain.Vault;
import org.cryptomator.domain.exception.BackendException;
@@ -8,7 +10,6 @@
import org.cryptomator.domain.repository.CloudRepository;
import org.cryptomator.generator.Parameter;
import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
import static org.cryptomator.util.ExceptionUtil.contains;
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
index 4703ceffd..3a4575e76 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
@@ -1,5 +1,7 @@
package org.cryptomator.domain.usecases.vault;
+import com.google.common.base.Optional;
+
import org.cryptomator.domain.Cloud;
import org.cryptomator.domain.UnverifiedVaultConfig;
import org.cryptomator.domain.exception.BackendException;
@@ -7,7 +9,6 @@
import org.cryptomator.domain.usecases.cloud.Flag;
import org.cryptomator.generator.Parameter;
import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
@UseCase
class UnlockVaultUsingMasterkey {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
index 8b85d17ee..cb0ee5e0b 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
@@ -19,7 +19,7 @@ public UpdateVaultParameterIfChangedRemotely(VaultRepository vaultRepository, @P
public Vault execute() throws BackendException {
Vault oldVault = vaultRepository.load(vault.getId());
- if(oldVault.getFormat() == vault.getFormat() && oldVault.getShorteningThreshold() == vault.getShorteningThreshold()) {
+ if (oldVault.getFormat() == vault.getFormat() && oldVault.getShorteningThreshold() == vault.getShorteningThreshold()) {
return vault;
} else {
return vaultRepository.store(vault);
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
index 7975ae63c..1cfdbcb44 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
@@ -13,7 +13,7 @@ internal class DataSourceCapturingAnswer(private val result: T, private val a
private lateinit var out: ByteArrayOutputStream
- private val context : Context = mock()
+ private val context: Context = mock()
@Throws(Throwable::class)
override fun answer(invocation: InvocationOnMock): T {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
index 9f27f0956..2b0f3470f 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
@@ -11,12 +11,12 @@
import java.util.Arrays;
import java.util.List;
-import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static java.util.Collections.singletonList;
public class DeleteNodeTest {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
index 481d8fa16..065e0c5c3 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
@@ -10,14 +10,14 @@
import java.io.OutputStream;
import java.util.List;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
public class DownloadFileTest {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
index 25bc28e89..ff25f60fc 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
@@ -10,14 +10,14 @@
import java.util.List;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
public class MoveFileTest {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
index f9a460ee7..36832a147 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
@@ -10,13 +10,13 @@
import java.util.List;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
public class MoveFolderTest {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
index 23c2f327e..3f4177fc3 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
@@ -24,11 +24,11 @@ import java.util.Arrays
class UploadFileTest {
- private val context :Context = mock()
+ private val context: Context = mock()
private var cloudContentRepository: CloudContentRepository = mock()
- private val parent :CloudFolder = mock()
- private val targetFile :CloudFile = mock()
- private val resultFile :CloudFile = mock()
+ private val parent: CloudFolder = mock()
+ private val targetFile: CloudFile = mock()
+ private val resultFile: CloudFile = mock()
private val progressAware: ProgressAware = mock()
@@ -44,8 +44,8 @@ class UploadFileTest {
val dataSource = dataSourceWithBytes(0, fileSize, fileSize)
val inTest = testCandidate(dataSource, replacing)
- whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
- whenever(
+ whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
+ whenever(
cloudContentRepository.write(
same(targetFile),
any(DataSource::class.java),
@@ -68,9 +68,9 @@ class UploadFileTest {
val fileSize: Long = 8893
dataSourceWithBytes(85, fileSize, null).use { dataSource ->
val inTest = testCandidate(dataSource, replacing)
- whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
+ whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
val capturedStreamData = DataSourceCapturingAnswer(resultFile, 1)
- whenever(
+ whenever(
cloudContentRepository.write(
same(targetFile),
any(DataSource::class.java),
diff --git a/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java b/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
index bf364b4db..ebfb60f77 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
@@ -1,11 +1,11 @@
package org.cryptomator.generator;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
@Retention(RUNTIME)
@Target(TYPE)
public @interface BottomSheet {
diff --git a/generator-api/src/main/java/org/cryptomator/generator/Dialog.java b/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
index 71eaea322..72afe2f55 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
@@ -1,11 +1,11 @@
package org.cryptomator.generator;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
@Retention(RUNTIME)
@Target(TYPE)
public @interface Dialog {
diff --git a/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java b/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
index 2cb8d66db..834e8c0b4 100644
--- a/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
+++ b/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
@@ -16,11 +16,11 @@ public void add(CallbackModel callback) {
}
public Collection getCallbacksClasses() {
- return callbacks.stream()
- .collect(Collectors.groupingBy(CallbackModel::getCallbacksClassName))
- .entrySet().stream()
- .map(CallbacksClassModel::new)
- .sorted(Comparator.comparing(e -> e.callbacksClassName))
+ return callbacks.stream() //
+ .collect(Collectors.groupingBy(CallbackModel::getCallbacksClassName)) //
+ .entrySet().stream() //
+ .map(CallbacksClassModel::new) //
+ .sorted(Comparator.comparing(e -> e.callbacksClassName)) //
.collect(Collectors.toList());
}
diff --git a/generator/src/main/java/org/cryptomator/generator/templates/Template.java b/generator/src/main/java/org/cryptomator/generator/templates/Template.java
index 10a9b1a75..05cbeaf47 100644
--- a/generator/src/main/java/org/cryptomator/generator/templates/Template.java
+++ b/generator/src/main/java/org/cryptomator/generator/templates/Template.java
@@ -6,9 +6,9 @@
import java.io.Writer;
import java.lang.reflect.Modifier;
+import static org.apache.velocity.app.Velocity.mergeTemplate;
import static java.lang.Character.toLowerCase;
import static java.util.Arrays.stream;
-import static org.apache.velocity.app.Velocity.mergeTemplate;
abstract class Template {
diff --git a/generator/src/main/java/org/cryptomator/generator/utils/Type.java b/generator/src/main/java/org/cryptomator/generator/utils/Type.java
index d8c9ee6f2..cf45a3737 100644
--- a/generator/src/main/java/org/cryptomator/generator/utils/Type.java
+++ b/generator/src/main/java/org/cryptomator/generator/utils/Type.java
@@ -1,9 +1,5 @@
package org.cryptomator.generator.utils;
-import static javax.lang.model.element.ElementKind.FIELD;
-import static javax.lang.model.type.TypeKind.ARRAY;
-import static javax.lang.model.type.TypeKind.NONE;
-
import java.util.Comparator;
import java.util.Optional;
import java.util.stream.Stream;
@@ -15,6 +11,10 @@
import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeMirror;
+import static javax.lang.model.element.ElementKind.FIELD;
+import static javax.lang.model.type.TypeKind.ARRAY;
+import static javax.lang.model.type.TypeKind.NONE;
+
public class Type implements Comparable {
private final TypeMirror mirror;
diff --git a/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java b/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
index ce673f04d..ffa670faf 100644
--- a/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
+++ b/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
@@ -13,9 +13,9 @@
import java.util.Arrays;
import java.util.List;
-import static java.lang.Thread.sleep;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import static java.lang.Thread.sleep;
@RunWith(AndroidJUnit4.class)
@SmallTest
diff --git a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/presentation/src/debug/res/values/ic_launcher_background.xml b/presentation/src/debug/res/values/ic_launcher_background.xml
index e50a17c8d..33932e5ed 100644
--- a/presentation/src/debug/res/values/ic_launcher_background.xml
+++ b/presentation/src/debug/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #F1C40F
+ #F1C40F
\ No newline at end of file
diff --git a/presentation/src/lite/res/drawable/ic_launcher_foreground.xml b/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
index 0607f6519..4fb4ba35e 100644
--- a/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
+++ b/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
@@ -1,23 +1,24 @@
-
-
-
-
-
-
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+
+
+
+
+
+
diff --git a/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/presentation/src/lite/res/values/ic_launcher_background.xml b/presentation/src/lite/res/values/ic_launcher_background.xml
index c5d5899fd..ea6a69e1f 100644
--- a/presentation/src/lite/res/values/ic_launcher_background.xml
+++ b/presentation/src/lite/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #FFFFFF
+ #FFFFFF
\ No newline at end of file
diff --git a/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/presentation/src/liteDebug/res/values/ic_launcher_background.xml b/presentation/src/liteDebug/res/values/ic_launcher_background.xml
index e50a17c8d..33932e5ed 100644
--- a/presentation/src/liteDebug/res/values/ic_launcher_background.xml
+++ b/presentation/src/liteDebug/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #F1C40F
+ #F1C40F
\ No newline at end of file
diff --git a/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java b/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
index 0af5e8a33..b7e9c3dc6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
@@ -5,4 +5,5 @@
@Intent(AuthenticatePCloudActivity.class)
public interface AuthenticatePCloudIntent {
+
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt b/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
index d68ecf4da..1415c5430 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
@@ -2,7 +2,6 @@ package org.cryptomator.presentation.logging
import android.content.Context
import java.io.File
-import java.util.ArrayList
object Logfiles {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
index fb512f731..e48b11ac9 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
@@ -3,7 +3,6 @@ package org.cryptomator.presentation.model.comparator
import android.content.Context
import org.cryptomator.presentation.model.CloudModel
import org.cryptomator.presentation.model.WebDavCloudModel
-import java.util.Comparator
class CloudModelComparator(private val context: Context) : Comparator {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
index 51f156f5d..51f3403ec 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
@@ -16,7 +16,6 @@ import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.presentation.ui.activity.view.BiometricAuthSettingsView
import org.cryptomator.presentation.workflow.ActivityResult
import org.cryptomator.util.SharedPreferencesHandler
-import java.util.ArrayList
import javax.inject.Inject
import timber.log.Timber
@@ -81,7 +80,8 @@ class BiometricAuthSettingsPresenter @Inject constructor( //
val vault = Vault.aCopyOf(vaultModel.toVault()).withCloud(cloud).withSavedPassword(password).build()
requestActivityResult( //
ActivityResultCallbacks.encryptVaultPassword(vaultModel), //
- Intents.unlockVaultIntent().withVaultModel(VaultModel(vault)).withVaultAction(UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD))
+ Intents.unlockVaultIntent().withVaultModel(VaultModel(vault)).withVaultAction(UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD) //
+ )
}
@Callback
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
index 5fa1a77db..29a8f2f31 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
@@ -292,6 +292,7 @@ class BrowseFilesPresenter @Inject constructor( //
override fun onSuccess(t: Void?) {
view?.showMessage(R.string.screen_file_browser_msg_file_exported)
}
+
override fun onFinished() {
source.close()
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
index 3b2a5d4c5..21f6dd915 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
@@ -96,10 +96,11 @@ class ChooseCloudServicePresenter @Inject constructor( //
fun showCloudMissingSnackbarHintInLiteVariant() {
if (BuildConfig.FLAVOR == "lite") {
- view?.showSnackbar(R.string.snack_bar_cryptomator_variants_hint, object: SnackbarAction {
+ view?.showSnackbar(R.string.snack_bar_cryptomator_variants_hint, object : SnackbarAction {
override fun onClick(v: View?) {
startIntent(Intents.cryptomatorVariantsIntent())
}
+
override val text: Int
get() = R.string.snack_bar_cryptomator_variants_title
})
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
index aaada8a0e..14180e85b 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
@@ -84,6 +84,7 @@ class UnlockVaultPresenter @Inject constructor(
override fun onSuccess(unverifiedVaultConfig: Optional) {
onUnverifiedVaultConfigRetrieved(unverifiedVaultConfig)
}
+
override fun onError(e: Throwable) {
if (!authenticationExceptionHandler.handleAuthenticationException(this@UnlockVaultPresenter, e, ActivityResultCallbacks.authenticatedAfterGettingVaultConfig(vault))) {
super.onError(e)
@@ -103,6 +104,7 @@ class UnlockVaultPresenter @Inject constructor(
override fun onSuccess(unverifiedVaultConfig: Optional) {
onUnverifiedVaultConfigRetrieved(unverifiedVaultConfig)
}
+
override fun onError(e: Throwable) {
super.onError(e)
finishWithResult(null)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
index 522a97e52..3e9acc2e1 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
@@ -1,8 +1,5 @@
package org.cryptomator.presentation.service;
-import static org.cryptomator.domain.usecases.cloud.UploadFile.anUploadFile;
-import static java.lang.String.format;
-
import android.app.Service;
import android.content.Context;
import android.content.Intent;
@@ -51,6 +48,9 @@
import timber.log.Timber;
+import static org.cryptomator.domain.usecases.cloud.UploadFile.anUploadFile;
+import static java.lang.String.format;
+
public class AutoUploadService extends Service {
private static final String ACTION_CANCEL_AUTO_UPLOAD = "CANCEL_AUTO_UPLOAD";
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
index c5dfc0a6c..ef8f0c08f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
@@ -69,7 +69,7 @@ class PhotoContentJob : JobService() {
}
} ?: Timber.tag("PhotoContentJob").w("No photos content")
- if(filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
+ if (filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
(application as CryptomatorApp).startAutoUpload()
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
index 3ce268e81..4fc72da33 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
@@ -78,7 +78,7 @@ private PendingIntent lockNowIntent() {
return PendingIntent.getService( //
service.getApplicationContext(), //
0, //
- CryptorsService.lockAllIntent(service.getApplicationContext()),
+ CryptorsService.lockAllIntent(service.getApplicationContext()), //
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
index 21b37247c..1fce32ea3 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
@@ -27,6 +27,7 @@ class AutoUploadRefreshTokenActivity : BaseActivity(), AutoUploadRefreshTokenVie
}
companion object {
+
const val AUTHENTICATION_EXCEPTION_ARG = "authenticationException"
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
index c75c9402c..f545b4405 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
@@ -13,7 +13,6 @@ import org.cryptomator.presentation.ui.bottomsheet.CloudConnectionSettingsBottom
import org.cryptomator.presentation.ui.dialog.DeleteCloudConnectionWithVaultsDialog
import org.cryptomator.presentation.ui.dialog.PCloudCredentialsUpdatedDialog
import org.cryptomator.presentation.ui.fragment.CloudConnectionListFragment
-import java.util.ArrayList
import javax.inject.Inject
import kotlinx.android.synthetic.main.toolbar_layout.toolbar
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
index 0d0ed787b..c7fc14647 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
@@ -19,7 +19,6 @@ import org.cryptomator.presentation.ui.dialog.ReplaceDialog
import org.cryptomator.presentation.ui.dialog.UploadCloudFileDialog
import org.cryptomator.presentation.ui.fragment.SharedFilesFragment
import java.lang.String.format
-import java.util.ArrayList
import javax.inject.Inject
import kotlinx.android.synthetic.main.toolbar_layout.toolbar
import timber.log.Timber
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
index e18f5da0e..fa1fcd2e4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
@@ -2,7 +2,6 @@ package org.cryptomator.presentation.ui.activity.view
import org.cryptomator.domain.Vault
import org.cryptomator.presentation.model.CloudModel
-import java.util.ArrayList
interface CloudConnectionListView : View {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
index 30edadbdc..8e31b644a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
@@ -27,7 +27,6 @@ import org.cryptomator.presentation.util.FileSizeHelper
import org.cryptomator.presentation.util.FileUtil
import org.cryptomator.presentation.util.ResourceHelper.Companion.getDrawable
import org.cryptomator.util.SharedPreferencesHandler
-import java.util.Comparator
import javax.inject.Inject
import kotlinx.android.synthetic.main.item_browse_files_node.view.cloudNodeImage
import kotlinx.android.synthetic.main.item_browse_files_node.view.itemCheckBox
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
index f09034a17..b6c58476c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
@@ -27,9 +27,10 @@ class AskIgnoreBatteryOptimizationsDialog : BaseDialog() {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
index 66f5e3310..37b48c00d 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
@@ -10,7 +10,6 @@ import org.cryptomator.presentation.model.FileProgressStateModel
import org.cryptomator.presentation.model.ProgressModel
import org.cryptomator.presentation.model.ProgressStateModel
import org.cryptomator.presentation.util.ResourceHelper
-import java.util.HashSet
import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.iv_progress_icon
import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.pb_dialog
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt b/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
index 15485ff01..241ddc9a0 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
@@ -10,9 +10,9 @@ import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.util.crypto.BiometricAuthCryptor
import org.cryptomator.util.crypto.UnrecoverableStorageKeyException
-import timber.log.Timber
import java.util.concurrent.Executor
import javax.crypto.BadPaddingException
+import timber.log.Timber
class BiometricAuthentication(val callback: Callback, val context: Context, val cryptoMode: CryptoMode, private val useConfirmationInFaceUnlockAuth: Boolean) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
index feef2b78e..6b91a42ad 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
@@ -8,7 +8,6 @@ import java.io.File
import java.io.FileNotFoundException
import java.io.InputStream
import java.io.OutputStream
-import java.util.ArrayList
import javax.inject.Inject
class ContentResolverUtil @Inject constructor(context: Context) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
index dd76d4280..1fddd8df6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
@@ -5,7 +5,6 @@ import org.cryptomator.presentation.model.CloudFileModel
import org.cryptomator.presentation.presenter.Presenter
import java.io.FileNotFoundException
import java.io.OutputStream
-import java.util.ArrayList
import javax.inject.Inject
class DownloadFileUtil @Inject constructor(private val fileUtil: FileUtil) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt b/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
index a04905381..cfcbd1255 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
@@ -4,7 +4,6 @@ import android.content.Context
import android.content.Intent
import androidx.core.content.FileProvider
import java.io.File
-import java.util.ArrayList
class EmailBuilder private constructor() {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java b/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
index ac179b49a..937aad902 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
@@ -59,7 +59,7 @@ public static FileIcon fileIconFor(String name, FileUtil fileUtil) {
private static Predicate forExtensions(final String... extensions) {
return fileInfo -> {
- if(fileInfo.getExtension() == null) {
+ if (fileInfo.getExtension() == null) {
return FALSE;
}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
index 29b03ba4d..c39cc20fc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
@@ -117,7 +117,7 @@ void cloudServiceAuthenticated(ActivityResult result) {
@Callback
void cryptomatorFileChosen(SerializableResult result) {
CloudFileModel masterkeyFile = result.getResult();
- if(!masterkeyFile.getPath().equals("/masterkey.cryptomator") && !masterkeyFile.getPath().equals("/vault.cryptomator")) {
+ if (!masterkeyFile.getPath().equals("/masterkey.cryptomator") && !masterkeyFile.getPath().equals("/vault.cryptomator")) {
state().masterkeyFile = masterkeyFile.toCloudNode();
presenter().getView().showProgress(ProgressModel.GENERIC);
finish();
diff --git a/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java b/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
index 9521350a0..fa596374e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
@@ -19,12 +19,12 @@
import javax.inject.Inject;
-import static java.util.Collections.singletonList;
import static org.cryptomator.presentation.intent.ChooseCloudNodeSettings.chooseCloudNodeSettings;
import static org.cryptomator.presentation.intent.Intents.browseFilesIntent;
import static org.cryptomator.presentation.intent.Intents.chooseCloudServiceIntent;
import static org.cryptomator.presentation.intent.Intents.createVaultIntent;
import static org.cryptomator.presentation.intent.Intents.setPasswordIntent;
+import static java.util.Collections.singletonList;
public class CreateNewVaultWorkflow extends Workflow {
diff --git a/presentation/src/main/res/drawable-anydpi/ic_notification.xml b/presentation/src/main/res/drawable-anydpi/ic_notification.xml
index 0b99d37aa..cbd180f77 100644
--- a/presentation/src/main/res/drawable-anydpi/ic_notification.xml
+++ b/presentation/src/main/res/drawable-anydpi/ic_notification.xml
@@ -1,24 +1,25 @@
-
-
-
-
-
-
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#FFFFFF">
+
+
+
+
+
+
diff --git a/presentation/src/main/res/drawable/dropbox_vault.xml b/presentation/src/main/res/drawable/dropbox_vault.xml
index 61e2890f8..dc0513345 100644
--- a/presentation/src/main/res/drawable/dropbox_vault.xml
+++ b/presentation/src/main/res/drawable/dropbox_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/dropbox_vault_selected.xml b/presentation/src/main/res/drawable/dropbox_vault_selected.xml
index 1ad2e4771..5745608a0 100644
--- a/presentation/src/main/res/drawable/dropbox_vault_selected.xml
+++ b/presentation/src/main/res/drawable/dropbox_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/google_drive_vault.xml b/presentation/src/main/res/drawable/google_drive_vault.xml
index c4d0cc939..9b0d66324 100644
--- a/presentation/src/main/res/drawable/google_drive_vault.xml
+++ b/presentation/src/main/res/drawable/google_drive_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/google_drive_vault_selected.xml b/presentation/src/main/res/drawable/google_drive_vault_selected.xml
index 869e25aab..f3cf6dfb7 100644
--- a/presentation/src/main/res/drawable/google_drive_vault_selected.xml
+++ b/presentation/src/main/res/drawable/google_drive_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground.xml b/presentation/src/main/res/drawable/ic_launcher_foreground.xml
index 6979bda7b..5b518aebd 100644
--- a/presentation/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/presentation/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,92 +1,93 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
index 0607f6519..4fb4ba35e 100644
--- a/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
+++ b/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
@@ -1,23 +1,24 @@
-
-
-
-
-
-
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+
+
+
+
+
+
diff --git a/presentation/src/main/res/drawable/local_fs_vault.xml b/presentation/src/main/res/drawable/local_fs_vault.xml
index 28876ee61..8629f005a 100644
--- a/presentation/src/main/res/drawable/local_fs_vault.xml
+++ b/presentation/src/main/res/drawable/local_fs_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/local_fs_vault_selected.xml b/presentation/src/main/res/drawable/local_fs_vault_selected.xml
index 9e6e392af..337d5a6e3 100644
--- a/presentation/src/main/res/drawable/local_fs_vault_selected.xml
+++ b/presentation/src/main/res/drawable/local_fs_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/onedrive_vault.xml b/presentation/src/main/res/drawable/onedrive_vault.xml
index 3441917f6..ad9607ac5 100644
--- a/presentation/src/main/res/drawable/onedrive_vault.xml
+++ b/presentation/src/main/res/drawable/onedrive_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/onedrive_vault_selected.xml b/presentation/src/main/res/drawable/onedrive_vault_selected.xml
index 6908527fc..e7bb483c1 100644
--- a/presentation/src/main/res/drawable/onedrive_vault_selected.xml
+++ b/presentation/src/main/res/drawable/onedrive_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/pcloud_vault.xml b/presentation/src/main/res/drawable/pcloud_vault.xml
index ac96fe18d..49df941d7 100644
--- a/presentation/src/main/res/drawable/pcloud_vault.xml
+++ b/presentation/src/main/res/drawable/pcloud_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/pcloud_vault_selected.xml b/presentation/src/main/res/drawable/pcloud_vault_selected.xml
index e64095db0..c61b05a4d 100644
--- a/presentation/src/main/res/drawable/pcloud_vault_selected.xml
+++ b/presentation/src/main/res/drawable/pcloud_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/s3_vault.xml b/presentation/src/main/res/drawable/s3_vault.xml
index 98f64a853..a0fec6dcb 100644
--- a/presentation/src/main/res/drawable/s3_vault.xml
+++ b/presentation/src/main/res/drawable/s3_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/s3_vault_selected.xml b/presentation/src/main/res/drawable/s3_vault_selected.xml
index ae07a5a7e..b935b52a7 100644
--- a/presentation/src/main/res/drawable/s3_vault_selected.xml
+++ b/presentation/src/main/res/drawable/s3_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/webdav_vault.xml b/presentation/src/main/res/drawable/webdav_vault.xml
index d203134fc..0006a61a5 100644
--- a/presentation/src/main/res/drawable/webdav_vault.xml
+++ b/presentation/src/main/res/drawable/webdav_vault.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/drawable/webdav_vault_selected.xml b/presentation/src/main/res/drawable/webdav_vault_selected.xml
index e7428f38f..0834fc71d 100644
--- a/presentation/src/main/res/drawable/webdav_vault_selected.xml
+++ b/presentation/src/main/res/drawable/webdav_vault_selected.xml
@@ -1,10 +1,10 @@
-
+ android:width="56dp"
+ android:height="56dp"
+ android:viewportWidth="56"
+ android:viewportHeight="56">
+
diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/presentation/src/main/res/values/ic_launcher_background.xml b/presentation/src/main/res/values/ic_launcher_background.xml
index c5d5899fd..ea6a69e1f 100644
--- a/presentation/src/main/res/values/ic_launcher_background.xml
+++ b/presentation/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #FFFFFF
+ #FFFFFF
\ No newline at end of file
diff --git a/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java b/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
index 874b49ee9..a8bdc0199 100644
--- a/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
+++ b/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
@@ -1,11 +1,5 @@
package org.cryptomator.presentation.presenter;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static java.util.Arrays.asList;
-
import android.app.Activity;
import org.cryptomator.data.util.NetworkConnectionCheck;
@@ -44,6 +38,12 @@
import java.util.Collections;
import java.util.List;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+
public class VaultListPresenterTest {
private static final String A_NEW_VAULT_NAME = "Haribo";
diff --git a/util/src/main/java/org/cryptomator/util/ExceptionUtil.java b/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
index 3bb4d4131..f35d67c23 100644
--- a/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
+++ b/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
@@ -1,8 +1,8 @@
package org.cryptomator.util;
+import com.google.common.base.Optional;
import com.google.common.base.Predicates;
-import com.google.common.base.Optional;
import java.util.function.Predicate;
public class ExceptionUtil {
diff --git a/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java b/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
index 85e3ae147..c87e51108 100644
--- a/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
+++ b/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
@@ -25,9 +25,9 @@ private static KeyStore initializeKeyStore() {
keyStore.load(null);
return keyStore;
} catch (IOException //
- | KeyStoreException //
- | CertificateException //
- | NoSuchAlgorithmException e) {
+ | KeyStoreException //
+ | CertificateException //
+ | NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
}
@@ -94,9 +94,9 @@ private boolean doesKeyExist(String alias) {
keyStore.load(null);
isKeyStoreCertAliasExisted = keyStore.containsAlias(alias);
} catch (KeyStoreException //
- | CertificateException //
- | NoSuchAlgorithmException //
- | IOException e) {
+ | CertificateException //
+ | NoSuchAlgorithmException //
+ | IOException e) {
throw new RuntimeException(e);
}
diff --git a/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt b/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
index d3fa5dc64..b3d2fbee3 100644
--- a/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
+++ b/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
@@ -13,7 +13,6 @@ import java.nio.file.Files
import java.nio.file.NoSuchFileException
import java.nio.file.Path
import java.nio.file.StandardCopyOption
-import java.util.Comparator
import timber.log.Timber
class LruFileCacheUtil(context: Context) {
diff --git a/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java b/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
index 619dd9a19..4898c47aa 100644
--- a/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
+++ b/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
@@ -1,11 +1,11 @@
package org.cryptomator.util.matchers;
+import com.google.common.base.Optional;
+
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;
-import com.google.common.base.Optional;
-
public class OptionalMatchers {
public static Matcher> anEmptyOptional() {