[Scummvm-git-logs] scummvm master -> 5ecae89722cd2be4acf0fb2090642592a3c9d50a

[ccawley2011]

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

Summary:
5ecae89722 ANDROID3D: Fix JNI code


Commit: 5ecae89722cd2be4acf0fb2090642592a3c9d50a
    https://github.com/scummvm/scummvm/commit/5ecae89722cd2be4acf0fb2090642592a3c9d50a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-02T17:28:35+01:00

Commit Message:
ANDROID3D: Fix JNI code

Changed paths:
    backends/platform/android/jni-android.cpp
    backends/platform/android3d/org/residualvm/residualvm/ResidualVM.java
    backends/platform/android3d/org/residualvm/residualvm/ResidualVMActivity.java


diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
index 7baa3683dd..33ae214ade 100644
--- a/backends/platform/android/jni-android.cpp
+++ b/backends/platform/android/jni-android.cpp
@@ -387,6 +387,7 @@ void JNI::showKeyboardControl(bool enable) {
 }
 
 void JNI::showSAFRevokePermsControl(bool enable) {
+#ifndef BACKEND_ANDROID3D
 	JNIEnv *env = JNI::getEnv();
 
 	env->CallVoidMethod(_jobj, _MID_showSAFRevokePermsControl, enable);
@@ -397,6 +398,7 @@ void JNI::showSAFRevokePermsControl(bool enable) {
 		env->ExceptionDescribe();
 		env->ExceptionClear();
 	}
+#endif
 }
 
 // The following adds assets folder to search set.
@@ -569,15 +571,17 @@ void JNI::create(JNIEnv *env, jobject self, jobject asset_manager,
 	FIND_METHOD(, isConnectionLimited, "()Z");
 	FIND_METHOD(, showVirtualKeyboard, "(Z)V");
 	FIND_METHOD(, showKeyboardControl, "(Z)V");
-	FIND_METHOD(, showSAFRevokePermsControl, "(Z)V");
 	FIND_METHOD(, getSysArchives, "()[Ljava/lang/String;");
 	FIND_METHOD(, getAllStorageLocations, "()[Ljava/lang/String;");
 	FIND_METHOD(, initSurface, "()Ljavax/microedition/khronos/egl/EGLSurface;");
 	FIND_METHOD(, deinitSurface, "()V");
+#ifndef BACKEND_ANDROID3D
+	FIND_METHOD(, showSAFRevokePermsControl, "(Z)V");
 	FIND_METHOD(, createDirectoryWithSAF, "(Ljava/lang/String;)Z");
 	FIND_METHOD(, createFileWithSAF, "(Ljava/lang/String;)Ljava/lang/String;");
 	FIND_METHOD(, closeFileWithSAF, "(Ljava/lang/String;)V");
 	FIND_METHOD(, isDirectoryWritableWithSAF, "(Ljava/lang/String;)Z");
+#endif
 
 	_jobj_egl = env->NewGlobalRef(egl);
 	_jobj_egl_display = env->NewGlobalRef(egl_display);
@@ -797,6 +801,7 @@ Common::Array<Common::String> JNI::getAllStorageLocations() {
 }
 
 bool JNI::createDirectoryWithSAF(const Common::String &dirPath) {
+#ifndef BACKEND_ANDROID3D
 	JNIEnv *env = JNI::getEnv();
 	jstring javaDirPath = env->NewStringUTF(dirPath.c_str());
 
@@ -811,10 +816,13 @@ bool JNI::createDirectoryWithSAF(const Common::String &dirPath) {
 	}
 
 	return created;
-
+#else
+	return false;
+#endif
 }
 
 Common::U32String JNI::createFileWithSAF(const Common::String &filePath) {
+#ifndef BACKEND_ANDROID3D
 	JNIEnv *env = JNI::getEnv();
 	jstring javaFilePath = env->NewStringUTF(filePath.c_str());
 
@@ -834,10 +842,13 @@ Common::U32String JNI::createFileWithSAF(const Common::String &filePath) {
 	env->DeleteLocalRef(hackyFilenameJSTR);
 
 	return hackyFilenameStr;
-
+#else
+	return Common::U32String();
+#endif
 }
 
 void JNI::closeFileWithSAF(const Common::String &hackyFilename) {
+#ifndef BACKEND_ANDROID3D
 	JNIEnv *env = JNI::getEnv();
 	jstring javaHackyFilename = env->NewStringUTF(hackyFilename.c_str());
 
@@ -849,10 +860,11 @@ void JNI::closeFileWithSAF(const Common::String &hackyFilename) {
 		env->ExceptionDescribe();
 		env->ExceptionClear();
 	}
-
+#endif
 }
 
 bool JNI::isDirectoryWritableWithSAF(const Common::String &dirPath) {
+#ifndef BACKEND_ANDROID3D
 	JNIEnv *env = JNI::getEnv();
 	jstring javaDirPath = env->NewStringUTF(dirPath.c_str());
 
@@ -867,7 +879,9 @@ bool JNI::isDirectoryWritableWithSAF(const Common::String &dirPath) {
 	}
 
 	return isWritable;
-
+#else
+	return false;
+#endif
 }
 
 #endif
diff --git a/backends/platform/android3d/org/residualvm/residualvm/ResidualVM.java b/backends/platform/android3d/org/residualvm/residualvm/ResidualVM.java
index 5de94d5821..79a1bc5c43 100644
--- a/backends/platform/android3d/org/residualvm/residualvm/ResidualVM.java
+++ b/backends/platform/android3d/org/residualvm/residualvm/ResidualVM.java
@@ -51,7 +51,8 @@ public abstract class ResidualVM implements SurfaceHolder.Callback, Runnable {
 	// Feed an event to ResidualVM.  Safe to call from other threads.
 	final public native void pushEvent(int type, int arg1, int arg2, int arg3,
 										int arg4, int arg5, int arg6);
-	final public native String getCurrentCharset();
+
+	final public native String getNativeVersionInfo();
 
 	// Callbacks from C++ peer instance
 	abstract protected void getDPI(float[] values);
diff --git a/backends/platform/android3d/org/residualvm/residualvm/ResidualVMActivity.java b/backends/platform/android3d/org/residualvm/residualvm/ResidualVMActivity.java
index fa8fedb774..6940483d6f 100644
--- a/backends/platform/android3d/org/residualvm/residualvm/ResidualVMActivity.java
+++ b/backends/platform/android3d/org/residualvm/residualvm/ResidualVMActivity.java
@@ -152,7 +152,6 @@ public class ResidualVMActivity extends Activity {
 		@Override
 		protected void displayMessageOnOSD(final String msg) {
 			if (msg != null) {
-				Log.i(LOG_TAG, "MessageOnOSD: " + msg + " " + getCurrentCharset());
 				runOnUiThread(new Runnable() {
 					public void run() {
 						Toast.makeText(ResidualVMActivity.this, msg, Toast.LENGTH_SHORT).show();