From 9cf8ac765e33eede40319cf818f32a5d57821345 Mon Sep 17 00:00:00 2001 From: binkybear Date: Sun, 9 Oct 2016 11:53:45 -0500 Subject: [PATCH] Revert "Busybox resize command" This reverts commit 5af38a650ff313b578069e427ee86acf8605edf7. --- term/src/main/java/com/offsec/nhterm/Term.java | 10 +++++----- term/src/main/res/values/defaults.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/term/src/main/java/com/offsec/nhterm/Term.java b/term/src/main/java/com/offsec/nhterm/Term.java index 32a4e5b..f3c3930 100644 --- a/term/src/main/java/com/offsec/nhterm/Term.java +++ b/term/src/main/java/com/offsec/nhterm/Term.java @@ -603,7 +603,7 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. - Log.d("createTermSession ", _mShell + " cmd: " + initialCommand); + Log.d("MM createTermSession", _mShell + "cmd: " + initialCommand); GenericTermSession session = new ShellTermSession(settings, initialCommand, _mShell); // called from intents // XXX We should really be able to fetch this from within TermSession @@ -615,7 +615,7 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. private TermSession createTermSession() throws IOException { Log.d("MM createTermSession", "inthreow"); TermSettings settings = mSettings; - TermSession session = createTermSession(this, settings, "", settings.getInitialCommand()); + TermSession session = createTermSession(this, settings, "", "/system/bin/sh -"); session.setFinishCallback(mTermService); return session; } @@ -847,7 +847,7 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. Log.d("CANCELED", "CANCELED"); TermSession session = null; try { - session = createTermSession(getBaseContext(), settings, settings.getInitialCommand(), ShellType.ANDROID_SHELL); + session = createTermSession(getBaseContext(), settings, "", ShellType.ANDROID_SHELL); session.setFinishCallback(mTermService); } catch (IOException e) { e.printStackTrace(); @@ -872,7 +872,7 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. if(CheckRoot.isDeviceRooted()){ Log.d("isDeviceRooted","Device is rooted!"); try { - session = createTermSession(getBaseContext(), settings, settings.getInitialCommand(), ShellType.ANDROID_SU_SHELL); + session = createTermSession(getBaseContext(), settings, "", ShellType.ANDROID_SU_SHELL); session.setFinishCallback(mTermService); } catch (IOException e) { e.printStackTrace(); @@ -913,7 +913,7 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences. } else { TermSession session = null; try { - session = createTermSession(getBaseContext(), settings, settings.getInitialCommand(), ShellType.KALI_LOGIN_SHELL); + session = createTermSession(getBaseContext(), settings, "", ShellType.KALI_LOGIN_SHELL); session.setFinishCallback(mTermService); } catch (IOException e) { e.printStackTrace(); diff --git a/term/src/main/res/values/defaults.xml b/term/src/main/res/values/defaults.xml index 7f42bd5..f7ab952 100644 --- a/term/src/main/res/values/defaults.xml +++ b/term/src/main/res/values/defaults.xml @@ -15,7 +15,7 @@ 0 false /system/bin/sh - - busybox resize + sh \"%s\" screen-256color true