diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/Kirikiroid2Yuri.iml b/.idea/Kirikiroid2Yuri.iml
new file mode 100644
index 00000000..f08604bb
--- /dev/null
+++ b/.idea/Kirikiroid2Yuri.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..30bf1fdf
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src" charset="Shift_JIS" />
+    <file url="file://$PROJECT_DIR$/src/core/CMakeLists.txt" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/plugins/CMakeLists.txt" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..79b3c948
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..8d88e532
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Kirikiroid2Yuri.iml" filepath="$PROJECT_DIR$/.idea/Kirikiroid2Yuri.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/project/android/.idea/android.iml b/project/android/.idea/android.iml
new file mode 100644
index 00000000..2169bed6
--- /dev/null
+++ b/project/android/.idea/android.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/project/android/.idea/gradle.xml b/project/android/.idea/gradle.xml
index 789714f8..3075838b 100644
--- a/project/android/.idea/gradle.xml
+++ b/project/android/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="JDK" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/project/android/.idea/misc.xml b/project/android/.idea/misc.xml
index 9422e848..6199cc2a 100644
--- a/project/android/.idea/misc.xml
+++ b/project/android/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/project/android/.idea/vcs.xml b/project/android/.idea/vcs.xml
index 3b009b9d..c8ade07f 100644
--- a/project/android/.idea/vcs.xml
+++ b/project/android/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../thirdparty/port/cocos2d-x" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/project/android/app/AndroidManifest.xml b/project/android/app/AndroidManifest.xml
index 5db8e3e1..4a9acf2f 100644
--- a/project/android/app/AndroidManifest.xml
+++ b/project/android/app/AndroidManifest.xml
@@ -16,7 +16,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <application android:label="@string/app_name"
                  android:icon="@mipmap/ic_launcher"
diff --git a/project/android/app/build.gradle b/project/android/app/build.gradle
index 804894dc..ab27e799 100644
--- a/project/android/app/build.gradle
+++ b/project/android/app/build.gradle
@@ -60,7 +60,7 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
         }
 
         debug {
@@ -68,7 +68,7 @@ android {
             jniDebuggable true
             jniDebuggable true
             renderscriptDebuggable true
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
         }
     }
 
diff --git a/project/android/app/cpp/krkr2_android.cpp b/project/android/app/cpp/krkr2_android.cpp
index ea4bba36..129dbe50 100644
--- a/project/android/app/cpp/krkr2_android.cpp
+++ b/project/android/app/cpp/krkr2_android.cpp
@@ -76,21 +76,21 @@ extern "C" {
 		env->ReleaseStringUTFChars(text, pszText);
 	}
 
