From 7670c5cf896cd8bc033a5c77ce7d0a5697f31ee2 Mon Sep 17 00:00:00 2001
From: alexytomi <60690056+alexytomi@users.noreply.github.com>
Date: Mon, 30 Jun 2025 18:32:18 +0800
Subject: [PATCH] fix[MinecraftAccount.load()]: Fix crash when accounts.json is
 malformed

---
 .../java/net/kdt/pojavlaunch/value/MinecraftAccount.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
index 4c524da5d..daf857dee 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
@@ -13,6 +13,7 @@ import android.graphics.Bitmap;
 import android.util.Base64;
 
 import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
 
 import org.apache.commons.io.IOUtils;
 
@@ -68,7 +69,7 @@ public class MinecraftAccount {
     public static MinecraftAccount parse(String content) throws JsonSyntaxException {
         return Tools.GLOBAL_GSON.fromJson(content, MinecraftAccount.class);
     }
-
+    @Nullable
     public static MinecraftAccount load(String name) {
         if(!accountExists(name)) return null;
         try {
@@ -92,7 +93,7 @@ public class MinecraftAccount {
                 acc.msaRefreshToken = "0";
             }
             return acc;
-        } catch(IOException | JsonSyntaxException e) {
+        } catch(NullPointerException | IOException | JsonSyntaxException e) {
             Log.e(MinecraftAccount.class.getName(), "Caught an exception while loading the profile",e);
             return null;
         }