Turned "Cloud#type" into property

JaniruTEC · JaniruTEC · commit 163deacc9eba · 2023-10-31T18:06:34.000+01:00
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
@@ -24,7 +24,7 @@ public DropboxCloudContentRepositoryFactory(Context context) {
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == DROPBOX;
+		return cloud.getType() == DROPBOX;
 	}
 
 	@Override
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
@@ -24,7 +24,7 @@ public OnedriveCloudContentRepositoryFactory(Context context) {
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == ONEDRIVE;
+		return cloud.getType() == ONEDRIVE;
 	}
 
 	@Override
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
@@ -24,7 +24,7 @@ public PCloudContentRepositoryFactory(Context context) {
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == PCLOUD;
+		return cloud.getType() == PCLOUD;
 	}
 
 	@Override
diff --git a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudContentRepositoryFactory.java b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudContentRepositoryFactory.java
@@ -25,7 +25,7 @@ public GoogleDriveCloudContentRepositoryFactory(Context context, GoogleDriveIdCa
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == CloudType.GOOGLE_DRIVE;
+		return cloud.getType() == CloudType.GOOGLE_DRIVE;
 	}
 
 	@Override
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java
@@ -20,7 +20,7 @@ public Long id() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.CRYPTO;
 	}
 
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
@@ -35,7 +35,7 @@ public CryptoCloudContentRepositoryFactory(Lazy<CloudContentRepository> cloudCon
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == CRYPTO;
+		return cloud.getType() == CRYPTO;
 	}
 
 	@Override
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
@@ -31,7 +31,7 @@ public LocalStorageContentRepositoryFactory(Context context, MimeTypes mimeTypes
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == LOCAL;
+		return cloud.getType() == LOCAL;
 	}
 
 	@Override
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
@@ -27,7 +27,7 @@ public S3CloudContentRepositoryFactory(Context context, SharedPreferencesHandler
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == S3;
+		return cloud.getType() == S3;
 	}
 
 	@Override
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepositoryFactory.java
@@ -26,7 +26,7 @@ public class WebDavCloudContentRepositoryFactory implements CloudContentReposito
 
 	@Override
 	public boolean supports(Cloud cloud) {
-		return cloud.type() == WEBDAV;
+		return cloud.getType() == WEBDAV;
 	}
 
 	@Override