-	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesBegin(JNIEnv * env, jobject thiz, jint id, jfloat x, jfloat y) {
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesBegin(JNIEnv * env, jclass cls, jint id, jfloat x, jfloat y) {
 		intptr_t idlong = id;
 		Android_PushEvents([idlong, x, y](){
 			cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesBegin(1, (intptr_t*)&idlong, (float*)&x, (float*)&y);
 		});
 	}
 
-	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesEnd(JNIEnv * env, jobject thiz, jint id, jfloat x, jfloat y) {
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesEnd(JNIEnv * env, jclass cls, jint id, jfloat x, jfloat y) {
 		intptr_t idlong = id;
 		Android_PushEvents([idlong, x, y](){
 			cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesEnd(1, (intptr_t*)&idlong, (float*)&x, (float*)&y);
 		});
 	}
 
-	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesMove(JNIEnv * env, jobject thiz, jintArray ids, jfloatArray xs, jfloatArray ys) {
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesMove(JNIEnv * env, jclass cls, jintArray ids, jfloatArray xs, jfloatArray ys) {
 		int size = env->GetArrayLength(ids);
 		if (size == 1) {
 			intptr_t idlong;
@@ -124,7 +124,7 @@ extern "C" {
 		});
 	}
 
-	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesCancel(JNIEnv * env, jobject thiz, jintArray ids, jfloatArray xs, jfloatArray ys) {
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeTouchesCancel(JNIEnv * env, jclass cls, jintArray ids, jfloatArray xs, jfloatArray ys) {
 		int size = env->GetArrayLength(ids);
 		if (size == 1) {
 			intptr_t idlong;
@@ -233,7 +233,7 @@ extern "C" {
 
 	static float _mouseX, _mouseY;
 
-	JNIEXPORT jboolean JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeHoverMoved(JNIEnv* env, jclass cls, jfloat x, jfloat y)
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeHoverMoved(JNIEnv* env, jclass cls, jfloat x, jfloat y)
 	{
 		Android_PushEvents([x, y]() {
 			cocos2d::GLView *glview = cocos2d::Director::getInstance()->getOpenGLView();
@@ -248,10 +248,9 @@ extern "C" {
 			event.setCursorPosition(cursorX, cursorY);
 			cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
 		});
-		return true;
 	}
 
-	JNIEXPORT jboolean JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeMouseScrolled(JNIEnv* env, jclass cls, jfloat v)
+	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeMouseScrolled(JNIEnv* env, jclass cls, jfloat v)
 	{
 		Android_PushEvents([v]() {
 			cocos2d::GLView *glview = cocos2d::Director::getInstance()->getOpenGLView();
@@ -266,7 +265,6 @@ extern "C" {
 			event.setCursorPosition(cursorX, cursorY);
 			cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
 		});
-		return true;
 	}
 
 	JNIEXPORT void JNICALL Java_org_tvp_kirikiri2_KR2Activity_nativeOnLowMemory(JNIEnv* env, jclass cls)
diff --git a/project/android/app/java/com/yuri/kirikiri2/MainActivity.java b/project/android/app/java/com/yuri/kirikiri2/MainActivity.java
index e9f041fd..bb728905 100644
--- a/project/android/app/java/com/yuri/kirikiri2/MainActivity.java
+++ b/project/android/app/java/com/yuri/kirikiri2/MainActivity.java
@@ -2,9 +2,6 @@
 import org.tvp.kirikiri2.KR2Activity;
 
 public class MainActivity extends KR2Activity {
-	static {
-		// System.loadLibrary("krkr2yuri");
-	}
 	@Override
 	public int get_res_sd_operate_step() { return R.drawable.sd_operate_step; }
 }
diff --git a/project/android/app/java/org/tvp/kirikiri2/KR2Activity.java b/project/android/app/java/org/tvp/kirikiri2/KR2Activity.java
index 483407a8..5322c1d6 100644
--- a/project/android/app/java/org/tvp/kirikiri2/KR2Activity.java
+++ b/project/android/app/java/org/tvp/kirikiri2/KR2Activity.java
@@ -62,7 +62,6 @@
 /**
  * Utility class for handling the media store.
  */
-@SuppressWarnings("ALL")
 abstract class MediaStoreUtil {
     public static Uri getUriFromFile(final String path,Context context) {
         ContentResolver resolver = context.getContentResolver();
@@ -219,11 +218,10 @@ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
     }
 }
 
-@SuppressWarnings("ALL")
+
 public class KR2Activity extends Cocos2dxActivity implements ActivityCompat.OnRequestPermissionsResultCallback {
 
     public static final int RC_WRITE_EXTERNAL = 1;
-    public static final int RC_PHONE_STATE = 2;
 
 	static ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
 	static ActivityManager mAcitivityManager = null;
@@ -244,24 +242,6 @@ public static long getUsedMemory() {
 		return mDbgMemoryInfo.getTotalPss(); // in kB
 	}
 
-    private static void requestPhoneState() {
-        // Permission has not been granted and must be requested.
-        if (ActivityCompat.shouldShowRequestPermissionRationale(sInstance,
-                Manifest.permission.READ_PHONE_STATE)) {
-            // Provide an additional rationale to the user if the permission was not granted
-            // and the user would benefit from additional context for the use of the permission.
-            // Display a SnackBar with cda button to request the missing permission.
-            ActivityCompat.requestPermissions(sInstance,
-                    new String[]{Manifest.permission.READ_PHONE_STATE},
-                    RC_PHONE_STATE);
-
-        } else {
-            // Request the permission. The result will be received in onRequestPermissionResult().
-            ActivityCompat.requestPermissions(sInstance,
-                    new String[]{Manifest.permission.READ_PHONE_STATE}, RC_PHONE_STATE);
-        }
-    }
-
     private static void requestExternalWrite() {
         // Permission has not been granted and must be requested.
         if (ActivityCompat.shouldShowRequestPermissionRationale(sInstance,
@@ -284,20 +264,12 @@ private static void requestExternalWrite() {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
-            case RC_PHONE_STATE:
-                Log.d("Krkr2", "onRequestPermissionsResult: PHONE STATE");
-                break;
             case RC_WRITE_EXTERNAL:
                 Log.d("Krkr2", "onRequestPermissionsResult: WRITE EXTERNAL");
                 break;
         }
     }
 
-
-    static public String getDeviceId() { // ## fix android.permission.READ_PRIVILEGED_PHONE_STATE
-		return "";
-	}
-
 	static public KR2Activity sInstance;
 	static public KR2Activity GetInstance() {return sInstance;}
     
@@ -306,15 +278,13 @@ public void onCreate(Bundle savedInstanceState) {
 		sInstance = this;
         Sp = PreferenceManager.getDefaultSharedPreferences(this);
 		super.onCreate(savedInstanceState);
-	
-		if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP) {
-			for(String path : getExtSdCardPaths(this)) {
-		        if (!isWritableNormalOrSaf(path)) {
-		            guideDialogForLEXA(path);
-		        }
-			}
-		}
-		
+
+        for (String path : getExtSdCardPaths(this)) {
+            if (!isWritableNormalOrSaf(path)) {
+                guideDialogForLEXA(path);
+            }
+        }
+
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             requestExternalWrite();
         }
@@ -508,9 +478,6 @@ public void run() {
 	
 	static private native void onMessageBoxOK(int nButton);
 	static private native void onMessageBoxText(String text);
-	static private native void onNativeExit();
-	static public native void onNativeInit();
-	static public native void onBannerSizeChanged(int w, int h);
 	static private native void initDump(String path);
 	static private native void nativeOnLowMemory();
 	
@@ -594,7 +561,6 @@ public String[] getStoragePath() {
     
     private static native void nativeInsertText(final String text);
     public static native void nativeDeleteBackward();
-    private static native String nativeGetContentText();
     private static native void nativeHoverMoved(final float x, final float y);
     private static native void nativeMouseScrolled(final float scroll);
     
@@ -739,7 +705,7 @@ public boolean onTouchEvent(final MotionEvent pMotionEvent) {
             return true;
         }
         
-		@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) @Override  
+        @Override
         public boolean onGenericMotionEvent(MotionEvent event) {
         	switch (event.getActionMasked()) {
 	        case MotionEvent.ACTION_SCROLL:
@@ -752,21 +718,7 @@ public boolean onGenericMotionEvent(MotionEvent event) {
         	return super.onGenericMotionEvent(event);
         }
     }
-    
-    //@Override
-    // ## fix private function
-//    public Cocos2dxGLSurfaceView onCreateView() {
-//        Cocos2dxGLSurfaceView glSurfaceView = new KR2GLSurfaceView(this);
-//    	hideSystemUI();
-//
-//        // this line is need on some device if we specify an alpha bits
-//        if(this.mGLContextAttrs[3] > 0) glSurfaceView.getHolder().setFormat(PixelFormat.TRANSLUCENT);
-//
-//        Cocos2dxEGLConfigChooser chooser = new Cocos2dxEGLConfigChooser(this.mGLContextAttrs);
-//        glSurfaceView.setEGLConfigChooser(chooser);
-//
-//        return glSurfaceView;
-//    }
+
     
     public int get_res_sd_operate_step() { return -1; }
 
@@ -800,7 +752,7 @@ public void onClick(DialogInterface dialog, int which) {
             .show();
     }
     
-    static final boolean isWritable(final File file) {
+    static boolean isWritable(final File file) {
         if(file==null)
             return false;
         boolean isExisting = file.exists();
@@ -827,7 +779,7 @@ static final boolean isWritable(final File file) {
         return result;
     }
 
-    static final boolean isWritableNormal(final String path) {
+    static boolean isWritableNormal(final String path) {
         boolean ret = isWritableNormalOrSaf(path);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             requestExternalWrite();
@@ -837,7 +789,7 @@ static final boolean isWritableNormal(final String path) {
     }
 
 
-    static final boolean isWritableNormalOrSaf(final String path) {
+    static boolean isWritableNormalOrSaf(final String path) {
 
         Log.i("kr2activaty","check path " + path + "permision");
 
@@ -881,7 +833,6 @@ static final boolean isWritableNormalOrSaf(final String path) {
         return result;
     }
     
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     private static String[] getExtSdCardPaths(Context context) {
         List<String> paths = new ArrayList<String>();
         for (File file : context.getExternalFilesDirs("external")) {
@@ -907,12 +858,13 @@ private static String[] getExtSdCardPaths(Context context) {
     static String[] _extSdPaths;
 
     public static String getExtSdCardFolder(final File file,Context context) {
-    	if(_extSdPaths == null)
-    		_extSdPaths = getExtSdCardPaths(context);
+    	if(_extSdPaths == null) {
+            _extSdPaths = getExtSdCardPaths(context);
+        }
         try {
-            for (int i = 0; i < _extSdPaths.length; i++) {
-                if (file.getCanonicalPath().startsWith(_extSdPaths[i])) {
-                    return _extSdPaths[i];
+            for (String extSdPath : _extSdPaths) {
+                if (file.getCanonicalPath().startsWith(extSdPath)) {
+                    return extSdPath;
                 }
             }
         }
@@ -995,35 +947,14 @@ static public boolean RenameFile(String from, String to) {
         if(file.renameTo(target)) return true;
         
         // Try with Storage Access Framework.
-        if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP /*&& isOnExtSdCard(file, sInstance)*/) {
-            DocumentFile document = getDocumentFile(file, false, sInstance);
-        	if(document.renameTo(to))
-        		return true;
-        }
-        
-        // Try Media Store Hack
-        if (Build.VERSION.SDK_INT==Build.VERSION_CODES.KITKAT) {
-        	try {
-				FileInputStream input = new FileInputStream(file);
-	        	int filesize = (int) file.length();
-				byte []buffer = new byte[filesize];
-				input.read(buffer);
-				input.close();
-            	OutputStream out = MediaStoreHack.getOutputStream(sInstance, target.getAbsolutePath());
-                out.write(buffer);
-                out.close();
-                return MediaStoreHack.delete(sInstance, file);
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				return false;
-				//e.printStackTrace();
-			}
-        }
-        
-    	return false;
+        DocumentFile document = getDocumentFile(file, false, sInstance);
+        if(document.renameTo(to))
+            return true;
+
+        return false;
     }
     
-    public static final boolean deleteFilesInFolder(final File folder,Context context) {
+    public static boolean deleteFilesInFolder(final File folder,Context context) {
         boolean totalSuccess = true;
         if(folder==null)
             return false;
@@ -1050,27 +981,11 @@ static public boolean DeleteFile(String path) {
             return true;
 
         // Try with Storage Access Framework.
-        if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP && isOnExtSdCard(file, sInstance)) {
-
+        if (isOnExtSdCard(file, sInstance)) {
             DocumentFile document = getDocumentFile(file, false,sInstance);
             return document.delete();
         }
 
-        // Try the Kitkat workaround.
-        if (Build.VERSION.SDK_INT==Build.VERSION_CODES.KITKAT) {
-            ContentResolver resolver = sInstance.getContentResolver();
-
-            try {
-                Uri uri = MediaStoreHack.getUriFromFile(file.getAbsolutePath(),sInstance);
-                resolver.delete(uri, null, null);
-                return !file.exists();
-            }
-            catch (Exception e) {
-                Log.e("FileUtils", "Error when deleting file " + file.getAbsolutePath(), e);
-                return false;
-            }
-        }
-
         return !file.exists();
     }
     
@@ -1082,15 +997,10 @@ public static OutputStream getOutputStream(@NonNull final File target,Context co
 			    // standard way
 			    outStream = new FileOutputStream(target);
 			} else {
-			    if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP) {
-			        // Storage Access Framework
-			    DocumentFile targetDocument = getDocumentFile(target, false,context);
-			    outStream = context.getContentResolver().openOutputStream(targetDocument.getUri());
-			} else if (Build.VERSION.SDK_INT==Build.VERSION_CODES.KITKAT) {
-			    // Workaround for Kitkat ext SD card
-		        return MediaStoreHack.getOutputStream(context,target.getPath());
-		        }
-		    }
+                // Storage Access Framework
+                DocumentFile targetDocument = getDocumentFile(target, false,context);
+                outStream = context.getContentResolver().openOutputStream(targetDocument.getUri());
+            }
 		} catch (Exception e) {
 		    Log.e("FileUtils",
     			"Error when copying file from " +  target.getAbsolutePath(), e);
@@ -1099,7 +1009,7 @@ public static OutputStream getOutputStream(@NonNull final File target,Context co
     }
 
     
-    static public boolean WriteFile(String path, byte data[]) {
+    static public boolean WriteFile(String path, byte[] data) {
         File target = new File(path);
         if(target.exists()) {
         	DeleteFile(target.getAbsolutePath()); // to avoid number suffix name
@@ -1109,7 +1019,7 @@ static public boolean WriteFile(String path, byte data[]) {
             	CreateFolders(parent.getAbsolutePath());
         }
         OutputStream out = null;
-        
+
     	// Try the normal way
     	try {
         	if(isWritable(target)) {
@@ -1120,36 +1030,24 @@ static public boolean WriteFile(String path, byte data[]) {
         	}
 
             // Try with Storage Access Framework.
-            if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP /*&& isOnExtSdCard(file, sInstance)*/) {
-                DocumentFile document = getDocumentFile(target, false, sInstance);
-                try {
-                	Uri docUri = document.getUri();
-                    out = sInstance.getContentResolver().openOutputStream(docUri);
-                } //catch (FileNotFoundException e) {
-                    // e.printStackTrace();}
-                catch (IOException e) {
-                    // e.printStackTrace();
-                }
-            } else if (Build.VERSION.SDK_INT==Build.VERSION_CODES.KITKAT) {
-                // Workaround for Kitkat ext SD card
-                Uri uri = MediaStoreHack.getUriFromFile(target.getAbsolutePath(),sInstance);
-                out = sInstance.getContentResolver().openOutputStream(uri);
-            } else {
-                return false;
+            DocumentFile document = getDocumentFile(target, false, sInstance);
+            try {
+                Uri docUri = document.getUri();
+                out = sInstance.getContentResolver().openOutputStream(docUri);
+            } catch (IOException e) {
+                   e.printStackTrace();
             }
-            
+
             if (out != null) {
                 out.write(data);
                 out.close();
                 return true;
             }
-		} catch (FileNotFoundException e) {
-			//return false;
 		} catch (IOException e) {
 			//return false;
 		}
 
-    	return false;
+        return false;
     }
     
     static public boolean CreateFolders(String path) {
@@ -1161,23 +1059,8 @@ static public boolean CreateFolders(String path) {
     	}
 
         // Try with Storage Access Framework.
-        if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP /*&& FileUtil.isOnExtSdCard(file, context)*/) {
-            DocumentFile document = getDocumentFile(file, true,sInstance);
-            // getDocumentFile implicitly creates the directory.
-
-            return document.exists();
-        }
-        
-        // Try the Kitkat workaround.
-        if (Build.VERSION.SDK_INT==Build.VERSION_CODES.KITKAT) {
-            try {
-            	return MediaStoreHack.mkdir(sInstance,file);
-            } catch (IOException e) {
-                //return false;
-            }
-        }
-        
-    	return false;
+        DocumentFile document = getDocumentFile(file, true,sInstance);
+        return document.exists();
     }
 
     @Override
@@ -1189,8 +1072,8 @@ public void onWindowFocusChanged(boolean hasFocus) {
         	hideSystemUI();
         }
     }
-    
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+
+    //todo can optimize
     void doSetSystemUiVisibility() {
 		int uiOpts = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
 		        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -1203,7 +1086,7 @@ void doSetSystemUiVisibility() {
 
     private static native boolean nativeGetHideSystemButton();
     void hideSystemUI() {
-    	if(nativeGetHideSystemButton() && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+    	if(nativeGetHideSystemButton()) {
     		doSetSystemUiVisibility();
     	}
     }
@@ -1233,15 +1116,13 @@ static public void setOrientation(int orient) {
     		sInstance.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
     	}
     }
-    
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+
 	static public void triggerStorageAccessFramework() {
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
         sInstance.startActivityForResult(intent, 3);
     }
 
-    @SuppressLint("WrongConstant")
-    @TargetApi(Build.VERSION_CODES.KITKAT)
+    @Override
     protected void onActivityResult(int requestCode, int responseCode, Intent intent) {
         if (requestCode == 3) {
             String p = Sp.getString("URI", null);
diff --git a/project/android/build.gradle b/project/android/build.gradle
index 1bc517e0..6d1398e1 100644
--- a/project/android/build.gradle
+++ b/project/android/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
 }
 
 allprojects {
diff --git a/project/android/gradle.properties b/project/android/gradle.properties
index b01ae224..d51cf9a7 100644
--- a/project/android/gradle.properties
+++ b/project/android/gradle.properties
@@ -21,7 +21,7 @@
 PROP_COMPILE_SDK_VERSION=29
  
 # Android SDK version that will be used as the earliest version of android this application can run on
-PROP_MIN_SDK_VERSION=22
+PROP_MIN_SDK_VERSION=21
 
 # Android SDK version that will be used as the latest version of android this application has been tested on
 PROP_TARGET_SDK_VERSION=29
diff --git a/project/android/gradle/wrapper/gradle-wrapper.properties b/project/android/gradle/wrapper/gradle-wrapper.properties
index da901948..24b5c0a8 100644
--- a/project/android/gradle/wrapper/gradle-wrapper.properties
+++ b/project/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 11 01:47:25 JST 2023
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+#Thu Mar 16 11:43:54 CST 2023
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/readme.md b/readme.md
index abdfe6ec..e4fd8d53 100644
--- a/readme.md
+++ b/readme.md
@@ -90,7 +90,7 @@ major:
 - crash in game menu form  
 - game alert window button can not click  
 - member GdiPlus does not exist
-- global preference can not save
+- ~~global preference can not save~~
 
 minor:  
 
diff --git a/script/_androida64.sh b/script/_androida64.sh
index ecdff243..6be2e18a 100644
--- a/script/_androida64.sh
+++ b/script/_androida64.sh
@@ -114,31 +114,6 @@ build_jpeg()
     popd
 }
 
-build_opencv()
-{
-    if ! [ -d $OPENCV_SRC/build_$PLATFORM ]; then mkdir -p $OPENCV_SRC/build_$PLATFORM ;fi
-
-    pushd $OPENCV_SRC/build_$PLATFORM
-    cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=MinSizeRel \
-        -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake \
-        -DANDROID_PLATFORM=21 -DANDROID_ABI=arm64-v8a \
-        -DCMAKE_INSTALL_PREFIX=$PORTBUILD_PATH \
-        -DWITH_CUDA=OFF -DWITH_MATLAB=OFF -DBUILD_ANDROID_EXAMPLES=OFF \
-        -DBUILD_DOCS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF \
-        -DBUILD_opencv_video=OFF -DBUILD_opencv_videoio=OFF -DBUILD_opencv_features2d=OFF \
-        -DBUILD_opencv_flann=OFF -DBUILD_opencv_highgui=OFF -DBUILD_opencv_ml=OFF \
-        -DBUILD_opencv_dnn=OFF -DBUILD_opencv_gapi=OFF -DBUILD_opencv_hal=ON \
-        -DBUILD_opencv_photo=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_shape=OFF \
-        -DBUILD_opencv_stitching=OFF -DBUILD_opencv_superres=OFF -DWITH_ITT=OFF \
-        -DBUILD_opencv_ts=OFF -DBUILD_opencv_videostab=OFF -DBUILD_ANDROID_PROJECTS=OFF
-    make -j$CORE_NUM &&  make install
-    
-    cp -rf  $PORTBUILD_PATH/sdk/native/3rdparty/libs/arm64-v8a/*.a $PORTBUILD_PATH/lib
-    cp -rf  $PORTBUILD_PATH/sdk/native/staticlibs/arm64-v8a/libtegra_hal.a $PORTBUILD_PATH/lib
-    
-    popd
-}
-
 build_ffmpeg() 
 {
     if ! [ -d $FFMPEG_SRC/build_$PLATFORM ]; then mkdir -p $FFMPEG_SRC/build_$PLATFORM ;fi
@@ -162,14 +137,13 @@ build_ffmpeg()
 
 # archive
 build_unrar() 
-{   
-    cp -rf $CMAKELISTS_PATH/thirdparty/patch/unrar/android_ulinks.cpp $UNRAR_SRC/ulinks.cpp
-    
+{
     pushd $UNRAR_SRC
     make clean
     make lib -j$CORE_NUM \
         CXX=aarch64-linux-android21-clang++ \
         AR=llvm-ar STRIP=llvm-strip \
+        DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP -DUNIX_TIME_NS" \
         DESTDIR=$PORTBUILD_PATH  
     
     if ! [ -d $PORTBUILD_PATH/include/unrar ]; then mkdir -p $PORTBUILD_PATH/include/unrar ;fi 
diff --git a/script/_fetch.sh b/script/_fetch.sh
index cd373cd5..7174cd4b 100644
--- a/script/_fetch.sh
+++ b/script/_fetch.sh
@@ -60,7 +60,7 @@ function fetch_opusfile()
 
 function fetch_unrar()
 {
-    UNRAR_NAME=unrarsrc-6.0.7
+    UNRAR_NAME=unrarsrc-6.2.6
     UNRAR_SRC=$CMAKELISTS_PATH/thirdparty/port/$UNRAR_NAME
     fetch_port https://www.rarlab.com/rar $UNRAR_NAME
     if [ -d $CMAKELISTS_PATH/thirdparty/port/unrar ]; then
@@ -76,14 +76,14 @@ function fetch_p7zip()
         echo "## fetch_port $P7ZIP_NAME"
         wget https://sourceforge.net/projects/p7zip/files/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 \
             -O $CMAKELISTS_PATH/thirdparty/port/$P7ZIP_NAME.tar.bz2
-        tar zxf $CMAKELISTS_PATH/thirdparty/port//$P7ZIP_NAME.tar.bz2 \
+        tar jxf $CMAKELISTS_PATH/thirdparty/port//$P7ZIP_NAME.tar.bz2 \
             -C $CMAKELISTS_PATH/thirdparty/port
     fi 
 }
 
 function fetch_sdl2()
 {
-    SDL2_NAME=SDL2-2.0.14
+    SDL2_NAME=SDL2-2.26.4
     SDL2_SRC=$CMAKELISTS_PATH/thirdparty/port/$SDL2_NAME
     fetch_port https://www.libsdl.org/release $SDL2_NAME
 }
@@ -118,7 +118,13 @@ function fetch_opencv()
     OPENCV_NAME=opencv
     OPENCV_VERSION=4.7.0
     OPENCV_SRC=$CMAKELISTS_PATH/thirdparty/port/$OPENCV_NAME
-    fetch_port2 https://github.com/opencv $OPENCV_NAME $OPENCV_VERSION
+
+    if ! [ -d "$CMAKELISTS_PATH/thirdparty/port/$OPENCV_NAME" ]; then
+        echo "## fetch_port  $OPENCV_NAME $OPENCV_VERSION"
+        wget https://github.com/opencv/opencv/releases/download/4.7.0/opencv-4.7.0-android-sdk.zip -O $CMAKELISTS_PATH/thirdparty/port/opencv.zip
+        unzip $CMAKELISTS_PATH/thirdparty/port/opencv.zip
+        mv OpenCV-android-sdk $OPENCV_SRC
+    fi
 }
 
 function fetch_ffmpeg()
@@ -170,14 +176,12 @@ function fetch_cocos2dx()
     COCOS2DX_NAME=cocos2d-x
     COCOS2DX_VERSION=cocos2d-x-3.17.2
     COCOS2DX_SRC=$CMAKELISTS_PATH/thirdparty/port/$COCOS2DX_NAME
-    fetch_port2 https://github.com/cocos2d $COCOS2DX_NAME $COCOS2DX_VERSION
-
-    if ! [ -d "$CMAKELISTS_PATH/thirdparty/port/$COCOS2DX_NAME" ]; then    
-        pushd $COCOS2DX_SRC
-            python2 download-deps.py # must use cocos v3 and python2
-            git config --global url.https://github.com/.insteadOf git://github.com/
-            git submodule update --init # submodule might cuse some problem, as it use git@
-        popd
+
+    if ! [ -d "$CMAKELISTS_PATH/thirdparty/port/$COCOS2DX_NAME" ]; then
+        echo "## fetch_port $COCOS2DX_NAME $COCOS2DX_VERSION"
+        wget https://download.cocos.com/Cocos2D-X/cocos2d-x-3.17.2.zip -O $CMAKELISTS_PATH/thirdparty/port/cocos2d-x.zip
+        unzip $CMAKELISTS_PATH/thirdparty/port/cocos2d-x.zip
+        mv cocos2d-x-3.17.2 $COCOS2DX_SRC
     fi
 }
 
diff --git a/script/cross_androida64.sh b/script/cross_androida64.sh
index 471d27ce..2466f5d3 100644
--- a/script/cross_androida64.sh
+++ b/script/cross_androida64.sh
@@ -50,7 +50,6 @@ function build_ports()
 
     # video
     build_jpeg
-    build_opencv
     build_ffmpeg
 
     # archive
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a1c75d87..673e7c67 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -3,6 +3,9 @@ project(krkr2core)
 
 set(KRKR2CORE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(COCOS2DX_PATH ${KRKR2CORE_PATH}/../../thirdparty/port/cocos2d-x)
+set(OpenCV_DIR ${KRKR2CORE_PATH}/../../thirdparty/port/opencv/sdk/native/jni)
+
+find_package(OpenCV 4.7 REQUIRED java)
 
 # prepare static lib
 function(add_static_library TARGET LIBNAME)
diff --git a/src/core/environ/ConfigManager/GlobalConfigManager.cpp b/src/core/environ/ConfigManager/GlobalConfigManager.cpp
index a50b7039..2cab3b06 100644
--- a/src/core/environ/ConfigManager/GlobalConfigManager.cpp
+++ b/src/core/environ/ConfigManager/GlobalConfigManager.cpp
@@ -107,9 +107,10 @@ void iSysConfigManager::SaveToFile() {
 		}
 	}
 	doc.LinkEndChild(rootElement);
-	XMLMemPrinter stream;
-	doc.Print(&stream);
-	stream.SaveFile(GetFilePath());
+    if (doc.SaveFile(GetFilePath().c_str())) {
+        TVPShowSimpleMessageBox(LocaleConfigManager::GetInstance()->GetText("cannot_create_preference"),
+                                LocaleConfigManager::GetInstance()->GetText("readonly_storage"));
+    }
 	ConfigUpdated = false;
 }
 
diff --git a/src/core/environ/android/AndroidUtils.cpp b/src/core/environ/android/AndroidUtils.cpp
index aac3a007..c5fdb91a 100644
--- a/src/core/environ/android/AndroidUtils.cpp
+++ b/src/core/environ/android/AndroidUtils.cpp
@@ -36,7 +36,6 @@
 USING_NS_CC;
 
 #define KR2ActJavaPath "org/tvp/kirikiri2/KR2Activity"
-//#define KR2EntryJavaPath "org/tvp/kirikiri2/Kirikiroid2"
 
 extern unsigned int __page_size = getpagesize();
 
@@ -89,75 +88,6 @@ void TVPForceSwapBuffer() {
 	eglSwapBuffers(eglGetCurrentDisplay(), eglGetCurrentSurface(EGL_DRAW));
 }
 
-std::string TVPGetDeviceID()
-{
-    std::string ret;
-
-    // use pure jni to avoid java code
-// 	jclass classID = pEnv->FindClass(KR2EntryJavaPath);
-// 	std::string strtmp("()L"); strtmp += KR2EntryJavaPath; strtmp += ";";
-// 	jmethodID methodGetInstance = pEnv->GetStaticMethodID(classID, "GetInstance", strtmp.c_str());
-// 	jobject sInstance = pEnv->CallStaticObjectMethod(classID, methodGetInstance);
-// 	jmethodID getSystemService = pEnv->GetMethodID(classID, "getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;");
-// 	jstring jstrPhone = pEnv->NewStringUTF("phone");
-// 	jobject telephonyManager = pEnv->CallObjectMethod(sInstance, getSystemService, jstrPhone);
-// 	pEnv->DeleteLocalRef(jstrPhone);
-// 
-// 	jclass clsTelephonyManager = pEnv->FindClass("android/telephony/TelephonyManager");
-// 	jmethodID getDeviceId = pEnv->GetMethodID(clsTelephonyManager, "getDeviceId", "()Ljava/lang/String;");
-// 	jstring jstrDevID = (jstring)pEnv->CallObjectMethod(telephonyManager, getDeviceId);
-// 	if (jstrDevID) {
-// 		const char *p = pEnv->GetStringUTFChars(jstrDevID, 0);
-// 		if (p && *p) {
-// 			ret = "DevID=";
-// 			ret += p;
-// 			pEnv->ReleaseStringUTFChars(jstrDevID, p);
-// 		} else {
-// 			if (p) {
-// 				pEnv->ReleaseStringUTFChars(jstrDevID, p);
-// 			}
-// 			jmethodID getContentResolver = pEnv->GetMethodID(classID, "getContentResolver", "()Landroid/content/ContentResolver;");
-// 			jobject contentResolver = pEnv->CallObjectMethod(sInstance, getContentResolver);
-// 
-// 			jclass clsSecure = pEnv->FindClass("android/provider/Settings/Secure");
-// 			if (clsSecure) {
-// 				jmethodID Secure_getString = pEnv->GetMethodID(clsSecure, "getString", "(Landroid/content/ContentResolver;Ljava/lang/String;)Ljava/lang/String;");
-// 				jstring jastrAndroid_ID = pEnv->NewStringUTF("android_id");
-// 				jstring jstrAndroidID = (jstring)pEnv->CallStaticObjectMethod(clsSecure, Secure_getString, contentResolver, jastrAndroid_ID);
-// 				if (jstrAndroidID) {
-// 					const char *p = pEnv->GetStringUTFChars(jstrAndroidID, 0);
-// 					if (p && strlen(p) > 8 && strcmp(p, "9774d56d682e549c")) {
-// 						ret = "AndroidID=";
-// 						ret += p;
-// 					}
-// 				}
-// 				pEnv->ReleaseStringUTFChars(jstrAndroidID, p);
-// 				pEnv->DeleteLocalRef(jastrAndroid_ID);
-// 			}
-// 		}
-// 	}
-// 	if (ret.empty())
-	{
-		JniMethodInfo methodInfo;
-		if (JniHelper::getStaticMethodInfo(methodInfo, KR2ActJavaPath, "getDeviceId", "()Ljava/lang/String;"))
-		{
-			jstring result = (jstring)methodInfo.env->CallStaticObjectMethod(methodInfo.classID, methodInfo.methodID);
-			ret = JniHelper::jstring2string(result);
-			methodInfo.env->DeleteLocalRef(result);
-			methodInfo.env->DeleteLocalRef(methodInfo.classID);
-			char *t = (char*)ret.c_str();
-			while (*t) {
-				if (*t == ':') {
-					*t = '=';
-					break;
-				}
-				t++;
-			}
-		}
-	}
-
-    return ret;
-}
 
 static jobject GetKR2ActInstance() {
 	JniMethodInfo methodInfo;
diff --git a/src/core/environ/android/AndroidUtils.h b/src/core/environ/android/AndroidUtils.h
index 3f7a9706..18f80b8e 100644
--- a/src/core/environ/android/AndroidUtils.h
+++ b/src/core/environ/android/AndroidUtils.h
@@ -1,5 +1,3 @@
 #pragma once
 #include <jni.h>
-#include <string>
-
-std::string TVPGetDeviceID();
+#include <string>
\ No newline at end of file
diff --git a/thirdparty/patch/sdl2/android_SDL_android.c b/thirdparty/patch/sdl2/android_SDL_android.c
index 3ceb4473..084261c3 100644
--- a/thirdparty/patch/sdl2/android_SDL_android.c
+++ b/thirdparty/patch/sdl2/android_SDL_android.c
@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -25,14 +25,13 @@
 #include "SDL_hints.h"
 #include "SDL_main.h"
 #include "SDL_timer.h"
+#include "SDL_version.h"
 
 #ifdef __ANDROID__
 
 #include "SDL_system.h"
 #include "SDL_android.h"
 
-#include "keyinfotable.h"
-
 #include "../../events/SDL_events_c.h"
 #include "../../video/android/SDL_androidkeyboard.h"
 #include "../../video/android/SDL_androidmouse.h"
@@ -65,6 +64,9 @@
 #define ENCODING_PCM_FLOAT  4
 
 /* Java class SDLActivity */
+JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetVersion)(
+        JNIEnv *env, jclass cls);
+
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(
         JNIEnv *env, jclass cls);
 
@@ -79,7 +81,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetScreenResolution)(
         JNIEnv *env, jclass jcls,
         jint surfaceWidth, jint surfaceHeight,
-        jint deviceWidth, jint deviceHeight, jint format, jfloat rate);
+        jint deviceWidth, jint deviceHeight, jfloat rate);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeResize)(
         JNIEnv *env, jclass cls);
@@ -148,6 +150,10 @@ JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
         JNIEnv *env, jclass cls,
         jstring name);
 
+JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(nativeGetHintBoolean)(
+        JNIEnv *env, jclass cls,
+        jstring name, jboolean default_value);
+
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetenv)(
         JNIEnv *env, jclass cls,
         jstring name, jstring value);
@@ -165,10 +171,11 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePermissionResult)(
         jint requestCode, jboolean result);
 
 static JNINativeMethod SDLActivity_tab[] = {
+    { "nativeGetVersion",           "()Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetVersion) },
     { "nativeSetupJNI",             "()I", SDL_JAVA_INTERFACE(nativeSetupJNI) },
     { "nativeRunMain",              "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I", SDL_JAVA_INTERFACE(nativeRunMain) },
     { "onNativeDropFile",           "(Ljava/lang/String;)V", SDL_JAVA_INTERFACE(onNativeDropFile) },
-    { "nativeSetScreenResolution",  "(IIIIIF)V", SDL_JAVA_INTERFACE(nativeSetScreenResolution) },
+    { "nativeSetScreenResolution",  "(IIIIF)V", SDL_JAVA_INTERFACE(nativeSetScreenResolution) },
     { "onNativeResize",             "()V", SDL_JAVA_INTERFACE(onNativeResize) },
     { "onNativeSurfaceCreated",     "()V", SDL_JAVA_INTERFACE(onNativeSurfaceCreated) },
     { "onNativeSurfaceChanged",     "()V", SDL_JAVA_INTERFACE(onNativeSurfaceChanged) },
@@ -189,6 +196,7 @@ static JNINativeMethod SDLActivity_tab[] = {
     { "nativeResume",               "()V", SDL_JAVA_INTERFACE(nativeResume) },
     { "nativeFocusChanged",         "(Z)V", SDL_JAVA_INTERFACE(nativeFocusChanged) },
     { "nativeGetHint",              "(Ljava/lang/String;)Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetHint) },
+    { "nativeGetHintBoolean",       "(Ljava/lang/String;Z)Z", SDL_JAVA_INTERFACE(nativeGetHintBoolean) },
     { "nativeSetenv",               "(Ljava/lang/String;Ljava/lang/String;)V", SDL_JAVA_INTERFACE(nativeSetenv) },
     { "onNativeOrientationChanged", "(I)V", SDL_JAVA_INTERFACE(onNativeOrientationChanged) },
     { "nativeAddTouch",             "(ILjava/lang/String;)V", SDL_JAVA_INTERFACE(nativeAddTouch) },
@@ -204,14 +212,9 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancod
         JNIEnv *env, jclass cls,
         jchar chUnicode);
 
-JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeSetComposingText)(
-        JNIEnv *env, jclass cls,
-        jstring text, jint newCursorPosition);
-
 static JNINativeMethod SDLInputConnection_tab[] = {
     { "nativeCommitText",                   "(Ljava/lang/String;I)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText) },
-    { "nativeGenerateScancodeForUnichar",   "(C)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar) },
-    { "nativeSetComposingText",             "(Ljava/lang/String;I)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeSetComposingText) }
+    { "nativeGenerateScancodeForUnichar",   "(C)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar) }
 };
 
 /* Java class SDLAudioManager */
@@ -298,6 +301,7 @@ static jmethodID midClipboardGetText;
 static jmethodID midClipboardHasText;
 static jmethodID midClipboardSetText;
 static jmethodID midCreateCustomCursor;
+static jmethodID midDestroyCustomCursor;
 static jmethodID midGetContext;
 static jmethodID midGetDisplayDPI;
 static jmethodID midGetManifestEnvironmentVariables;
@@ -312,12 +316,12 @@ static jmethodID midManualBackButton;
 static jmethodID midMinimizeWindow;
 static jmethodID midOpenURL;
 static jmethodID midRequestPermission;
+static jmethodID midShowToast;
 static jmethodID midSendMessage;
 static jmethodID midSetActivityTitle;
 static jmethodID midSetCustomCursor;
 static jmethodID midSetOrientation;
 static jmethodID midSetRelativeMouseEnabled;
-static jmethodID midSetSurfaceViewFormat;
 static jmethodID midSetSystemCursor;
 static jmethodID midSetWindowStyle;
 static jmethodID midShouldMinimizeOnFocusLoss;
@@ -502,24 +506,25 @@ register_methods(JNIEnv *env, const char *classname, JNINativeMethod *methods, i
     }
 }
 
-// /* Library init */
-// JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
-// {
-//     mJavaVM = vm;
-//     JNIEnv *env = NULL;
-// 
-//     if ((*mJavaVM)->GetEnv(mJavaVM, (void **)&env, JNI_VERSION_1_4) != JNI_OK) {
-//         __android_log_print(ANDROID_LOG_ERROR, "SDL", "Failed to get JNI Env");
-//         return JNI_VERSION_1_4;
-//     }
-// 
-//     register_methods(env, "org/libsdl/app/SDLActivity", SDLActivity_tab, SDL_arraysize(SDLActivity_tab));
-//     register_methods(env, "org/libsdl/app/SDLInputConnection", SDLInputConnection_tab, SDL_arraysize(SDLInputConnection_tab));
-//     register_methods(env, "org/libsdl/app/SDLAudioManager", SDLAudioManager_tab, SDL_arraysize(SDLAudioManager_tab));
-//     register_methods(env, "org/libsdl/app/SDLControllerManager", SDLControllerManager_tab, SDL_arraysize(SDLControllerManager_tab));
-// 
-//     return JNI_VERSION_1_4;
-// }
+/* Library init */
+//JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
+//{
+//    JNIEnv *env = NULL;
+//
+//    mJavaVM = vm;
+//
+//    if ((*mJavaVM)->GetEnv(mJavaVM, (void **)&env, JNI_VERSION_1_4) != JNI_OK) {
+//        __android_log_print(ANDROID_LOG_ERROR, "SDL", "Failed to get JNI Env");
+//        return JNI_VERSION_1_4;
+//    }
+//
+//    register_methods(env, "org/libsdl/app/SDLActivity", SDLActivity_tab, SDL_arraysize(SDLActivity_tab));
+//    register_methods(env, "org/libsdl/app/SDLInputConnection", SDLInputConnection_tab, SDL_arraysize(SDLInputConnection_tab));
+//    register_methods(env, "org/libsdl/app/SDLAudioManager", SDLAudioManager_tab, SDL_arraysize(SDLAudioManager_tab));
+//    register_methods(env, "org/libsdl/app/SDLControllerManager", SDLControllerManager_tab, SDL_arraysize(SDLControllerManager_tab));
+//
+//    return JNI_VERSION_1_4;
+//}
 
 void checkJNIReady(void)
 {
@@ -531,6 +536,16 @@ void checkJNIReady(void)
     SDL_SetMainReady();
 }
 
+/* Get SDL version -- called before SDL_main() to verify JNI bindings */
+JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetVersion)(JNIEnv *env, jclass cls)
+{
+    char version[128];
+
+    SDL_snprintf(version, sizeof(version), "%d.%d.%d", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
+
+    return (*env)->NewStringUTF(env, version);
+}
+
 /* Activity initialization -- called before SDL_main() to initialize JNI bindings */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cls)
 {
@@ -577,6 +592,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
     midClipboardHasText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardHasText", "()Z");
     midClipboardSetText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardSetText", "(Ljava/lang/String;)V");
     midCreateCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "createCustomCursor", "([IIIII)I");
+    midDestroyCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "destroyCustomCursor", "(I)V");
     midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext","()Landroid/content/Context;");
     midGetDisplayDPI = (*env)->GetStaticMethodID(env, mActivityClass, "getDisplayDPI", "()Landroid/util/DisplayMetrics;");
     midGetManifestEnvironmentVariables = (*env)->GetStaticMethodID(env, mActivityClass, "getManifestEnvironmentVariables", "()Z");
@@ -591,12 +607,12 @@ 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");
+    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");
     midSetCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setCustomCursor", "(I)Z");
     midSetOrientation = (*env)->GetStaticMethodID(env, mActivityClass, "setOrientation","(IIZLjava/lang/String;)V");
     midSetRelativeMouseEnabled = (*env)->GetStaticMethodID(env, mActivityClass, "setRelativeMouseEnabled", "(Z)Z");
-    midSetSurfaceViewFormat = (*env)->GetStaticMethodID(env, mActivityClass, "setSurfaceViewFormat","(I)V");
     midSetSystemCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setSystemCursor", "(I)Z");
     midSetWindowStyle = (*env)->GetStaticMethodID(env, mActivityClass, "setWindowStyle","(Z)V");
     midShouldMinimizeOnFocusLoss = (*env)->GetStaticMethodID(env, mActivityClass, "shouldMinimizeOnFocusLoss","()Z");
@@ -607,6 +623,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
         !midClipboardHasText ||
         !midClipboardSetText ||
         !midCreateCustomCursor ||
+        !midDestroyCustomCursor ||
         !midGetContext ||
         !midGetDisplayDPI ||
         !midGetManifestEnvironmentVariables ||
@@ -621,12 +638,12 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
         !midMinimizeWindow ||
         !midOpenURL ||
         !midRequestPermission ||
+        !midShowToast ||
         !midSendMessage ||
         !midSetActivityTitle ||
         !midSetCustomCursor ||
         !midSetOrientation ||
         !midSetRelativeMouseEnabled ||
-        !midSetSurfaceViewFormat ||
         !midSetSystemCursor ||
         !midSetWindowStyle ||
         !midShouldMinimizeOnFocusLoss ||
@@ -842,11 +859,11 @@ void Android_ActivityMutex_Lock_Running() {
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetScreenResolution)(
                                     JNIEnv *env, jclass jcls,
                                     jint surfaceWidth, jint surfaceHeight,
-                                    jint deviceWidth, jint deviceHeight, jint format, jfloat rate)
+                                    jint deviceWidth, jint deviceHeight, jfloat rate)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
-    Android_SetScreenResolution(surfaceWidth, surfaceHeight, deviceWidth, deviceHeight, format, rate);
+    Android_SetScreenResolution(surfaceWidth, surfaceHeight, deviceWidth, deviceHeight, rate);
 
     SDL_UnlockMutex(Android_ActivityMutex);
 }
@@ -1001,6 +1018,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(JNIEnv *env, j
 {
     SDL_LockMutex(Android_ActivityMutex);
 
+#if SDL_VIDEO_OPENGL_EGL
     if (Android_Window)
     {
         SDL_VideoDevice *_this = SDL_GetVideoDevice();
@@ -1013,6 +1031,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(JNIEnv *env, j
 
         /* GL Context handling is done in the event loop because this function is run from the Java thread */
     }
+#endif
 
     SDL_UnlockMutex(Android_ActivityMutex);
 }
@@ -1043,10 +1062,12 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceDestroyed)(JNIEnv *env,
             }
         }
 
+#if SDL_VIDEO_OPENGL_EGL
         if (data->egl_surface != EGL_NO_SURFACE) {
             SDL_EGL_DestroySurface(_this, data->egl_surface);
             data->egl_surface = EGL_NO_SURFACE;
         }
+#endif
 
         if (data->native_window) {
             ANativeWindow_release(data->native_window);
@@ -1257,50 +1278,30 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancod
                                     JNIEnv *env, jclass cls,
                                     jchar chUnicode)
 {
-    SDL_Scancode code = SDL_SCANCODE_UNKNOWN;
-    uint16_t mod = 0;
-
-    /* We do not care about bigger than 127. */
-    if (chUnicode < 127) {
-        AndroidKeyInfo info = unicharToAndroidKeyInfoTable[chUnicode];
-        code = info.code;
-        mod = info.mod;
-    }
-
-    if (mod & KMOD_SHIFT) {
-        /* If character uses shift, press shift down */
-        SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_LSHIFT);
-    }
-
-    /* send a keydown and keyup even for the character */
-    SDL_SendKeyboardKey(SDL_PRESSED, code);
-    SDL_SendKeyboardKey(SDL_RELEASED, code);
-
-    if (mod & KMOD_SHIFT) {
-        /* If character uses shift, press shift back up */
-        SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LSHIFT);
-    }
+    SDL_SendKeyboardUnicodeKey(chUnicode);
 }
 
-JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeSetComposingText)(
+JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
                                     JNIEnv *env, jclass cls,
-                                    jstring text, jint newCursorPosition)
+                                    jstring name)
 {
-    const char *utftext = (*env)->GetStringUTFChars(env, text, NULL);
+    const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
+    const char *hint = SDL_GetHint(utfname);
 
-    SDL_SendEditingText(utftext, 0, 0);
+    jstring result = (*env)->NewStringUTF(env, hint);
+    (*env)->ReleaseStringUTFChars(env, name, utfname);
 
-    (*env)->ReleaseStringUTFChars(env, text, utftext);
+    return result;
 }
 
-JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
+JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(nativeGetHintBoolean)(
                                     JNIEnv *env, jclass cls,
-                                    jstring name)
+                                    jstring name, jboolean default_value)
 {
-    const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
-    const char *hint = SDL_GetHint(utfname);
+    jboolean result;
 
-    jstring result = (*env)->NewStringUTF(env, hint);
+    const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
+    result = SDL_GetHintBoolean(utfname, default_value);
     (*env)->ReleaseStringUTFChars(env, name, utfname);
 
     return result;
@@ -1381,26 +1382,6 @@ ANativeWindow* Android_JNI_GetNativeWindow(void)
     return anw;
 }
 
-void Android_JNI_SetSurfaceViewFormat(int format)
-{
-    JNIEnv *env = Android_JNI_GetEnv();
-    int new_format = 0;
-
-    /* Format from android/native_window.h,
-     * convert to temporary arbitrary values,
-     * then to java PixelFormat */
-    if (format == WINDOW_FORMAT_RGBA_8888) {
-        new_format = 1;
-    } else if (format == WINDOW_FORMAT_RGBX_8888) {
-        new_format = 2;
-    } else if (format == WINDOW_FORMAT_RGB_565) {
-        /* Default */
-        new_format = 0;
-    }
-
-    (*env)->CallStaticVoidMethod(env, mActivityClass, midSetSurfaceViewFormat, new_format);
-}
-
 void Android_JNI_SetActivityTitle(const char *title)
 {
     JNIEnv *env = Android_JNI_GetEnv();
@@ -2125,6 +2106,15 @@ void Android_JNI_HapticStop(int device_id)
 /* See SDLActivity.java for constants. */
 #define COMMAND_SET_KEEP_SCREEN_ON    5
 
+
+int SDL_AndroidSendMessage(Uint32 command, int param)
+{
+    if (command >= 0x8000) {
+        return Android_JNI_SendMessage(command, param);
+    }
+    return -1;
+}
+
 /* sends message to be handled on the UI event dispatch thread */
 int Android_JNI_SendMessage(int command, int param)
 {
@@ -2468,6 +2458,11 @@ SDL_bool SDL_AndroidRequestPermission(const char *permission)
     return Android_JNI_RequestPermission(permission);
 }
 
+int SDL_AndroidShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset)
+{
+    return Android_JNI_ShowToast(message, duration, gravity, xOffset, yOffset);
+}
+
 void Android_JNI_GetManifestEnvironmentVariables(void)
 {
     if (!mActivityClass || !midGetManifestEnvironmentVariables) {
@@ -2500,6 +2495,12 @@ int Android_JNI_CreateCustomCursor(SDL_Surface *surface, int hot_x, int hot_y)
     return custom_cursor;
 }
 
+void Android_JNI_DestroyCustomCursor(int cursorID)
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+    (*env)->CallStaticVoidMethod(env, mActivityClass, midDestroyCustomCursor, cursorID);
+    return;
+}
 
 SDL_bool Android_JNI_SetCustomCursor(int cursorID)
 {
@@ -2528,23 +2529,35 @@ SDL_bool Android_JNI_SetRelativeMouseEnabled(SDL_bool enabled)
 SDL_bool Android_JNI_RequestPermission(const char *permission)
 {
     JNIEnv *env = Android_JNI_GetEnv();
-	const int requestCode = 1;
+    jstring jpermission;
+    const int requestCode = 1;
 
-	/* Wait for any pending request on another thread */
-	while (SDL_AtomicGet(&bPermissionRequestPending) == SDL_TRUE) {
-		SDL_Delay(10);
-	}
-	SDL_AtomicSet(&bPermissionRequestPending, SDL_TRUE);
+    /* Wait for any pending request on another thread */
+    while (SDL_AtomicGet(&bPermissionRequestPending) == SDL_TRUE) {
+        SDL_Delay(10);
+    }
+    SDL_AtomicSet(&bPermissionRequestPending, SDL_TRUE);
 
-    jstring jpermission = (*env)->NewStringUTF(env, permission);
+    jpermission = (*env)->NewStringUTF(env, permission);
     (*env)->CallStaticVoidMethod(env, mActivityClass, midRequestPermission, jpermission, requestCode);
     (*env)->DeleteLocalRef(env, jpermission);
 
-	/* Wait for the request to complete */
-	while (SDL_AtomicGet(&bPermissionRequestPending) == SDL_TRUE) {
-		SDL_Delay(10);
-	}
-	return bPermissionRequestResult;
+    /* Wait for the request to complete */
+    while (SDL_AtomicGet(&bPermissionRequestPending) == SDL_TRUE) {
+        SDL_Delay(10);
+    }
+    return bPermissionRequestResult;
+}
+
+/* Show toast notification */
+int Android_JNI_ShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset)
+{
+    int result = 0;
+    JNIEnv *env = Android_JNI_GetEnv();
+    jstring jmessage = (*env)->NewStringUTF(env, message);
+    result = (*env)->CallStaticIntMethod(env, mActivityClass, midShowToast, jmessage, duration, gravity, xOffset, yOffset);
+    (*env)->DeleteLocalRef(env, jmessage);
+    return result;
 }
 
 int Android_JNI_GetLocale(char *buf, size_t buflen)
diff --git a/thirdparty/patch/unrar/android_ulinks.cpp b/thirdparty/patch/unrar/android_ulinks.cpp
deleted file mode 100644
index 7b9b55a4..00000000
--- a/thirdparty/patch/unrar/android_ulinks.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-static bool UnixSymlink(CommandData *Cmd,const char *Target,const wchar *LinkName,RarTime *ftm,RarTime *fta)
-{
-  CreatePath(LinkName,true,Cmd->DisableNames);
-
-  // Overwrite prompt was already issued and confirmed earlier, so we can
-  // remove existing symlink or regular file here. PrepareToDelete was also
-  // called earlier inside of uiAskReplaceEx.
-  DelFile(LinkName);
-
-  char LinkNameA[NM];
-  WideToChar(LinkName,LinkNameA,ASIZE(LinkNameA));
-  if (symlink(Target,LinkNameA)==-1) // Error.
-  {
-    if (errno==EEXIST)
-      uiMsg(UIERROR_ULINKEXIST,LinkName);
-    else
-    {
-      uiMsg(UIERROR_SLINKCREATE,UINULL,LinkName);
-      ErrHandler.SetErrorCode(RARX_WARNING);
-    }
-    return false;
-  }
-#ifdef USE_LUTIMES
-#ifdef UNIX_TIME_NS
-  timespec times[2];
-  times[0].tv_sec=fta->GetUnix();
-  times[0].tv_nsec=fta->IsSet() ? long(fta->GetUnixNS()%1000000000) : UTIME_NOW;
-  times[1].tv_sec=ftm->GetUnix();
-  times[1].tv_nsec=ftm->IsSet() ? long(ftm->GetUnixNS()%1000000000) : UTIME_NOW;
-  utimensat(AT_FDCWD,LinkNameA,times,AT_SYMLINK_NOFOLLOW);
-#else
-  struct timeval tv[2];
-  tv[0].tv_sec=fta->GetUnix();
-  tv[0].tv_usec=long(fta->GetUnixNS()%1000000000/1000);
-  tv[1].tv_sec=ftm->GetUnix();
-  tv[1].tv_usec=long(ftm->GetUnixNS()%1000000000/1000);
-  utimes(LinkNameA,tv);
-#endif
-#endif
-
-  return true;
-}
-
-
-static bool IsFullPath(const char *PathA) // Unix ASCII version.
-{
-  return *PathA==CPATHDIVIDER;
-}
-
-
-bool ExtractUnixLink30(CommandData *Cmd,ComprDataIO &DataIO,Archive &Arc,const wchar *LinkName)
-{
-  char Target[NM];
-  if (IsLink(Arc.FileHead.FileAttr))
-  {
-    size_t DataSize=(size_t)Arc.FileHead.PackSize;
-    if (DataSize>ASIZE(Target)-1)
-      return false;
-    if ((size_t)DataIO.UnpRead((byte *)Target,DataSize)!=DataSize)
-      return false;
-    Target[DataSize]=0;
-
-    DataIO.UnpHash.Init(Arc.FileHead.FileHash.Type,1);
-    DataIO.UnpHash.Update(Target,strlen(Target));
-    DataIO.UnpHash.Result(&Arc.FileHead.FileHash);
-
-    // Return true in case of bad checksum, so link will be processed further
-    // and extraction routine will report the checksum error.
-    if (!DataIO.UnpHash.Cmp(&Arc.FileHead.FileHash,Arc.FileHead.UseHashKey ? Arc.FileHead.HashKey:NULL))
-      return true;
-
-    wchar TargetW[NM];
-    CharToWide(Target,TargetW,ASIZE(TargetW));
-    // Check for *TargetW==0 to catch CharToWide failure.
-    // Use Arc.FileHead.FileName instead of LinkName, since LinkName
-    // can include the destination path as a prefix, which can
-    // confuse IsRelativeSymlinkSafe algorithm.
-    if (!Cmd->AbsoluteLinks && (*TargetW==0 || IsFullPath(TargetW) ||
-        !IsRelativeSymlinkSafe(Cmd,Arc.FileHead.FileName,LinkName,TargetW)))
-      return false;
-    return UnixSymlink(Cmd,Target,LinkName,&Arc.FileHead.mtime,&Arc.FileHead.atime);
-  }
-  return false;
-}
-
-
-bool ExtractUnixLink50(CommandData *Cmd,const wchar *Name,FileHeader *hd)
-{
-  char Target[NM];
-  WideToChar(hd->RedirName,Target,ASIZE(Target));
-  if (hd->RedirType==FSREDIR_WINSYMLINK || hd->RedirType==FSREDIR_JUNCTION)
-  {
-    // Cannot create Windows absolute path symlinks in Unix. Only relative path
-    // Windows symlinks can be created here. RAR 5.0 used \??\ prefix
-    // for Windows absolute symlinks, since RAR 5.1 /??/ is used.
-    // We escape ? as \? to avoid "trigraph" warning
-    if (strncmp(Target,"\\??\\",4)==0 || strncmp(Target,"/\?\?/",4)==0)
-      return false;
-    DosSlashToUnix(Target,Target,ASIZE(Target));
-  }
-  // Use hd->FileName instead of LinkName, since LinkName can include
-  // the destination path as a prefix, which can confuse
-  // IsRelativeSymlinkSafe algorithm.
-  if (!Cmd->AbsoluteLinks && (IsFullPath(Target) ||
-      !IsRelativeSymlinkSafe(Cmd,hd->FileName,Name,hd->RedirName)))
-    return false;
-  return UnixSymlink(Cmd,Target,Name,&hd->mtime,&hd->atime);
-}