From f37bd9363ff76cb642c9a8c5a41fa2e4699af90a Mon Sep 17 00:00:00 2001 From: Ishan09811 <156402647+Ishan09811@users.noreply.github.com> Date: Sun, 11 Feb 2024 16:57:38 +0530 Subject: [PATCH 1/2] use dialog instead of using toast when a rom is failed to load --- .../pandroid/view/PandaGlRenderer.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java index 41492962..a8e22e26 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java @@ -9,6 +9,7 @@ import android.opengl.GLSurfaceView; import android.os.Handler; import android.util.Log; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; import com.panda3ds.pandroid.AlberDriver; import com.panda3ds.pandroid.data.SMDH; import com.panda3ds.pandroid.data.config.GlobalConfig; @@ -90,28 +91,29 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer AlberDriver.Initialize(); AlberDriver.setShaderJitEnabled(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT)); - // If loading the ROM failed, display an error message and early exit - if (!AlberDriver.LoadRom(romPath)) { - // Get a handler that can be used to post to the main thread - Handler mainHandler = new Handler(context.getMainLooper()); + // If loading the ROM failed, display an error message and early exit + if (!AlberDriver.LoadRom(romPath)) { + // Get a handler that can be used to post to the main thread + Handler mainHandler = new Handler(context.getMainLooper()); - Runnable runnable = new Runnable() { - @Override - public void run() { - Toast - .makeText( - context, "Failed to load ROM! Make sure it's a valid 3DS ROM and that storage permissions are configured properly.", - Toast.LENGTH_LONG - ) - .show(); - } - }; - mainHandler.post(runnable); + Runnable runnable = new Runnable() { + @Override + public void run() { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle("Failed to load ROM") + .setMessage("Make sure it's a valid 3DS ROM and that storage permissions are configured properly.") + .setPositiveButton("OK", null) + .setCancelable(false) + .show(); + } + }; + mainHandler.post(runnable); + + GameMetadata game = GameUtils.getCurrentGame(); + GameUtils.removeGame(game); + return; + } - GameMetadata game = GameUtils.getCurrentGame(); - GameUtils.removeGame(game); - return; - } // Load the SMDH byte[] smdhData = AlberDriver.GetSmdh(); From adcc9d93e46a399dbeb6f054f5a568d5d2a0fbaa Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sun, 11 Feb 2024 13:50:50 +0200 Subject: [PATCH 2/2] Run clang-format --- .../pandroid/view/PandaGlRenderer.java | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java index a8e22e26..76dc5e7d 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java @@ -91,29 +91,28 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer AlberDriver.Initialize(); AlberDriver.setShaderJitEnabled(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT)); - // If loading the ROM failed, display an error message and early exit - if (!AlberDriver.LoadRom(romPath)) { - // Get a handler that can be used to post to the main thread - Handler mainHandler = new Handler(context.getMainLooper()); + // If loading the ROM failed, display an error message and early exit + if (!AlberDriver.LoadRom(romPath)) { + // Get a handler that can be used to post to the main thread + Handler mainHandler = new Handler(context.getMainLooper()); - Runnable runnable = new Runnable() { - @Override - public void run() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle("Failed to load ROM") - .setMessage("Make sure it's a valid 3DS ROM and that storage permissions are configured properly.") - .setPositiveButton("OK", null) - .setCancelable(false) - .show(); - } - }; - mainHandler.post(runnable); - - GameMetadata game = GameUtils.getCurrentGame(); - GameUtils.removeGame(game); - return; - } + Runnable runnable = new Runnable() { + @Override + public void run() { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle("Failed to load ROM") + .setMessage("Make sure it's a valid 3DS ROM and that storage permissions are configured properly.") + .setPositiveButton("OK", null) + .setCancelable(false) + .show(); + } + }; + mainHandler.post(runnable); + GameMetadata game = GameUtils.getCurrentGame(); + GameUtils.removeGame(game); + return; + } // Load the SMDH byte[] smdhData = AlberDriver.GetSmdh();