Lots of Android fixes and stubs. Increase SDL log level on Android. Add GL context loss handling.

AerofoilAndroid/app/jni/main/GpFileSystem_Android.cpp

@@ -2,6 +2,7 @@
 #include "GpFileSystem_Android.h"
 #include "GpIOStream.h"
 #include "HostDirectoryCursor.h"
+#include "IGpThreadRelay.h"
 #include "VirtualDirectory.h"
 
 #include "SDL.h"
@@ -254,7 +255,32 @@ void GpFileStream_Android_File::Flush()
 	fflush(m_f);
 }
 
-static bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution, bool &isAsset)
+bool GpFileSystem_Android::ResolvePathInDownloadsDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution, bool &isAsset)
+{
+	JNIEnv *jni = static_cast<JNIEnv *>(SDL_AndroidGetJNIEnv());
+
+	jstring fname = jni->NewStringUTF(paths[0]);
+
+	jobject resultName = jni->CallObjectMethod(m_activity, this->m_selectSourceExportPathMID, fname);
+	int n = 0;
+	jstring resultPath = static_cast<jstring>(resultName);
+	jni->DeleteLocalRef(fname);
+
+	const char *pathStrChars = jni->GetStringUTFChars(resultPath, nullptr);
+	resolution = std::string(pathStrChars, static_cast<size_t>(jni->GetStringUTFLength(resultPath)));
+
+	jni->ReleaseStringUTFChars(resultPath, pathStrChars);
+	jni->DeleteLocalRef(resultPath);
+
+	resolution = SDL_AndroidGetExternalStoragePath();
+	resolution += "/SourceCode.zip";
+
+	isAsset = false;
+
+	return true;
+}
+
+bool GpFileSystem_Android::ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution, bool &isAsset)
 {
 	const char *prefsAppend = nullptr;
 
@@ -285,6 +311,8 @@ static bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, c
 	case PortabilityLayer::VirtualDirectories::kPrefs:
 		prefsAppend = "Prefs";
 		break;
+	case PortabilityLayer::VirtualDirectories::kSourceExport:
+		return ResolvePathInDownloadsDirectory(virtualDirectory, paths, numPaths, resolution, isAsset);
 	default:
 		return false;
 	};
@@ -308,6 +336,7 @@ static bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, c
 
 GpFileSystem_Android::GpFileSystem_Android()
 	: m_activity(nullptr)
+	, m_relay(nullptr)
 {
 }
 
@@ -323,6 +352,7 @@ void GpFileSystem_Android::InitJNI()
 	jclass activityClassLR = static_cast<jclass>(jni->GetObjectClass(activityLR));
 
 	m_scanAssetDirectoryMID = jni->GetMethodID(activityClassLR, "scanAssetDirectory", "(Ljava/lang/String;)[Ljava/lang/String;");
+	m_selectSourceExportPathMID = jni->GetMethodID(activityClassLR, "selectSourceExportPath", "(Ljava/lang/String;)Ljava/lang/String;");
 
 	m_activity = jni->NewGlobalRef(activityLR);
 
@@ -407,7 +437,8 @@ GpIOStream *GpFileSystem_Android::OpenFileNested(PortabilityLayer::VirtualDirect
 	bool canWrite = false;
 	bool needResetPosition = false;
 
-	switch (createDisposition) {
+	switch (createDisposition)
+	{
 		case GpFileCreationDispositions::kCreateOrOverwrite:
 			mode = "w+b";
 			break;
@@ -506,6 +537,25 @@ bool GpFileSystem_Android::DeleteFile(PortabilityLayer::VirtualDirectory_t virtu
 }
 
 PortabilityLayer::HostDirectoryCursor *GpFileSystem_Android::ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *const *paths, size_t numPaths)
+{
+	ScanDirectoryNestedContext ctx;
+	ctx.m_this = this;
+	ctx.m_returnValue = nullptr;
+	ctx.m_virtualDirectory = virtualDirectory;
+	ctx.m_paths = paths;
+	ctx.m_numPaths = numPaths;
+	m_relay->Invoke(ScanDirectoryNestedThunk, &ctx);
+
+	return ctx.m_returnValue;
+}
+
+void GpFileSystem_Android::ScanDirectoryNestedThunk(void *context)
+{
+	ScanDirectoryNestedContext *ctx = static_cast<ScanDirectoryNestedContext*>(context);
+	ctx->m_returnValue = ctx->m_this->ScanDirectoryNestedInternal(ctx->m_virtualDirectory, ctx->m_paths, ctx->m_numPaths);
+}
+
+PortabilityLayer::HostDirectoryCursor *GpFileSystem_Android::ScanDirectoryNestedInternal(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *const *paths, size_t numPaths)
 {
 	if (virtualDirectory == PortabilityLayer::VirtualDirectories::kGameData || virtualDirectory == PortabilityLayer::VirtualDirectories::kApplicationData)
 		return ScanAssetDirectory(virtualDirectory, paths, numPaths);
@@ -564,6 +614,11 @@ bool GpFileSystem_Android::IsVirtualDirectoryLooseResources(PortabilityLayer::Vi
 	return false;
 }
 
+void GpFileSystem_Android::SetMainThreadRelay(IGpThreadRelay *relay)
+{
+	m_relay = relay;
+}
+
 GpFileSystem_Android *GpFileSystem_Android::GetInstance()
 {
 	return &ms_instance;
@@ -647,6 +702,7 @@ void GpDirectoryCursor_POSIX::Destroy()
 
 PortabilityLayer::HostDirectoryCursor *GpFileSystem_Android::ScanAssetDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths)
 {
+
 	std::string resolvedPath;
 	std::vector<std::string> subPaths;
 	bool isAsset = true;

AerofoilAndroid/app/jni/main/GpFileSystem_Android.h

@@ -5,6 +5,7 @@
 #include "GpCoreDefs.h"
 
 #include <jni.h>
+#include <string>
 
 class GpFileSystem_Android final : public PortabilityLayer::HostFileSystem
 {
@@ -26,14 +27,35 @@ public:
 
 	bool IsVirtualDirectoryLooseResources(PortabilityLayer::VirtualDirectory_t virtualDir) const override;
 
+	void SetMainThreadRelay(IGpThreadRelay *relay) override;
+
 	static GpFileSystem_Android *GetInstance();
 
 private:
+	struct ScanDirectoryNestedContext
+	{
+		GpFileSystem_Android *m_this;
+
+		PortabilityLayer::HostDirectoryCursor *m_returnValue;
+		PortabilityLayer::VirtualDirectory_t m_virtualDirectory;
+		char const *const *m_paths;
+		size_t m_numPaths;
+	};
+
+	static void ScanDirectoryNestedThunk(void *context);
+	PortabilityLayer::HostDirectoryCursor *ScanDirectoryNestedInternal(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
+
 	PortabilityLayer::HostDirectoryCursor *ScanAssetDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
 	PortabilityLayer::HostDirectoryCursor *ScanStorageDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
 
+	bool ResolvePathInDownloadsDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution, bool &isAsset);
+	bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution, bool &isAsset);
+
+	IGpThreadRelay *m_relay;
+
 	jobject m_activity;
 	jmethodID m_scanAssetDirectoryMID;
+	jmethodID m_selectSourceExportPathMID;
 
 	static GpFileSystem_Android ms_instance;
 };

AerofoilAndroid/app/jni/main/GpMain_SDL_Android.cpp

@@ -30,6 +30,8 @@ IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &pr
 
 int main(int argc, char* argv[])
 {
+	SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
+
 	if (SDL_Init(SDL_INIT_VIDEO) < 0)
 		return -1;