From 599f86ad71971189f00ad2e7f90e81d39356334b Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 20 Feb 2010 20:31:40 +0000
Subject: Make sure EastAsianWidth JNI is working before using it

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@482 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                         |  2 +-
 src/org/connectbot/service/Relay.java       |  2 +-
 src/org/connectbot/util/EastAsianWidth.java | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8d4950a..803e2a4 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.7-dev"
-	android:versionCode="258">
+	android:versionCode="259">
 
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/org/connectbot/service/Relay.java b/src/org/connectbot/service/Relay.java
index 6316159..18bf896 100644
--- a/src/org/connectbot/service/Relay.java
+++ b/src/org/connectbot/service/Relay.java
@@ -60,7 +60,7 @@ public class Relay implements Runnable {
 	private char[] charArray;
 
 	static {
-		useJNI = EastAsianWidth.available;
+		useJNI = EastAsianWidth.useJNI;
 	}
 
 	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 de2e175..b27cd48 100644
--- a/src/org/connectbot/util/EastAsianWidth.java
+++ b/src/org/connectbot/util/EastAsianWidth.java
@@ -17,12 +17,15 @@
 
 package org.connectbot.util;
 
+import android.util.Log;
+
 /**
  * @author Kenny Root
  *
  */
 public class EastAsianWidth {
-	public static boolean available = false;
+	public static boolean useJNI = false;
+	private static final String TAG = "ConnectBot.EastAsianWidth";
 
 	/**
 	 * @param charArray
@@ -37,7 +40,15 @@ public class EastAsianWidth {
 	static {
 		try {
 			System.loadLibrary("org_connectbot_util_EastAsianWidth");
-			available = true;
+
+			char[] testInput = {(char)0x4EBA};
+			byte[] testResult = new byte[1];
+			measure(testInput, 0, 1, testResult, true);
+
+			if (testResult[0] == 1)
+				useJNI = true;
+			else
+				Log.d(TAG, "EastAsianWidth JNI measuring not available");
 		} catch (Exception e) {
 			// Failure
 		} catch (UnsatisfiedLinkError e1) {
-- 
cgit v1.2.3