[Scummvm-git-logs] scummvm master -> 3e509f237901710555977f0711e4644538137360

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
60de117a8f ANDROID: Add helper method to compute assets path
3e509f2379 ANDROID: Use getScummVMAssetsPath to access the assets


Commit: 60de117a8f084ea02303f6d36c8973a25cd61ecf
    https://github.com/scummvm/scummvm/commit/60de117a8f084ea02303f6d36c8973a25cd61ecf
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-15T16:01:23+01:00

Commit Message:
ANDROID: Add helper method to compute assets path

Changed paths:
    backends/platform/android/jni-android.cpp
    backends/platform/android/jni-android.h


diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
index 874f6771b5a..156e0cb290e 100644
--- a/backends/platform/android/jni-android.cpp
+++ b/backends/platform/android/jni-android.cpp
@@ -502,6 +502,15 @@ Common::String JNI::getScummVMBasePath() {
 	return path;
 }
 
+Common::String JNI::getScummVMAssetsPath() {
+	Common::String basePath = getScummVMBasePath();
+	if (!basePath.empty() && basePath.lastChar() != '/') {
+		basePath += '/';
+	}
+	basePath += "assets";
+	return basePath;
+}
+
 Common::String JNI::getScummVMConfigPath() {
 	JNIEnv *env = JNI::getEnv();
 
diff --git a/backends/platform/android/jni-android.h b/backends/platform/android/jni-android.h
index d5d55b3a172..e2697b53788 100644
--- a/backends/platform/android/jni-android.h
+++ b/backends/platform/android/jni-android.h
@@ -95,6 +95,7 @@ public:
 	static void setOrientation(int touchMode);
 	static void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
 	static Common::String getScummVMBasePath();
+	static Common::String getScummVMAssetsPath();
 	static Common::String getScummVMConfigPath();
 	static Common::String getScummVMLogPath();
 	static jint getAndroidSDKVersionId();


Commit: 3e509f237901710555977f0711e4644538137360
    https://github.com/scummvm/scummvm/commit/3e509f237901710555977f0711e4644538137360
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-15T16:01:23+01:00

Commit Message:
ANDROID: Use getScummVMAssetsPath to access the assets

This fixes cacert lookup

Changed paths:
    backends/networking/curl/connectionmanager.cpp
    backends/platform/android/android.cpp


diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp
index d77affbfd88..c62333b3fc0 100644
--- a/backends/networking/curl/connectionmanager.cpp
+++ b/backends/networking/curl/connectionmanager.cpp
@@ -124,8 +124,8 @@ Common::String ConnectionManager::getCaCertPath() {
 #if defined(ANDROID_BACKEND)
 	// cacert path must exist on filesystem and be reachable by standard open syscall
 	// Lets use ScummVM internal directory
-	Common::String basePath = JNI::getScummVMBasePath();
-	return basePath + "/cacert.pem";
+	Common::String assetsPath = JNI::getScummVMAssetsPath();
+	return assetsPath + "/cacert.pem";
 #elif defined(DATA_PATH)
 	static enum {
 		kNotInitialized,
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index ea26cfeaf77..cc92bc970f4 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -593,8 +593,8 @@ void OSystem_Android::updateStartSettings(const Common::String &executable, Comm
 		return;
 	}
 
-	Common::Path gamesPath(JNI::getScummVMBasePath(), Common::Path::kNativeSeparator);
-	gamesPath.joinInPlace("assets/games");
+	Common::Path gamesPath(JNI::getScummVMAssetsPath(), Common::Path::kNativeSeparator);
+	gamesPath.joinInPlace("games");
 
 	// We need to init the ConfMan ourselves to cleanup outdated games
 	Common::SeekableReadStream *configStream = createConfigReadStream();