DNS fixes

Author: thejudge156

src/main/assets/hacks/resolv.conf

@@ -0,0 +1,2 @@
+nameserver 8.8.8.8
+nameserver 8.8.4.4

src/main/java/pojlib/install/Installer.java

@@ -176,8 +176,9 @@ public static void moveLocalAssets(Activity activity, MinecraftInstances.Instanc
             FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/config/modernfix-mixins.properties"), FileUtil.loadFromAssetToByte(activity,"modernfix-mixins.properties"));
             FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/options.txt"), FileUtil.loadFromAssetToByte(activity, "options.txt"));
             FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/servers.dat"), FileUtil.loadFromAssetToByte(activity, "servers.dat"));
-            FileUtils.writeByteArrayToFile(new File(Constants.USER_HOME + "/hacks/ResConfHack.jar"), FileUtil.loadFromAssetToByte(activity, "hacks/ResConfHack.jar"));
             FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/config/vivecraft-client-config.json"), FileUtil.loadFromAssetToByte(activity, "vivecraft-client-config.json"));
+            FileUtils.writeByteArrayToFile(new File(Constants.USER_HOME + "/hacks/ResConfHack.jar"), FileUtil.loadFromAssetToByte(activity, "hacks/ResConfHack.jar"));
+            FileUtils.writeByteArrayToFile(new File(Constants.USER_HOME + "/hacks/resolv.conf"), FileUtil.loadFromAssetToByte(activity, "hacks/resolv.conf"));
         } catch (IOException e) {
             e.printStackTrace();
         }

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

@@ -3,6 +3,9 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
 import android.os.Build;
 import android.system.ErrnoException;
 import android.system.Os;
@@ -14,7 +17,9 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -252,6 +257,22 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
         return exitCode;
     }
 
+    private static void writeDNS(Context ctx, File out) throws IOException {
+        FileWriter writer = new FileWriter(out);
+
+        ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
+        Network activeNetwork = cm.getActiveNetwork();
+        LinkProperties lp = cm.getLinkProperties(activeNetwork);
+        if(lp == null)
+            return;
+
+        List<InetAddress> dnsServers = lp.getDnsServers();
+        for (InetAddress dns : dnsServers) {
+            writer.write(String.format("nameserver %s\n", dns.getHostAddress()));
+            writer.flush();
+        }
+        writer.close();
+    }
 
     /**
      *  Gives an argument list filled with both the user args
@@ -260,6 +281,12 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
      * @return A list filled with args.
      */
     public static List<String> getJavaArgs(Context ctx, MinecraftInstances.Instance instance) {
+        File resConfFile = new File(Constants.USER_HOME + "/hacks/resolv.conf");
+        try {
+            writeDNS(ctx, resConfFile);
+        } catch (IOException e) {
+            Logger.getInstance().appendToLog("Couldn't write DNS servers! " + e.getMessage());
+        }
         return new ArrayList<>(Arrays.asList(
                 "-Djava.home=" + new File(ctx.getFilesDir(), "runtimes/JRE"),
                 "-Djava.io.tmpdir=" + ctx.getCacheDir().getAbsolutePath(),
@@ -276,9 +303,10 @@ public static List<String> getJavaArgs(Context ctx, MinecraftInstances.Instance
                 "-Dglfwstub.initEgl=false",
                 "-Dlog4j2.formatMsgNoLookups=true", //Log4j RCE mitigation
                 "-Dnet.minecraft.clientmodname=" + "QuestCraft",
-                "-Dext.net.resolvPath=" + Constants.USER_HOME + "/hacks/ResConfHack.jar",
+                "-Dext.net.resolvPath=" + resConfFile,
                 "-Dsodium.checks.issue2561=false",
-                "-Dorg.sqlite.lib.path=" + ctx.getApplicationInfo().nativeLibraryDir        ));
+                "-Dorg.sqlite.lib.path=" + ctx.getApplicationInfo().nativeLibraryDir
+        ));
     }
 
     /**