Auth: Make sure we throw the IOException as before, so we don't run i…

…nto null referenes later
e-foundation · Sep 25, 2024 · ea108d7 · ea108d7
1 parent 79099a2
commit ea108d7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
@@ -13,6 +13,7 @@
 import android.net.Uri;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import org.microg.gms.accountaction.ErrorResolverKt;
 import org.microg.gms.accountaction.Resolution;
 import org.microg.gms.common.NotOkayException;
@@ -254,20 +255,23 @@ private boolean isSystemApp() {
         }
     }
 
+    @NonNull
     public AuthResponse requestAuthWithBackgroundResolution(boolean legacy) throws IOException {
         try {
             return requestAuth(legacy);
         } catch (NotOkayException e) {
             if (e.getMessage() != null) {
                 Resolution errorResolution = ErrorResolverKt.resolveAuthErrorMessage(context, e.getMessage());
                 if (errorResolution != null) {
-                    return ErrorResolverKt.initiateFromBackgroundBlocking(
+                    AuthResponse response = ErrorResolverKt.initiateFromBackgroundBlocking(
                             errorResolution,
                             context,
                             getAccount(),
                             // infinite loop is prevented
                             () -> requestAuth(legacy)
                     );
+                    if (response == null) throw new IOException(e);
+                    return response;
                 } else {
                     throw new IOException(e);
                 }
@@ -277,20 +281,23 @@ public AuthResponse requestAuthWithBackgroundResolution(boolean legacy) throws I
         }
     }
 
+    @NonNull
     public AuthResponse requestAuthWithForegroundResolution(boolean legacy) throws IOException {
         try {
             return requestAuth(legacy);
         } catch (NotOkayException e) {
             if (e.getMessage() != null) {
                 Resolution errorResolution = ErrorResolverKt.resolveAuthErrorMessage(context, e.getMessage());
                 if (errorResolution != null) {
-                    return ErrorResolverKt.initiateFromForegroundBlocking(
+                    AuthResponse response = ErrorResolverKt.initiateFromForegroundBlocking(
                             errorResolution,
                             context,
                             getAccount(),
                             // infinite loop is prevented
                             () -> requestAuth(legacy)
                     );
+                    if (response == null) throw new IOException(e);
+                    return response;
                 } else {
                     throw new IOException(e);
                 }
@@ -300,6 +307,7 @@ public AuthResponse requestAuthWithForegroundResolution(boolean legacy) throws I
         }
     }
 
+    @NonNull
     public AuthResponse requestAuth(boolean legacy) throws IOException {
         if (service.equals(AuthConstants.SCOPE_GET_ACCOUNT_ID)) {
             AuthResponse response = new AuthResponse();