1.0.1

Author: meefik

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.meefik.wshell"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="7"

assets/pkill

@@ -21,11 +21,11 @@
     <string name="title_localhost_preference">Localhost</string>
     <string name="summary_localhost_preference">Only listen on 127.0.0.1</string>
 
-    <string name="title_autostart_preference">Root</string>
-    <string name="summary_autostart_preference">Require superuser permissions</string>
+    <string name="title_root_preference">Root</string>
+    <string name="summary_root_preference">Require superuser permissions</string>
 
-    <string name="title_root_preference">Autostart</string>
-    <string name="summary_root_preference">Run when the application opens</string>
+    <string name="title_autostart_preference">Autostart</string>
+    <string name="summary_autostart_preference">Run when the application opens</string>
 
     <string name="title_shell_preference">Shell</string>
     <string name="dialog_title_shell_preference">Shell</string>

res/values/strings.xml

@@ -102,7 +102,8 @@ public void onResume() {
 	}
 
 	private void loadPrefs() {
-		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		SharedPreferences sp = PreferenceManager
+				.getDefaultSharedPreferences(getApplicationContext());
 
 		PORT = sp.getString("port", getString(R.string.port));
 		LOCALHOST = sp.getBoolean("localhost", getString(R.string.localhost).equals("true"));
@@ -182,6 +183,11 @@ private void extractData() {
 			copyFile(SHELL_IN_A_BOX, file);
 			file.setExecutable(true);
 		}
+		file = new File(FILES_DIR + File.separator + "pkill");
+		if (!file.exists()) {
+			copyFile("pkill", file);
+			file.setExecutable(true);
+		}
 	}
 
 	private void start(boolean restart) {
@@ -197,7 +203,7 @@ private void start(boolean restart) {
 			list.add("sh");
 		}
 		if (restart) {
-			list.add("pkill -9 " + SHELL_IN_A_BOX);
+			list.add(FILES_DIR + File.separator + "pkill -9 " + SHELL_IN_A_BOX);
 			list.add("sleep 1");
 		}
 		list.add(cmd);
@@ -212,7 +218,7 @@ private void stop() {
 		} else {
 			list.add("sh");
 		};
-		String cmd = "pkill -9 " + SHELL_IN_A_BOX;
+		String cmd = FILES_DIR + File.separator + "pkill -9 " + SHELL_IN_A_BOX;
 		list.add(cmd);
 		new Thread(new ExecCmd(list)).start();
 		ACTIVE = false;