From 9487d73afecef4e02e3ebe48e912e2573e23e292 Mon Sep 17 00:00:00 2001
From: Sergey Eremin <yeriomin@gmail.com>
Date: Sun, 26 Nov 2017 19:34:32 +0300
Subject: [PATCH] If refresh fails, try the ordinary long login process

---
 .../yalpstore/PlayStoreApiAuthenticator.java    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java
index b7e57ef63..5db876ffb 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java
@@ -92,7 +92,7 @@ public class PlayStoreApiAuthenticator {
     }
 
     private GooglePlayAPI build(LoginInfo loginInfo) throws IOException {
-        api = build(loginInfo, TextUtils.isEmpty(loginInfo.getEmail()) ? RETRIES : 1);
+        api = build(loginInfo, RETRIES);
         loginInfo.setGsfId(api.getGsfId());
         loginInfo.setToken(api.getToken());
         save(loginInfo);
@@ -102,12 +102,11 @@ public class PlayStoreApiAuthenticator {
     private GooglePlayAPI build(LoginInfo loginInfo, int retries) throws IOException {
         int tried = 0;
         TokenDispenserMirrors tokenDispenserMirrors = new TokenDispenserMirrors();
-        boolean shouldRefresh = retries == 1
-            && PreferenceActivity.getBoolean(context, PREFERENCE_APP_PROVIDED_EMAIL)
-            && TextUtils.isEmpty(loginInfo.getToken())
-            && !TextUtils.isEmpty(loginInfo.getGsfId())
-        ;
         while (tried < retries) {
+            boolean shouldRefresh = PreferenceActivity.getBoolean(context, PREFERENCE_APP_PROVIDED_EMAIL)
+                && TextUtils.isEmpty(loginInfo.getToken())
+                && !TextUtils.isEmpty(loginInfo.getGsfId())
+            ;
             loginInfo.setTokenDispenserUrl(shouldRefresh
                 ? PreferenceManager.getDefaultSharedPreferences(context).getString(PREFERENCE_LAST_USED_TOKEN_DISPENSER, tokenDispenserMirrors.get())
                 : tokenDispenserMirrors.get()
@@ -119,8 +118,12 @@ public class PlayStoreApiAuthenticator {
                 loginInfo.setEmail(builder.getEmail());
                 return api;
             } catch (ApiBuilderException e) {
-                Log.i(getClass().getSimpleName(), "ApiBuilderException: " + e.getMessage());
+                Log.e(getClass().getSimpleName(), "ApiBuilderException: " + e.getMessage());
             } catch (AuthException | TokenDispenserException e) {
+                if (shouldRefresh && tried == 0) {
+                    loginInfo.setEmail(null);
+                    loginInfo.setGsfId(null);
+                }
                 tried++;
                 if (tried >= retries) {
                     throw e;