Evolinx/android_terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Busybox resize command"

Browse Source 
This reverts commit 5af38a650f.
This commit is contained in:
binkybear 2016-10-09 11:53:45 -05:00
parent 477a9e9073
commit 9cf8ac765e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
term/src/main/java/com/offsec/nhterm/Term.java
View File

@ -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();

2
term/src/main/res/values/defaults.xml
View File

@ -15,7 +15,7 @@
<string name="pref_ime_default" translatable="false">0</string>
<bool name="pref_alt_sends_esc_default">false</bool>
<string name="pref_shell_default" translatable="false">/system/bin/sh -</string>
<string name="pref_initialcommand_default" translatable="false">busybox resize</string>
<string name="pref_initialcommand_default" translatable="false" />
<string name="pref_intentcommand_default" translatable="false">sh \"%s\"</string>
<string name="pref_termtype_default" translatable="false">screen-256color</string>
<bool name="pref_close_window_on_process_exit_default">true</bool>