diff --git a/data/src/main/java/org/cryptomator/data/db/mappers/CloudEntityMapper.java b/data/src/main/java/org/cryptomator/data/db/mappers/CloudEntityMapper.java
@@ -89,8 +89,8 @@ public Cloud fromEntity(CloudEntity entity) {
 	public CloudEntity toEntity(Cloud domainObject) {
 		CloudEntity result = new CloudEntity();
 		result.setId(domainObject.id());
-		result.setType(domainObject.type().name());
-		switch (domainObject.type()) {
+		result.setType(domainObject.getType().name());
+		switch (domainObject.getType()) {
 			case DROPBOX:
 				result.setAccessToken(((DropboxCloud) domainObject).accessToken());
 				result.setUsername(((DropboxCloud) domainObject).username());
@@ -126,7 +126,7 @@ public CloudEntity toEntity(Cloud domainObject) {
 				result.setWebdavCertificate(((WebDavCloud) domainObject).certificate());
 				break;
 			default:
-				throw new IllegalStateException("Unhandled enum constant " + domainObject.type());
+				throw new IllegalStateException("Unhandled enum constant " + domainObject.getType());
 		}
 		return result;
 	}
diff --git a/data/src/main/java/org/cryptomator/data/repository/CloudRepositoryImpl.java b/data/src/main/java/org/cryptomator/data/repository/CloudRepositoryImpl.java
@@ -47,7 +47,7 @@ public List<Cloud> clouds(CloudType cloudType) throws BackendException {
 		List<Cloud> allClouds = mapper.fromEntities(database.loadAll(CloudEntity.class));
 
 		for (Cloud cloud : allClouds) {
-			if (cloud.type().equals(cloudType)) {
+			if (cloud.getType().equals(cloudType)) {
 				cloudsFromType.add(cloud);
 			}
 		}
diff --git a/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt b/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
@@ -156,7 +156,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	fun testUnlockVault() {
 		val cloudType: CloudType = mock()
 
-		whenever(cloud.type()).thenReturn(cloudType)
+		whenever(cloud.type).thenReturn(cloudType)
 		whenever(vault.cloud).thenReturn(cloud)
 		whenever(vault.cloudType).thenReturn(cloudType)
 		whenever(vault.format).thenReturn(8)
@@ -183,7 +183,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	fun testUnlockLegacyVault() {
 		val cloudType: CloudType = mock()
 
-		whenever(cloud.type()).thenReturn(cloudType)
+		whenever(cloud.type).thenReturn(cloudType)
 		whenever(vault.cloud).thenReturn(cloud)
 		whenever(vault.cloudType).thenReturn(cloudType)
 		whenever(vault.format).thenReturn(7)
@@ -217,7 +217,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	fun tesChangePassword(legacy: Boolean) {
 		val cloudType: CloudType = mock()
 
-		whenever(cloud.type()).thenReturn(cloudType)
+		whenever(cloud.type).thenReturn(cloudType)
 		whenever(vault.cloud).thenReturn(cloud)
 		whenever(vault.cloudType).thenReturn(cloudType)
 		whenever(vault.format).thenReturn(7)
@@ -334,7 +334,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	private fun testVaultPasswordVault(masterkeyContent: String, unverifiedVaultConfig: Optional<UnverifiedVaultConfig>, password: String): Boolean {
 		val cloudType: CloudType = mock()
 
-		whenever(cloud.type()).thenReturn(cloudType)
+		whenever(cloud.type).thenReturn(cloudType)
 		whenever(vault.cloud).thenReturn(cloud)
 		whenever(vault.cloudType).thenReturn(cloudType)
 		whenever(vault.format).thenReturn(7)
diff --git a/domain/src/main/java/org/cryptomator/domain/Cloud.kt b/domain/src/main/java/org/cryptomator/domain/Cloud.kt
@@ -5,7 +5,7 @@ import java.io.Serializable
 interface Cloud : Serializable {
 
 	fun id(): Long?
-	fun type(): CloudType
+	val type: CloudType
 	fun configurationMatches(cloud: Cloud?): Boolean
 	fun persistent(): Boolean
 	fun requiresNetwork(): Boolean
diff --git a/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java b/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java
@@ -40,7 +40,7 @@ public String username() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.DROPBOX;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java b/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java
@@ -32,7 +32,7 @@ public Long id() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.GOOGLE_DRIVE;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java b/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java
@@ -34,7 +34,7 @@ public String rootUri() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.LOCAL;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java b/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java
@@ -40,7 +40,7 @@ public String username() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.ONEDRIVE;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/PCloud.java b/domain/src/main/java/org/cryptomator/domain/PCloud.java
@@ -47,7 +47,7 @@ public String username() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.PCLOUD;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/S3Cloud.java b/domain/src/main/java/org/cryptomator/domain/S3Cloud.java
@@ -68,7 +68,7 @@ public String displayName() {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.S3;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/Vault.java b/domain/src/main/java/org/cryptomator/domain/Vault.java
@@ -159,7 +159,7 @@ public Builder withCloud(Cloud cloud) {
 			this.cloud = cloud;
 
 			if (cloud != null) {
-				this.cloudType = cloud.type();
+				this.cloudType = cloud.getType();
 			}
 
 			return this;
@@ -168,7 +168,7 @@ public Builder withCloud(Cloud cloud) {
 		public Builder withCloudType(CloudType cloudType) {
 			this.cloudType = cloudType;
 
-			if (cloud != null && cloud.type() != cloudType) {
+			if (cloud != null && cloud.getType() != cloudType) {
 				throw new IllegalStateException("Cloud type must match cloud");
 			}
 
@@ -179,7 +179,7 @@ public Builder withNamePathAndCloudFrom(CloudFolder vaultFolder) {
 			this.name = vaultFolder.getName();
 			this.path = vaultFolder.getPath();
 			this.cloud = vaultFolder.getCloud();
-			this.cloudType = cloud.type();
+			this.cloudType = cloud.getType();
 			return this;
 		}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java b/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java
@@ -47,7 +47,7 @@ private boolean configurationMatches(WebDavCloud cloud) {
 
 	@NotNull
 	@Override
-	public CloudType type() {
+	public CloudType getType() {
 		return CloudType.WEBDAV;
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/AddOrChangeCloudConnection.java b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/AddOrChangeCloudConnection.java
@@ -33,7 +33,7 @@ public void execute() throws BackendException {
 	}
 
 	private boolean cloudExists(Cloud cloud) throws BackendException {
-		for (Cloud storedCloud : cloudRepository.clouds(cloud.type())) {
+		for (Cloud storedCloud : cloudRepository.clouds(cloud.getType())) {
 			if (cloud.id() != null && cloud.id().equals(storedCloud.id())) {
 				continue;
 			}
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/LogoutCloud.java b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/LogoutCloud.java
@@ -48,6 +48,6 @@ private Cloud cloudWithUsernameAndAccessTokenRemoved(Cloud cloud) {
 					.withAccessToken(null) //
 					.build();
 		}
-		throw new IllegalStateException("Logout not supported for cloud with type " + cloud.type());
+		throw new IllegalStateException("Logout not supported for cloud with type " + cloud.getType());
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/CloudFolderModel.kt b/presentation/src/main/java/org/cryptomator/presentation/model/CloudFolderModel.kt
@@ -17,7 +17,7 @@ class CloudFolderModel(cloudFolder: CloudFolder) : CloudNodeModel<CloudFolder>(c
 		get() = true
 
 	fun vault(): VaultModel? {
-		return if (toCloudNode().cloud?.type() == CloudType.CRYPTO) {
+		return if (toCloudNode().cloud?.type == CloudType.CRYPTO) {
 			VaultModel((toCloudNode().cloud as CryptoCloud).vault)
 		} else {
 			null
diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/mappers/CloudModelMapper.kt b/presentation/src/main/java/org/cryptomator/presentation/model/mappers/CloudModelMapper.kt
@@ -22,7 +22,7 @@ class CloudModelMapper @Inject constructor() : ModelMapper<CloudModel, Cloud>()
 	}
 
 	override fun toModel(domainObject: Cloud): CloudModel {
-		return when (domainObject.type().let { CloudTypeModel.valueOf(it) }) {
+		return when (domainObject.type.let { CloudTypeModel.valueOf(it) }) {
 			CloudTypeModel.DROPBOX -> DropboxCloudModel(domainObject)
 			CloudTypeModel.GOOGLE_DRIVE -> GoogleDriveCloudModel(domainObject)
 			CloudTypeModel.LOCAL -> LocalStorageModel(domainObject)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/AuthenticateCloudPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/AuthenticateCloudPresenter.kt
@@ -114,10 +114,10 @@ class AuthenticateCloudPresenter @Inject constructor( //
 	}
 
 	private fun updateUsernameOf(cloud: Cloud, username: String): Cloud {
-		return when (cloud.type()) {
+		return when (cloud.type) {
 			CloudType.DROPBOX -> DropboxCloud.aCopyOf(cloud as DropboxCloud).withUsername(username).build()
 			CloudType.ONEDRIVE -> OnedriveCloud.aCopyOf(cloud as OnedriveCloud).withUsername(username).build()
-			else -> throw IllegalStateException("Cloud " + cloud.type() + " is not supported")
+			else -> throw IllegalStateException("Cloud " + cloud.type + " is not supported")
 		}
 	}
 
@@ -336,7 +336,7 @@ class AuthenticateCloudPresenter @Inject constructor( //
 
 	fun prepareForSavingPCloud(cloud: PCloud) {
 		getCloudsUseCase //
-			.withCloudType(cloud.type()) //
+			.withCloudType(cloud.type) //
 			.run(object : DefaultResultHandler<List<Cloud>>() {
 				override fun onSuccess(clouds: List<Cloud>) {
 					clouds.firstOrNull {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public DropboxCloudContentRepositoryFactory(Context context) {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public boolean supports(Cloud cloud) {`
`27`		`- return cloud.type() == DROPBOX;`
	`27`	`+ return cloud.getType() == DROPBOX;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public OnedriveCloudContentRepositoryFactory(Context context) {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public boolean supports(Cloud cloud) {`
`27`		`- return cloud.type() == ONEDRIVE;`
	`27`	`+ return cloud.getType() == ONEDRIVE;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public PCloudContentRepositoryFactory(Context context) {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public boolean supports(Cloud cloud) {`
`27`		`- return cloud.type() == PCLOUD;`
	`27`	`+ return cloud.getType() == PCLOUD;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public GoogleDriveCloudContentRepositoryFactory(Context context, GoogleDriveIdCa`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public boolean supports(Cloud cloud) {`
`28`		`- return cloud.type() == CloudType.GOOGLE_DRIVE;`
	`28`	`+ return cloud.getType() == CloudType.GOOGLE_DRIVE;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public Long id() {`
`20`	`20`
`21`	`21`	`@NotNull`
`22`	`22`	`@Override`
`23`		`- public CloudType type() {`
	`23`	`+ public CloudType getType() {`
`24`	`24`	`return CloudType.CRYPTO;`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public CryptoCloudContentRepositoryFactory(Lazy<CloudContentRepository> cloudCon`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public boolean supports(Cloud cloud) {`
`38`		`- return cloud.type() == CRYPTO;`
	`38`	`+ return cloud.getType() == CRYPTO;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public LocalStorageContentRepositoryFactory(Context context, MimeTypes mimeTypes`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public boolean supports(Cloud cloud) {`
`34`		`- return cloud.type() == LOCAL;`
	`34`	`+ return cloud.getType() == LOCAL;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public S3CloudContentRepositoryFactory(Context context, SharedPreferencesHandler`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public boolean supports(Cloud cloud) {`
`30`		`- return cloud.type() == S3;`
	`30`	`+ return cloud.getType() == S3;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class WebDavCloudContentRepositoryFactory implements CloudContentReposito`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public boolean supports(Cloud cloud) {`
`29`		`- return cloud.type() == WEBDAV;`
	`29`	`+ return cloud.getType() == WEBDAV;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`