rebase on 2.28.1

Author: robertkirkman

include/SDL_system.h

@@ -415,6 +415,31 @@ extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(void);
  */
 extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void);
 
+/**
+ * Get the path used for external storage for this application.
+ *
+ * This path is unique to your application, but is public and can be written
+ * to by other applications.
+ *
+ * Your external storage path is typically:
+ * `/storage/sdcard0/Android/data/your.app.package/files`.
+ *
+ * \returns the path used for external storage for this application on success
+ *          or NULL on failure; call SDL_GetError() for more information.
+ *
+ * \since This function is available since SDL 2.0.0.
+ *
+ * \sa SDL_AndroidGetExternalStorageState
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetTopExternalStoragePath(void);
+
+/**
+ * Recursively copy all asset files and folders to the given directory
+ *
+ * \param destpath The target directory to which to copy all assets.
+ */
+extern DECLSPEC void SDLCALL SDL_AndroidCopyAssetFilesToDir(const char *destpath);
+
 /**
  * Request permissions at runtime.
  *

src/core/android/SDL_android.c

@@ -324,6 +324,7 @@ static jmethodID midManualBackButton;
 static jmethodID midMinimizeWindow;
 static jmethodID midOpenURL;
 static jmethodID midRequestPermission;
+static jmethodID midCopyAssetFilesToDir;
 static jmethodID midShowToast;
 static jmethodID midSendMessage;
 static jmethodID midSetActivityTitle;
@@ -612,6 +613,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
     midMinimizeWindow = (*env)->GetStaticMethodID(env, mActivityClass, "minimizeWindow", "()V");
     midOpenURL = (*env)->GetStaticMethodID(env, mActivityClass, "openURL", "(Ljava/lang/String;)I");
     midRequestPermission = (*env)->GetStaticMethodID(env, mActivityClass, "requestPermission", "(Ljava/lang/String;I)V");
+    midCopyAssetFilesToDir = (*env)->GetStaticMethodID(env, mActivityClass, "copyAssetFilesToDir", "(Ljava/lang/String;)V");
     midShowToast = (*env)->GetStaticMethodID(env, mActivityClass, "showToast", "(Ljava/lang/String;IIII)I");
     midSendMessage = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z");
     midSetActivityTitle = (*env)->GetStaticMethodID(env, mActivityClass, "setActivityTitle", "(Ljava/lang/String;)Z");
@@ -2531,11 +2533,69 @@ const char *SDL_AndroidGetExternalStoragePath(void)
     return s_AndroidExternalFilesPath;
 }
 
+const char * SDL_AndroidGetTopExternalStoragePath(void)
+{
+    static char *s_AndroidExternalFilesPath = NULL;
+
+    if (!s_AndroidExternalFilesPath) {
+        struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+        jclass cls;
+        jmethodID mid;
+        jobject fileObject;
+        jstring pathString;
+        const char *path;
+
+        JNIEnv *env = Android_JNI_GetEnv();
+        if (!LocalReferenceHolder_Init(&refs, env)) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* fileObj = context.getExternalStorageDirectory(); */
+        cls = (*env)->FindClass(env, "android/os/Environment");
+        mid = (*env)->GetStaticMethodID(env, cls,
+                "getExternalStorageDirectory", "()Ljava/io/File;");
+        fileObject = (*env)->CallStaticObjectMethod(env, cls, mid);
+        if (!fileObject) {
+            SDL_SetError("Couldn't get external directory");
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* path = fileObject.getAbsolutePath(); */
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
+                "getAbsolutePath", "()Ljava/lang/String;");
+        pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
+
+        path = (*env)->GetStringUTFChars(env, pathString, NULL);
+        s_AndroidExternalFilesPath = SDL_strdup(path);
+        (*env)->ReleaseStringUTFChars(env, pathString, path);
+
+        LocalReferenceHolder_Cleanup(&refs);
+    }
+    return s_AndroidExternalFilesPath;
+}
+
 SDL_bool SDL_AndroidRequestPermission(const char *permission)
 {
     return Android_JNI_RequestPermission(permission);
 }
 
+void SDL_AndroidCopyAssetFilesToDir(const char* destpath)
+{
+    Android_JNI_CopyAssetFilesToDir(destpath);
+}
+
+void Android_JNI_CopyAssetFilesToDir(const char *destpath)
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+    jstring jdestpath;
+
+    jdestpath = (*env)->NewStringUTF(env, destpath);
+    (*env)->CallStaticVoidMethod(env, mActivityClass, midCopyAssetFilesToDir, jdestpath);
+    (*env)->DeleteLocalRef(env, jdestpath);
+}
+
 int SDL_AndroidShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset)
 {
     return Android_JNI_ShowToast(message, duration, gravity, xOffset, yOffset);

src/core/android/SDL_android.h

@@ -130,6 +130,9 @@ SDL_bool Android_JNI_SetRelativeMouseEnabled(SDL_bool enabled);
 /* Request permission */
 SDL_bool Android_JNI_RequestPermission(const char *permission);
 
+/* Copy asset files */
+void Android_JNI_CopyAssetFilesToDir(const char *destpath);
+
 /* Show toast notification */
 int Android_JNI_ShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset);