From 04a6166c9005d983df8c4821e644893700b5ea88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 31 Aug 2026 11:01:16 +0200 Subject: [PATCH] Android: Remove some unused code --- Common/System/System.h | 1 - SDL/SDLMain.cpp | 1 - Windows/main.cpp | 1 - android/jni/app-android.cpp | 1 - android/src/org/ppsspp/ppsspp/PpssppActivity.java | 8 +++----- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Common/System/System.h b/Common/System/System.h index 77f829043d..d2ce08d675 100644 --- a/Common/System/System.h +++ b/Common/System/System.h @@ -46,7 +46,6 @@ enum { enum class LaunchUrlType { BROWSER_URL, - MARKET_URL, EMAIL_ADDRESS, LOCAL_FILE, LOCAL_FOLDER, // Shows the folder. Not supported on all systems of course. diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index c20b1303ab..28a9ec26dd 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -941,7 +941,6 @@ std::vector System_GetCameraDeviceList() { void System_LaunchUrl(LaunchUrlType urlType, std::string_view url) { switch (urlType) { case LaunchUrlType::BROWSER_URL: - case LaunchUrlType::MARKET_URL: { #if PPSSPP_PLATFORM(SWITCH) Uuid uuid = { 0 }; diff --git a/Windows/main.cpp b/Windows/main.cpp index 97cc7a7ba8..2bb6bf5a31 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -144,7 +144,6 @@ void System_LaunchUrl(LaunchUrlType urlType, std::string_view url) { case LaunchUrlType::BROWSER_URL: case LaunchUrlType::LOCAL_FILE: case LaunchUrlType::LOCAL_FOLDER: - case LaunchUrlType::MARKET_URL: case LaunchUrlType::EMAIL_ADDRESS: // ShellExecute handles everything. { diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 9e458f1ce3..6ec11565c2 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -283,7 +283,6 @@ void System_Vibrate(int length_ms) { void System_LaunchUrl(LaunchUrlType urlType, std::string_view url) { switch (urlType) { case LaunchUrlType::BROWSER_URL: PushCommand("launchBrowser", url); break; - case LaunchUrlType::MARKET_URL: PushCommand("launchMarket", url); break; case LaunchUrlType::EMAIL_ADDRESS: PushCommand("launchEmail", url); break; // Can't really support the below well on Android... case LaunchUrlType::LOCAL_FOLDER: break; diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java index a3d1c92ccf..ba6dc18e3a 100644 --- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java +++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java @@ -1487,6 +1487,9 @@ public class PpssppActivity extends AppCompatActivity implements SensorEventList return false; } } else { + // Don't need a separate launchMarket, can just use launchBrowser with a market: + // http://stackoverflow.com/questions/3442366/android-link-to-market-from-inside-another-app + // http://developer.android.com/guide/publishing/publishing.html#marketintent try { Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(params)); startActivity(i); @@ -1591,11 +1594,6 @@ public class PpssppActivity extends AppCompatActivity implements SensorEventList Log.e(TAG, e.toString()); return false; } - } else if (command.equals("launchMarket")) { - // Don't need this, can just use launchBrowser with a market: - // http://stackoverflow.com/questions/3442366/android-link-to-market-from-inside-another-app - // http://developer.android.com/guide/publishing/publishing.html#marketintent - return false; } else if (command.equals("toast")) { Toast toast = Toast.makeText(this, params, Toast.LENGTH_LONG); toast.show();