From bb51f268ed285ee3e699669cf76ee93512565a03 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 17 Nov 2009 20:01:18 +0000
Subject: Use ASE's JNI Exec code

Eclair has removed android.os.Exec from the code base, so use Android
Scripting Environment's JNI Exec code to enable local shell on 2.0

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@427 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                     |   2 +-
 libs/armeabi/libcom_google_ase_Exec.so  | Bin 0 -> 6598 bytes
 src/com/google/ase/Exec.java            |  69 ++++++++++++++++++++++++++++++++
 src/org/connectbot/transport/Local.java |  38 +++---------------
 4 files changed, 76 insertions(+), 33 deletions(-)
 create mode 100755 libs/armeabi/libcom_google_ase_Exec.so
 create mode 100644 src/com/google/ase/Exec.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de748dc..3b6d523 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="209">
+	android:versionCode="210">
 	
 	<application
 		android:icon="@drawable/icon"
diff --git a/libs/armeabi/libcom_google_ase_Exec.so b/libs/armeabi/libcom_google_ase_Exec.so
new file mode 100755
index 0000000..20fd499
Binary files /dev/null and b/libs/armeabi/libcom_google_ase_Exec.so differ
diff --git a/src/com/google/ase/Exec.java b/src/com/google/ase/Exec.java
new file mode 100644
index 0000000..016fdf3
--- /dev/null
+++ b/src/com/google/ase/Exec.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.ase;
+
+import java.io.FileDescriptor;
+
+/**
+ * Tools for executing commands.
+ */
+public class Exec {
+  /**
+   * @param cmd
+   *          The command to execute
+   * @param arg0
+   *          The first argument to the command, may be null
+   * @param arg1
+   *          the second argument to the command, may be null
+   * @return the file descriptor of the started process.
+   *
+   */
+  public static FileDescriptor createSubprocess(String cmd, String arg0, String arg1) {
+    return createSubprocess(cmd, arg0, arg1, null);
+  }
+
+  /**
+   * @param cmd
+   *          The command to execute
+   * @param arg0
+   *          The first argument to the command, may be null
+   * @param arg1
+   *          the second argument to the command, may be null
+   * @param processId
+   *          A one-element array to which the process ID of the started process will be written.
+   * @return the file descriptor of the started process.
+   *
+   */
+  public static native FileDescriptor createSubprocess(String cmd, String arg0, String arg1,
+      int[] processId);
+
+  public static native void setPtyWindowSize(FileDescriptor fd, int row, int col, int xpixel,
+      int ypixel);
+
+  /**
+   * Causes the calling thread to wait for the process associated with the receiver to finish
+   * executing.
+   *
+   * @return The exit value of the Process being waited on
+   *
+   */
+  public static native int waitFor(int processId);
+
+  static {
+    System.loadLibrary("com_google_ase_Exec");
+  }
+}
diff --git a/src/org/connectbot/transport/Local.java b/src/org/connectbot/transport/Local.java
index 23c16b2..915e471 100644
--- a/src/org/connectbot/transport/Local.java
+++ b/src/org/connectbot/transport/Local.java
@@ -22,7 +22,6 @@ import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.util.Map;
 
 import org.connectbot.R;
@@ -35,6 +34,8 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 
+import com.google.ase.Exec;
+
 /**
  * @author Kenny Root
  *
@@ -45,34 +46,11 @@ public class Local extends AbsTransport {
 
 	private static final String DEFAULT_URI = "local:#Local";
 
-	private static Method mExec_openSubprocess;
-	private static Method mExec_waitFor;
-	private static Method mExec_setPtyWindowSize;
-
 	private FileDescriptor shellFd;
 
 	private FileInputStream is;
 	private FileOutputStream os;
 
-	static {
-		initPrivateAPI();
-	}
-
-	private static void initPrivateAPI() {
-		try {
-			Class<?> mExec = Class.forName("android.os.Exec");
-			mExec_openSubprocess = mExec.getMethod("createSubprocess",
-					String.class, String.class, String.class, int[].class);
-			mExec_waitFor = mExec.getMethod("waitFor", int.class);
-			mExec_setPtyWindowSize = mExec.getMethod("setPtyWindowSize",
-					FileDescriptor.class, int.class, int.class, int.class, int.class);
-		} catch (NoSuchMethodException e) {
-			// Give up
-		} catch (ClassNotFoundException e) {
-			// Give up
-		}
-	}
-
 	/**
 	 *
 	 */
@@ -113,21 +91,17 @@ public class Local extends AbsTransport {
 		int[] pids = new int[1];
 
 		try {
-			shellFd = (FileDescriptor) mExec_openSubprocess.invoke(null,
-				"/system/bin/sh", "-", null, pids);
+			shellFd = Exec.createSubprocess("/system/bin/sh", "-", null, pids);
 		} catch (Exception e) {
 			bridge.outputLine(manager.res.getString(R.string.local_shell_unavailable));
+			Log.e(TAG, "Cannot start local shell", e);
 			return;
 		}
 
 		final int shellPid = pids[0];
 		Runnable exitWatcher = new Runnable() {
 			public void run() {
-				try {
-					mExec_waitFor.invoke(null, shellPid);
-				} catch (Exception e) {
-					Log.e(TAG, "Couldn't wait for shell exit", e);
-				}
+				Exec.waitFor(shellPid);
 
 				bridge.dispatchDisconnect(false);
 			}
@@ -181,7 +155,7 @@ public class Local extends AbsTransport {
 	@Override
 	public void setDimensions(int columns, int rows, int width, int height) {
 		try {
-			mExec_setPtyWindowSize.invoke(null, shellFd, rows, columns, width, height);
+			Exec.setPtyWindowSize(shellFd, rows, columns, width, height);
 		} catch (Exception e) {
 			Log.e(TAG, "Couldn't resize pty", e);
 		}
-- 
cgit v1.2.3