Update EastAsianWidth JNI code

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@425 df292f66-193f-0410-a5fc-6d59da041ff2

5 files changed, 13 insertions, 7 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 757166e..e452d27 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.6-dev"
-	android:versionCode="205">
+	android:versionCode="208">
 	
 	<application
 		android:icon="@drawable/icon"
diff --git a/libs/armeabi/libcbicu.so b/libs/armeabi/libcbicu.so
deleted file mode 100755
index 551641d..0000000
--- a/libs/armeabi/libcbicu.so
+++ /dev/null
diff --git a/libs/armeabi/liborg_connectbot_util_EastAsianWidth.so b/libs/armeabi/liborg_connectbot_util_EastAsianWidth.so
new file mode 100755
index 0000000..6722290
--- /dev/null
+++ b/libs/armeabi/liborg_connectbot_util_EastAsianWidth.so
diff --git a/src/org/connectbot/service/Relay.java b/src/org/connectbot/service/Relay.java
index e9ff6c5..8a9f31f 100644
--- a/src/org/connectbot/service/Relay.java
+++ b/src/org/connectbot/service/Relay.java
@@ -61,12 +61,7 @@ public class Relay implements Runnable {
 	private char[] charArray;
 
 	static {
-		try {
-			System.loadLibrary("cbicu");
-		} catch (UnsatisfiedLinkError e) {
-			Log.e(TAG, "Could not load cbicu library; using fallback width measurement method", e);
-			useJNI = false;
-		}
+		useJNI = EastAsianWidth.available;
 	}
 
 	public Relay(TerminalBridge bridge, AbsTransport transport, vt320 buffer, String encoding) {
diff --git a/src/org/connectbot/util/EastAsianWidth.java b/src/org/connectbot/util/EastAsianWidth.java
index d99d06f..19d5d3c 100644
--- a/src/org/connectbot/util/EastAsianWidth.java
+++ b/src/org/connectbot/util/EastAsianWidth.java
@@ -8,6 +8,8 @@ package org.connectbot.util;
  *
  */
 public class EastAsianWidth {
+	public static boolean available = false;
+
 	/**
 	 * @param charArray
 	 * @param i
@@ -17,4 +19,13 @@ public class EastAsianWidth {
 	 */
 	public native static void measure(char[] charArray, int start, int end,
 			byte[] wideAttribute, boolean isLegacyEastAsian);
+
+	static {
+		try {
+			System.loadLibrary("org_connectbot_util_EastAsianWidth");
+			available = true;
+		} catch (Exception e) {
+			// Failure
+		}
+	}
 }