Skip to content

Commit 93bf37a

Browse files
committed
disable termux module
1 parent f4fdad0 commit 93bf37a

File tree

21 files changed

+233
-712
lines changed

21 files changed

+233
-712
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
</activity>
7373
<activity android:name="com.jecelyin.editor.v2.ui.settings.SettingsActivity" />
7474
<activity android:name="com.jecelyin.android.file_explorer.FileExplorerActivity" />
75+
<activity android:name=".console.ConsoleActivity" />
7576

7677
<service
7778
android:name=".console.services.TermuxService"

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import android.content.Intent;
2222

2323
import com.duy.ccppcompiler.R;
24+
import com.duy.ccppcompiler.console.ConsoleActivity;
2425
import com.duy.common.DLog;
2526
import com.duy.ide.compiler.ICompileManager;
2627
import com.duy.ide.compiler.shell.ShellResult;
2728
import com.jecelyin.common.utils.UIUtils;
2829

2930
import java.io.File;
3031

31-
import jackpal.androidterm.TermActivity;
32-
3332
/**
3433
* Created by Duy on 25-Apr-18.
3534
*/
@@ -62,8 +61,8 @@ public void onCompileSuccess(ShellResult shellResult) {
6261
}
6362
File internalDir = mActivity.getFilesDir();
6463
String path = new File(internalDir, GCCConstants.TEMP_BINARY_NAME).getAbsolutePath();
65-
Intent intent = new Intent(mActivity, TermActivity.class);
66-
intent.putExtra(TermActivity.EXTRA_BINARY_FILE_PATH, path);
64+
Intent intent = new Intent(mActivity, ConsoleActivity.class);
65+
intent.putExtra(ConsoleActivity.EXTRA_BINARY_FILE_PATH, path);
6766
mActivity.startActivity(intent);
6867
}
6968

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duy.ccppcompiler.console.activities;
17+
package com.duy.ccppcompiler.console;
1818

1919
import android.content.ClipData;
2020
import android.content.ClipboardManager;

app/src/main/java/com/duy/ccppcompiler/console/activities/IConsole.java renamed to app/src/main/java/com/duy/ccppcompiler/console/IConsole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duy.ccppcompiler.console.activities;
17+
package com.duy.ccppcompiler.console;
1818

1919
/**
2020
* Created by Duy on 22-Apr-18.

app/src/main/java/com/duy/ccppcompiler/console/services/TermuxViewClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.view.MotionEvent;
2525
import android.view.inputmethod.InputMethodManager;
2626

27-
import com.duy.ccppcompiler.console.activities.ConsoleActivity;
27+
import com.duy.ccppcompiler.console.ConsoleActivity;
2828
import com.termux.terminal.KeyHandler;
2929
import com.termux.terminal.TerminalEmulator;
3030
import com.termux.terminal.TerminalSession;

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':style', ':terminal-emulator', ':terminal-view', ':termux', ':editor-view', ':term', ':libtermexec', ':emulatorview'
1+
include ':app', ':style', ':terminal-emulator', ':terminal-view', /*':termux',*/ ':editor-view', ':term', ':libtermexec', ':emulatorview'

terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.util.Base64;
44
import android.util.Log;
55

6-
import java.nio.charset.StandardCharsets;
6+
import java.nio.charset.Charset;
77
import java.util.Arrays;
88
import java.util.Locale;
99
import java.util.Objects;
@@ -1898,7 +1898,7 @@ private void doOscSetTextParameters(String bellOrStringTerminator) {
18981898
case 52: // Manipulate Selection Data. Skip the optional first selection parameter(s).
18991899
int startIndex = textParameter.indexOf(";") + 1;
19001900
try {
1901-
String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), StandardCharsets.UTF_8);
1901+
String clipboardText = new String(Base64.decode(textParameter.substring(startIndex), 0), Charset.forName("UTF-8"));
19021902
mSession.clipboardText(clipboardText);
19031903
} catch (Exception e) {
19041904
Log.e(EmulatorDebug.LOG_TAG, "OSC Manipulate selection, invalid string '" + textParameter + "");

terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.termux.terminal;
22

3-
import java.nio.charset.StandardCharsets;
3+
import java.nio.charset.Charset;
44

55
/** A client which receives callbacks from events triggered by feeding input to a {@link TerminalEmulator}. */
66
public abstract class TerminalOutput {
77

88
/** Write a string using the UTF-8 encoding to the terminal client. */
99
public final void write(String data) {
10-
byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
10+
byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
1111
write(bytes, 0, bytes.length);
1212
}
1313

terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.io.IOException;
1515
import java.io.InputStream;
1616
import java.lang.reflect.Field;
17-
import java.nio.charset.StandardCharsets;
17+
import java.nio.charset.Charset;
1818
import java.util.UUID;
1919

2020
/**
@@ -130,7 +130,7 @@ public void handleMessage(Message msg) {
130130
}
131131
exitDescription += " - press Enter]";
132132

133-
byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
133+
byte[] bytesToWrite = exitDescription.getBytes(Charset.forName("UTF-8"));
134134
mEmulator.append(bytesToWrite, bytesToWrite.length);
135135
notifyScreenUpdate();
136136
}

terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String toString() {
8989
}
9090

9191
public TerminalTestCase enterString(String s) {
92-
byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
92+
byte[] bytes = s.getBytes(Charset.forName("UTF-8"));
9393
mTerminal.append(bytes, bytes.length);
9494
assertInvariants();
9595
return this;

0 commit comments

Comments
 (0)