Merge pull request #18738 from hrydgard/string-cleanup

More cleanup and fixes

Common/System/Request.cpp

@@ -134,6 +134,7 @@ void System_CreateGameShortcut(const Path &path, const std::string &title) {
 	g_requestManager.MakeSystemRequest(SystemRequestType::CREATE_GAME_SHORTCUT, NO_REQUESTER_TOKEN, nullptr, nullptr, path.ToString(), title, 0);
 }
 
+// Also acts as just show folder, if you pass in a folder.
 void System_ShowFileInFolder(const Path &path) {
 	g_requestManager.MakeSystemRequest(SystemRequestType::SHOW_FILE_IN_FOLDER, NO_REQUESTER_TOKEN, nullptr, nullptr, path.ToString(), "", 0);
 }

Core/Core.cpp

@@ -105,7 +105,11 @@ void Core_Stop() {
 
 bool Core_ShouldRunBehind() {
 	// Enforce run-behind if ad-hoc connected
-	return g_Config.bRunBehindPauseMenu || __NetAdhocConnected();
+	return g_Config.bRunBehindPauseMenu || Core_MustRunBehind();
+}
+
+bool Core_MustRunBehind() {
+	return __NetAdhocConnected();
 }
 
 bool Core_IsStepping() {

Core/Core.h

@@ -39,6 +39,7 @@ void Core_SetGraphicsContext(GraphicsContext *ctx);
 void Core_EnableStepping(bool step, const char *reason = nullptr, u32 relatedAddress = 0);
 
 bool Core_ShouldRunBehind();
+bool Core_MustRunBehind();
 
 bool Core_NextFrame();
 void Core_DoSingleStep();

Core/HLE/proAdhoc.cpp

@@ -2267,7 +2267,7 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
 		socklen_t addrLen = sizeof(LocalIP);
 		memset(&LocalIP, 0, addrLen);
 		getsockname((int)metasocket, &LocalIP, &addrLen);
-		g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network Initialized"), 1.0);
+		g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network initialized"), 1.0);
 		return 0;
 	} else {
 		return SOCKET_ERROR;

UI/DriverManagerScreen.cpp

@@ -200,6 +200,9 @@ UI::EventReturn DriverManagerScreen::OnCustomDriverChange(UI::EventParams &e) {
 }
 
 UI::EventReturn DriverManagerScreen::OnCustomDriverUninstall(UI::EventParams &e) {
+	if (e.s.empty()) {
+		return UI::EVENT_DONE;
+	}
 	INFO_LOG(G3D, "Uninstalling driver: %s", e.s.c_str());
 
 	Path folder = GetDriverPath() / e.s;

UI/MemStickScreen.cpp

@@ -753,6 +753,7 @@ UI::EventReturn ConfirmMemstickMoveScreen::OnConfirm(UI::EventParams &params) {
 				}
 
 				// Delete all the old, now hopefully empty, directories.
+				// Hopefully DeleteDir actually fails if it contains a file...
 				for (auto &dirSuffix : directorySuffixesToCreate) {
 					Path dir = moveSrc / dirSuffix;
 					if (dryRun) {

UI/PauseScreen.cpp

@@ -36,6 +36,7 @@
 #include "Core/Reporting.h"
 #include "Core/SaveState.h"
 #include "Core/System.h"
+#include "Core/Core.h"
 #include "Core/Config.h"
 #include "Core/RetroAchievements.h"
 #include "Core/ELF/ParamSFO.h"
@@ -441,15 +442,20 @@ void GamePauseScreen::CreateViews() {
 		rightColumnItems->Add(new Choice(pa->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
 	}
 
-	ViewGroup *playControls = rightColumnHolder->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
-	playControls->SetTag("debug");
-	playControls->Add(new Spacer(new LinearLayoutParams(1.0f)));
-	playButton_ = playControls->Add(new Button("", g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"), new LinearLayoutParams(0.0f, G_RIGHT)));
-	playButton_->OnClick.Add([=](UI::EventParams &e) {
-		g_Config.bRunBehindPauseMenu = !g_Config.bRunBehindPauseMenu;
-		playButton_->SetImageID(g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"));
-		return UI::EVENT_DONE;
-	});
+	if (!Core_MustRunBehind()) {
+		ViewGroup *playControls = rightColumnHolder->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
+		playControls->SetTag("debug");
+		playControls->Add(new Spacer(new LinearLayoutParams(1.0f)));
+		playButton_ = playControls->Add(new Button("", g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"), new LinearLayoutParams(0.0f, G_RIGHT)));
+		playButton_->OnClick.Add([=](UI::EventParams &e) {
+			g_Config.bRunBehindPauseMenu = !g_Config.bRunBehindPauseMenu;
+			playButton_->SetImageID(g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"));
+			return UI::EVENT_DONE;
+		});
+	} else {
+		auto nw = GetI18NCategory(I18NCat::NETWORKING);
+		rightColumnHolder->Add(new TextView(nw->T("Network connected")));
+	}
 	rightColumnHolder->Add(new Spacer(10.0f));
 }
 

android/jni/app-android.cpp

@@ -486,7 +486,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
 	case SYSPROP_HAS_TEXT_INPUT_DIALOG:
 		return true;
 	case SYSPROP_HAS_OPEN_DIRECTORY:
-		return false;
+		return false;  // We have this implemented but it may or may not work depending on if a file explorer is installed.
 	case SYSPROP_HAS_ADDITIONAL_STORAGE:
 		return !g_additionalStorageDirs.empty();
 	case SYSPROP_HAS_BACK_BUTTON:
@@ -1144,6 +1144,9 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	case SystemRequestType::NOTIFY_UI_STATE:
 		PushCommand("uistate", param1);
 		return true;
+	case SystemRequestType::SHOW_FILE_IN_FOLDER:
+		PushCommand("show_folder", param1);
+		return true;
 	default:
 		return false;
 	}

android/src/org/ppsspp/ppsspp/NativeActivity.java

@@ -1633,8 +1633,25 @@ public boolean processCommand(String command, String params) {
 				throw new Exception();
 			} catch (Exception e) {
 				NativeApp.reportException(e, params);
-
-
+			}
+		} else if (command.equals("show_folder")) {
+			try {
+				Uri selectedUri = Uri.parse(params);
+				Intent intent = new Intent(Intent.ACTION_VIEW);
+				intent.setDataAndType(selectedUri, "resource/folder");
+				if (intent.resolveActivityInfo(getPackageManager(), 0) != null) {
+					startActivity(intent);
+					Log.i(TAG, "Started activity for " + params);
+					return true;
+				} else {
+					Log.w(TAG, "No file explorer installed");
+					// if you reach this place, it means there is no any file
+					// explorer app installed on your device
+					return false;
+				}
+			} catch (Exception e) {
+				NativeApp.reportException(e, params);
+				return false;
 			}
 		}
 		return false;

assets/lang/ar_AE.ini

@@ -893,7 +893,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -912,7 +912,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = ‎الشبكة تُطلق
+Network connected = Network connected
+Network initialized = ‎الشبكة تُطلق
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/az_AZ.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/bg_BG.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/ca_ES.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/cz_CZ.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Povolit zabudovaný server PRO ad hoc
 Enable network chat = Enable network chat
-Enable networking = Povolit síť/WLAN (zkušební verze, může způsobit chyby)
+Enable networking = Povolit síť/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Síť zavedena
+Network connected = Network connected
+Network initialized = Síť zavedena
 Please change your Port Offset = Please change your port offset
 Port offset = Odchylka portu (0 = Kompatibilita s PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/da_DK.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Tillad indbygget PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Aktiver netværk/WLAN (beta, kan ødelægge spilafvikling)
+Enable networking = Aktiver netværk/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Netværk er initialiseret
+Network connected = Network connected
+Network initialized = Netværk er initialiseret
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP kompatibilitet)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/de_DE.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Vom Ad hoc Server getrennt
 DNS Error Resolving = DNS Fehler Lösung
 Enable built-in PRO Adhoc Server = Aktiviere integrierten proAdhocServer
 Enable network chat = Aktivierte Netzwerk Chat
-Enable networking = Aktiviere Netzwerk/Wlan (Beta)
+Enable networking = Aktiviere Netzwerk/Wlan
 Enable UPnP = Aktiviere UPnP (braucht ein paar Sekunden)
 EnableQuickChat = Aktiviere Quick-Chat
 Enter a new PSP nickname = Trage neuen PSP Nicknamen ein
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Ungültige IP oder Hostnamen
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Netzwerk initialisiert
+Network connected = Network connected
+Network initialized = Netzwerk initialisiert
 Please change your Port Offset = Bitte ändern sie Ihren Port-Offset
 Port offset = Portverschiebung (0 = PSP Kompatibilität)
 Open PPSSPP Multiplayer Wiki Page = PPSSPP Ad-Hoc Wiki Seite

assets/lang/dr_ID.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/en_US.ini

@@ -879,7 +879,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -898,7 +898,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/es_ES.ini

@@ -886,7 +886,7 @@ Disconnected from AdhocServer = Desconectado del servidor Adhoc
 DNS Error Resolving = Resolviendo error DNS
 Enable built-in PRO Adhoc Server = Activar servidor "Adhoc PRO" integrado
 Enable network chat = Activar chat de red
-Enable networking = Activar juego en red/WLAN (beta)
+Enable networking = Activar juego en red/WLAN
 Enable UPnP = Activar UPnP
 EnableQuickChat = Activar chat rápido
 Enter a new PSP nickname = Introducir nuevo nick PSP
@@ -905,7 +905,8 @@ Hostname = Nombre del host
 Invalid IP or hostname = IP o nombre del host inválido
 Minimum Timeout = Tiempo de espera mínimo (en ms, 0 por defecto)
 Misc = Otros ajustes (por defecto = compatibilidad)
-Network Initialized = Juego en red iniciado
+Network connected = Network connected
+Network initialized = Juego en red iniciado
 Please change your Port Offset = Por favor cambia el offset del puerto.
 Port offset = Variar puerto de red (0 = compatible con PSP)
 Open PPSSPP Multiplayer Wiki Page = Página wiki sobre PPSSPP Ad-Hoc

assets/lang/es_LA.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = IP o nombre de host no válido
 Minimum Timeout = Tiempo de espera mínimo (en ms, 0 = por defecto)
 Misc = Otros ajustes (por defecto = compatibilidad con PSP)
-Network Initialized = Juego en red iniciado
+Network connected = Network connected
+Network initialized = Juego en red iniciado
 Please change your Port Offset = Por favor cambia el offset del puerto.
 Port offset = Variar puerto de red (0 = compatibilidad con PSP)
 Open PPSSPP Multiplayer Wiki Page = Página wiki sobre PPSSPP Ad-Hoc

assets/lang/fa_IR.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/fi_FI.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Disconnected from ad hoc server
 DNS Error Resolving = DNS error resolving
 Enable built-in PRO Adhoc Server = Enable built-in PRO ad hoc server
 Enable network chat = Enable network chat
-Enable networking = Enable networking/WLAN (beta, may break games)
+Enable networking = Enable networking/WLAN
 Enable UPnP = Enable UPnP (need a few seconds to detect)
 EnableQuickChat = Enable quick chat
 Enter a new PSP nickname = Enter a new PSP nickname
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/fr_FR.ini

@@ -885,7 +885,7 @@ Disconnected from AdhocServer = Déconnecté du serveur ad hoc
 DNS Error Resolving = Erreur DNS pour résoudre
 Enable built-in PRO Adhoc Server = Activer le serveur ad hoc intégré
 Enable network chat = Activer le chat
-Enable networking = Activer le réseau/WLAN (expérimental)
+Enable networking = Activer le réseau/WLAN
 Enable UPnP = Activer UPnP (nécessite quelques secondes pour la détection)
 EnableQuickChat = Activer le chat rapide
 Enter a new PSP nickname = Entrer un nouveau pseudo
@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = IP ou nom de domaine invalide
 Minimum Timeout = Temps d'expiration minimum (forçage en ms, 0 = par défaut)
 Misc = Divers (par défaut = compatibilité PSP)
-Network Initialized = Réseau initialisé !
+Network connected = Network connected
+Network initialized = Réseau initialisé !
 Please change your Port Offset = Veuillez changer votre décalage de port
 Port offset = Décalage de port (0 = compatibilité PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page