From 80a0d7cdcd960d00525c861b19d9ad90b0f51e2e Mon Sep 17 00:00:00 2001
From: Manuel Jenny <git@manueljenny.ch>
Date: Thu, 18 Mar 2021 17:20:09 +0100
Subject: [PATCH] fix: throw WrongCredentialsException in findEntry()

---
 .../data/cloud/pcloud/PCloudContentRepository.java         | 7 +++++--
 .../java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.java
index a26e39fd..88dd65f0 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.java
@@ -48,8 +48,11 @@ class PCloudContentRepository extends InterceptingCloudContentRepository<PCloud,
 	}
 
 	private void throwWrongCredentialsExceptionIfRequired(Exception e) {
-		if (e instanceof ApiError && ((ApiError) e).errorCode() == PCloudApiErrorCodes.INVALID_ACCESS_TOKEN.getValue()) {
-			throw new WrongCredentialsException(cloud);
+		if (e instanceof ApiError) {
+			int errorCode = ((ApiError)e).errorCode();
+			if (errorCode == PCloudApiErrorCodes.INVALID_ACCESS_TOKEN.getValue() || errorCode == PCloudApiErrorCodes.ACCESS_TOKEN_REVOKED.getValue()) {
+				throw new WrongCredentialsException(cloud);
+			}
 		}
 	}
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java
index 79fa5f75..a0fe02ff 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.java
@@ -20,6 +20,7 @@ import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.exception.CloudNodeAlreadyExistsException;
 import org.cryptomator.domain.exception.NoSuchCloudFileException;
 import org.cryptomator.domain.exception.authentication.NoAuthenticationProvidedException;
+import org.cryptomator.domain.exception.authentication.WrongCredentialsException;
 import org.cryptomator.domain.usecases.ProgressAware;
 import org.cryptomator.domain.usecases.cloud.DataSource;
 import org.cryptomator.domain.usecases.cloud.DownloadState;
@@ -96,6 +97,12 @@ class PCloudImpl {
 			}
 			return Optional.empty();
 		} catch(ApiError | IOException ex) {
+			if (ex instanceof ApiError) {
+				int errorCode = ((ApiError)ex).errorCode();
+				if (errorCode == PCloudApiErrorCodes.INVALID_ACCESS_TOKEN.getValue() || errorCode == PCloudApiErrorCodes.ACCESS_TOKEN_REVOKED.getValue()) {
+					throw new WrongCredentialsException(cloud);
+				}
+			}
 			return Optional.empty();
 		}
 	}