diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index 5ae5ce981..2b73bb817 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -163,7 +163,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc new Thread(() -> { try { final int exit = doCustomInstall(runtime, modFile, javaArgs); - Logger.getInstance().appendToLog(getString(R.string.toast_optifine_success)); + Logger.appendToLog(getString(R.string.toast_optifine_success)); if (exit != 0) return; runOnUiThread(() -> { Toast.makeText(JavaGUILauncherActivity.this, R.string.toast_optifine_success, Toast.LENGTH_SHORT).show(); @@ -171,8 +171,8 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc }); } catch (Throwable e) { - Logger.getInstance().appendToLog("Install failed:"); - Logger.getInstance().appendToLog(Log.getStackTraceString(e)); + Logger.appendToLog("Install failed:"); + Logger.appendToLog(Log.getStackTraceString(e)); Tools.showError(JavaGUILauncherActivity.this, e); } }, "Installer").start(); @@ -300,7 +300,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc Collections.reverse(javaArgList); } - Logger.getInstance().appendToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0]))); + Logger.appendToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0]))); return JREUtils.launchJavaVM(this, runtime,null,javaArgList, LauncherPreferences.PREF_CUSTOM_JAVA_ARGS); } catch (Throwable th) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java index a2b696b71..168f83d14 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java @@ -7,13 +7,6 @@ import androidx.annotation.Keep; */ @Keep public class Logger { - - private static final Logger dummyLogger = new Logger(); - - public static Logger getInstance(){ - return dummyLogger; - } - /** Print the text to the log file if not censored */ public static native void appendToLog(String text); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 6b8384d86..6e4be0d16 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -316,7 +316,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe Tools.LOCAL_RENDERER = LauncherPreferences.PREF_RENDERER; } MinecraftAccount minecraftAccount = PojavProfile.getCurrentProfileContent(this, null); - Logger.getInstance().appendToLog("--------- beginning with launcher debug"); + Logger.appendToLog("--------- beginning with launcher debug"); printLauncherInfo(versionId); if (Tools.LOCAL_RENDERER.equals("vulkan_zink")) { checkVulkanZinkIsSupported(); @@ -329,13 +329,12 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe } private void printLauncherInfo(String gameVersion) { - Logger logger = Logger.getInstance(); - logger.appendToLog("Info: Launcher version: " + BuildConfig.VERSION_NAME); - logger.appendToLog("Info: Architecture: " + Architecture.archAsString(Tools.DEVICE_ARCHITECTURE)); - logger.appendToLog("Info: Device model: " + Build.MANUFACTURER + " " +Build.MODEL); - logger.appendToLog("Info: API version: " + Build.VERSION.SDK_INT); - logger.appendToLog("Info: Selected Minecraft version: " + gameVersion); - logger.appendToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); + Logger.appendToLog("Info: Launcher version: " + BuildConfig.VERSION_NAME); + Logger.appendToLog("Info: Architecture: " + Architecture.archAsString(Tools.DEVICE_ARCHITECTURE)); + Logger.appendToLog("Info: Device model: " + Build.MANUFACTURER + " " +Build.MODEL); + Logger.appendToLog("Info: API version: " + Build.VERSION.SDK_INT); + Logger.appendToLog("Info: Selected Minecraft version: " + gameVersion); + Logger.appendToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); } private void checkVulkanZinkIsSupported() { @@ -343,7 +342,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe || Build.VERSION.SDK_INT < 25 || !getPackageManager().hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_LEVEL) || !getPackageManager().hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION)) { - Logger.getInstance().appendToLog("Error: Vulkan Zink renderer is not supported!"); + Logger.appendToLog("Error: Vulkan Zink renderer is not supported!"); throw new RuntimeException(getString(R.string. mcn_check_fail_vulkan_support)); } } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index 7bff5727d..453bc77f8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -115,7 +115,7 @@ public class JREUtils { int len; while ((len = p.getInputStream().read(buf)) != -1) { String currStr = new String(buf, 0, len); - Logger.getInstance().appendToLog(currStr); + Logger.appendToLog(currStr); } if (p.waitFor() != 0) { @@ -125,12 +125,12 @@ public class JREUtils { if (failTime <= 10) { run(); } else { - Logger.getInstance().appendToLog("ERROR: Unable to get more log."); + Logger.appendToLog("ERROR: Unable to get more log."); } } } catch (Throwable e) { Log.e("jrelog-logcat", "Exception on logging thread", e); - Logger.getInstance().appendToLog("Exception on logging thread:\n" + Log.getStackTraceString(e)); + Logger.appendToLog("Exception on logging thread:\n" + Log.getStackTraceString(e)); } } }).start(); @@ -247,7 +247,7 @@ public class JREUtils { } } for (Map.Entry env : envMap.entrySet()) { - Logger.getInstance().appendToLog("Added custom env: " + env.getKey() + "=" + env.getValue()); + Logger.appendToLog("Added custom env: " + env.getKey() + "=" + env.getValue()); try { Os.setenv(env.getKey(), env.getValue(), true); }catch (NullPointerException exception){ @@ -297,7 +297,7 @@ public class JREUtils { userArgs.add(0,"java"); //argv[0] is the program name according to C standard. final int exitCode = VMLauncher.launchJVM(userArgs.toArray(new String[0])); - Logger.getInstance().appendToLog("Java Exit code: " + exitCode); + Logger.appendToLog("Java Exit code: " + exitCode); if (exitCode != 0) { activity.runOnUiThread(() -> { AlertDialog.Builder dialog = new AlertDialog.Builder(activity);