Fix various UI issues with cancelling an ongoing search

ChessAndroid/app/build.gradle

@@ -9,7 +9,7 @@ android {
         applicationId "net.theluckycoder.chess"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1201
+        versionCode 1202
         versionName "1.2.0"
         resConfigs "en"
     }
@@ -20,12 +20,6 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
-            externalNativeBuild {
-                cmake {
-                    abiFilters "arm64-v8a", "armeabi-v7a"
-                }
-            }
-
             packagingOptions {
                 resources {
                     excludes.add("DebugProbesKt.bin")

ChessAndroid/app/src/main/cpp/JniCache.h

@@ -6,6 +6,7 @@
 namespace JniCache
 {
 	jclass boardChangeListenerClass;
+	jclass searchListenerClass;
 	jclass indexedPieceClass;
 	jclass moveClass;
 	jclass searchOptionsClass;
@@ -17,7 +18,8 @@ namespace JniCache
 
 	void createCaches(JNIEnv *env)
 	{
-		boardChangeListenerClass = cacheClass(env, "net/theluckycoder/chess/BoardChangeListener");
+		boardChangeListenerClass = cacheClass(env, "net/theluckycoder/chess/cpp/BoardChangeListener");
+		searchListenerClass = cacheClass(env, "net/theluckycoder/chess/cpp/SearchListener");
 		indexedPieceClass = cacheClass(env, "net/theluckycoder/chess/model/IndexedPiece");
 		moveClass = cacheClass(env, "net/theluckycoder/chess/model/Move");
 		searchOptionsClass = cacheClass(env, "net/theluckycoder/chess/model/SearchOptions");
@@ -26,6 +28,7 @@ namespace JniCache
 	void cleanCaches(JNIEnv *env)
 	{
 		env->DeleteGlobalRef(boardChangeListenerClass);
+		env->DeleteGlobalRef(searchListenerClass);
 		env->DeleteGlobalRef(indexedPieceClass);
 		env->DeleteGlobalRef(moveClass);
 		env->DeleteGlobalRef(searchOptionsClass);

ChessAndroid/app/src/main/cpp/JniUtils.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <android/log.h>
+#include <cassert>
+
+#define LOGV(LOG_TAG, ...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
+#define LOGI(LOG_TAG, ...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define LOGD(LOG_TAG, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define LOGW(LOG_TAG, ...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+#define LOGE(LOG_TAG, ...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
+class NativeThreadAttach
+{
+public:
+	explicit NativeThreadAttach(JavaVM *jvm)
+		: _jvm(jvm)
+	{
+		_jvmEnvState = _jvm->GetEnv(reinterpret_cast<void **>(&_env), JNI_VERSION_1_6);
+
+		if (_jvmEnvState == JNI_EDETACHED)
+			_jvm->AttachCurrentThread(&_env, nullptr);
+		_env->ExceptionClear();
+	}
+
+	JNIEnv *getEnv() { return _env; }
+
+	~NativeThreadAttach()
+	{
+		if (_jvmEnvState == JNI_EDETACHED)
+			_jvm->DetachCurrentThread();
+	}
+
+private:
+	JavaVM *_jvm;
+	JNIEnv *_env = nullptr;
+	int _jvmEnvState{};
+};