Wifi check enhancements, dns check

Author: thejudge156

src/main/java/pojlib/API.java

@@ -46,7 +46,7 @@ public class API {
     public static MinecraftAccount currentAcc;
     public static boolean isDemoMode;
     public static MinecraftInstances.Instance currentInstance;
-    public static boolean hasWifi;
+    private static boolean hasWifi;
     public static boolean advancedDebugger;
     public static boolean gameReady = false;
 
@@ -90,8 +90,8 @@ public static boolean removeExtraProject(MinecraftInstances instances, Minecraft
         return InstanceHandler.removeExtraProject(instances, instance, name);
     }
 
-    public static String[] getQCSupportedVersions() {
-        return APIHandler.getQCSupportedVersions();
+    public static String[] getQCSupportedVersions(Context ctx) {
+        return APIHandler.getQCSupportedVersions(ctx);
     }
 
     /**
@@ -170,7 +170,7 @@ public static MinecraftInstances.Instance createNewInstance(Activity activity, M
     public static void prelaunch(Activity activity, MinecraftInstances instances, MinecraftInstances.Instance instance) {
         gameReady = false;
         instance.updateMods(instances);
-        if (hasWifi) {
+        if (hasConnection(activity)) {
             try {
                 JREUtils.prelaunchCheck(activity, instance);
             } catch (IOException e) {
@@ -233,7 +233,7 @@ public static void login(Activity activity, @Nullable String accountUUID)
         }
 
         MinecraftAccount acc = MinecraftAccount.load(activity.getFilesDir() + "/accounts", accountUUID);
-        if(acc != null && (acc.expiresOn >= System.currentTimeMillis() || !hasWifi || acc.isDemoMode)) {
+        if(acc != null && (acc.expiresOn >= System.currentTimeMillis() || !hasConnection(activity) || acc.isDemoMode)) {
             currentAcc = acc;
             API.profileImage = MinecraftAccount.getSkinFaceUrl(API.currentAcc);
             API.profileName = API.currentAcc.username;
@@ -260,7 +260,7 @@ public static void login(Activity activity, @Nullable String accountUUID)
      * @param activity activity object
      * @return true if the device has a valid wifi connection
      */
-    public static boolean hasConnection(Activity activity) {
+    public static boolean hasConnection(Context activity) {
         boolean hasNetwork = false;
         ConnectivityManager connManager = (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkCapabilities capabilities = connManager.getNetworkCapabilities(connManager.getActiveNetwork());

src/main/java/pojlib/APIHandler.java

@@ -1,5 +1,7 @@
 package pojlib;
 
+import android.content.Context;
+
 import com.google.gson.Gson;
 
 import java.io.BufferedReader;
@@ -110,15 +112,26 @@ public static <T> T postFullUrl(String url, HashMap<String, Object> query, T bod
 
     public static final String SUPPORTED_VERSIONS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/refs/heads/QuestCraft-6.0.0/supportedVersions.json";
 
-    public static String[] getQCSupportedVersions() {
+    public static String[] getQCSupportedVersions(Context ctx) {
         File versionsJson = new File(Constants.USER_HOME + "/supportedVersions.json");
-        try {
-            DownloadUtils.downloadFile(SUPPORTED_VERSIONS, versionsJson, new DownloadManager(1));
-        } catch (IOException e) {
-            Logger.getInstance().appendToLog("Error while grabbing supported versions!\n" + e);
+        if(API.hasConnection(ctx)) {
+            try {
+                DownloadUtils.downloadFile(SUPPORTED_VERSIONS, versionsJson, new DownloadManager(1));
+            } catch (IOException e) {
+                Logger.getInstance().appendToLog("Error while grabbing supported versions!\n" + e);
+            }
+        } else {
+            Logger.getInstance().appendToLog("Skipping supported versions download.");
+        }
+
+        SupportedVersions versions = GsonUtils.jsonFileToObject(versionsJson.getAbsolutePath(), SupportedVersions.class);
+        if(versions == null) {
+            return new String[] {
+                    "1.21.4"
+            };
         }
 
-        return GsonUtils.jsonFileToObject(versionsJson.getAbsolutePath(), SupportedVersions.class).supportedVersions;
+        return versions.supportedVersions;
     }
 
     public static class SupportedVersions {

src/main/java/pojlib/util/JREUtils.java

@@ -260,6 +260,14 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
     private static void writeDNS(Context ctx, File out) throws IOException {
         FileWriter writer = new FileWriter(out);
 
+        if(!API.hasConnection(ctx)) {
+            writer.write("nameserver 8.8.8.8\n");
+            writer.write("nameserver 8.8.4.4");
+            writer.flush();
+            writer.close();
+            return;
+        }
+
         ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
         Network activeNetwork = cm.getActiveNetwork();
         LinkProperties lp = cm.getLinkProperties(activeNetwork);

src/main/java/pojlib/util/download/DownloadUtils.java

@@ -53,13 +53,15 @@ public static void downloadFile(String url, File out, DownloadManager downloadMa
                 tempOut.renameTo(out);
                 bos2.close();
                 if (tempOut.exists()) tempOut.delete();
-
+                API.finishedDownloading = true;
             } catch (IOException th2) {
                 if (tempOut.exists()) tempOut.delete();
+                API.finishedDownloading = true;
                 throw th2;
             }
         } catch (IOException e) {
             if (tempOut.exists()) tempOut.delete();
+            API.finishedDownloading = true;
             throw e;
         }
     }