From e7ed348d92baf921aa919648bb3ca67a0e8ffd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Despr=C3=A9s?= Date: Wed, 31 Aug 2016 09:26:18 +0200 Subject: [PATCH 1/2] Fix isTokenIdExpired() Token expired when in the past ( lower than currentTime ) --- .../java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java b/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java index f295c81e7..97263e9aa 100644 --- a/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java +++ b/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java @@ -128,7 +128,7 @@ public AuthInfo getAuthInfo() throws RemoteServerException, LoginFailedException @Override public boolean isTokenIdExpired() { - return tokenInfo.authToken.getExpiry() > time.currentTimeMillis() / 1000 - 60; + return tokenInfo.authToken.getExpiry() < time.currentTimeMillis() / 1000; } private static class TokenInfo { From 60ebf769a22a5bb2eec24cd258d6f4b53ec4b634 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Wed, 31 Aug 2016 12:47:17 +0200 Subject: [PATCH 2/2] Revert "Fix isTokenIdExpired()" --- .../java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java b/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java index 97263e9aa..f295c81e7 100644 --- a/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java +++ b/library/src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java @@ -128,7 +128,7 @@ public AuthInfo getAuthInfo() throws RemoteServerException, LoginFailedException @Override public boolean isTokenIdExpired() { - return tokenInfo.authToken.getExpiry() < time.currentTimeMillis() / 1000; + return tokenInfo.authToken.getExpiry() > time.currentTimeMillis() / 1000 - 60; } private static class TokenInfo {