From 0f0849634a78ec18ab0dff7368f06fd766bf8cbe Mon Sep 17 00:00:00 2001
From: Anita W <1918555+anitawoodruff@users.noreply.github.com>
Date: Mon, 4 May 2020 16:19:10 +0100
Subject: [PATCH] Stop re-requesting google auth permissions right after user
 denied them (#1307)

---
 .../android/habitica/ui/activities/LoginActivity.kt         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index 500603e13..c407e8d7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -294,7 +294,11 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
             }
         }
         if (requestCode == REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR) {
-            handleGoogleLoginResult()
+            // RESULT_CANCELED occurs when user denies requested permissions. In this case we don't
+            // want to immediately ask them to accept permissions again. See Issue #1290 on github.
+            if (resultCode != Activity.RESULT_CANCELED) {
+                handleGoogleLoginResult()
+            }
         }
 
         if (requestCode == FacebookSdk.getCallbackRequestCodeOffset()) {