update gradle wrapper

extra keys: handle actions UP & CANCEL separately
Related issue: https://github.com/termux/termux-app/issues/905
2019-12-02 17:22:11 +02:00 · 2019-11-24 19:11:14 +01:00 · 2019-11-24 19:11:09 +01:00 · 2019-11-24 19:10:59 +01:00 · 2019-11-24 19:10:30 +01:00 · 2019-11-10 22:10:10 +01:00
45 changed files with 552 additions and 1837 deletions
@@ -0,0 +1,20 @@
+container:
+  image: cirrusci/android-sdk:28
+  cpu: 2
+  memory: 8G
+
+task:
+  name: tests
+  script: ./gradlew test
+
+task:
+  name: debug-build
+
+  depends_on:
+    - tests
+
+  script: |
+    ./gradlew assembleDebug
+
+  output_artifacts:
+    path: "./app/build/outputs/apk/debug/*.apk"
@@ -1,35 +1,20 @@
 ---
 name: Bug report
-about: Create a report to help us improve Termux application
+about: Create a report to help us improve termux-app

 ---

-<!--
-IMPORTANT:
-
-1. Support of Android 5.x - 6.x is finished.
-2. Fill the template AFTER comments.
-->
+<!-- Important note: Refusing to provide needed information may result in issue closing. If you are having problems with a package in termux then a bug report should be filed in the termux-packages repo: https://github.com/termux/termux-packages -->

 **Problem description**
-<!--
-A clear and concise description of what the problem is.
-You may post screenshots in addition to description.
-->
+A clear and concise description of what the problem with the termux app is. You may post screenshots in addition to description.

 **Steps to reproduce**
-<!--
-Steps to reproduce the behavior. Please post all necessary
-commands that are needed to reproduce the issue.
-->
+Please post all steps that are needed to reproduce the issue.

 **Expected behavior**
-<!--
 A clear and concise description of what you expected to happen.
-->

 **Additional information**
-
-* Termux application version:
-* Android OS version:
-* Device model:
+Post output of command `termux-info`.
+If you are rooted or have access to adb then capture a logcat with `logcat -d "*:W"`, from a adb or root shell.
@@ -1,22 +1,12 @@
 ---
 name: Feature request
-about: Suggest a new feature for Termux application
+about: Suggest a new feature in termux-app

 ---

-<!--
-IMPORTANT:
-
-1. Support of Android 5.x - 6.x is finished.
-2. Fill the template AFTER comments.
-->
-
 **Feature description**
-<!--
 Describe the feature and why you want it.
-->

 **Reference implementation**
-
 Does another app/terminal emulator have this feature?
-Provide links to more background information.
+Provide links to more background information
@@ -1,24 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone repository
-      uses: actions/checkout@v2
-    - name: Build
-      run: |
-        ./gradlew assembleDebug
-    - name: Store generated APK file
-      uses: actions/upload-artifact@v1
-      with:
-        name: termux-app
-        path: ./app/build/outputs/apk/debug/app-debug.apk
@@ -1,17 +0,0 @@
-name: "Validate Gradle Wrapper"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
@@ -1,19 +0,0 @@
-name: Unit tests
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  testing:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Clone repository
-      uses: actions/checkout@v2
-    - name: Execute tests
-      run: |
-        ./gradlew test
@@ -8,7 +8,6 @@ build/
 *.so
 .externalNativeBuild
 .cxx
-*.zip

 # Crashlytics configuations
 com_crashlytics_export_strings.xml
@@ -1,7 +1,6 @@
 # Termux application

-[![Build status](https://github.com/termux/termux-app/workflows/Build/badge.svg)](https://github.com/termux/termux-app/actions)
-[![Testing status](https://github.com/termux/termux-app/workflows/Unit%20tests/badge.svg)](https://github.com/termux/termux-app/actions)
+[![Build status](https://api.cirrus-ci.com/github/termux/termux-app.svg?branch=master)](https://cirrus-ci.com/termux/termux-app)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)

 [Termux](https://termux.com) is an Android terminal application and Linux environment.
@@ -22,10 +21,9 @@ Termux:Widget application can be obtained from:
 - [F-Droid](https://f-droid.org/en/packages/com.termux/)
 - [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux/)

-Additionally we provide per-commit debug builds for those who want to try
-out the latest features or test their pull request. This build can be obtained
-from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-app/actions)
-page.
+Additionally we offer development builds for those who want to try out latest
+features ready to be included in future versions. Such build can be obtained
+directly from [Cirrus CI artifacts](https://api.cirrus-ci.com/v1/artifact/github/termux/termux-app/debug-build/output/app/build/outputs/apk/debug/app-debug.apk).

 Signature keys of all offered builds are different. Before you switch the
 installation source, you will have to uninstall the Termux application and
@@ -1,13 +1,10 @@
-plugins {
-  id "com.android.application"
-}
+apply plugin: 'com.android.application'

 android {
    compileSdkVersion 28
-    ndkVersion '21.3.6528147'

    dependencies {
-        implementation "androidx.annotation:annotation:1.1.0"
+        implementation "androidx.annotation:annotation:1.0.1"
        implementation "androidx.viewpager:viewpager:1.0.0"
        implementation "androidx.drawerlayout:drawerlayout:1.0.0"
        implementation project(":terminal-view")
@@ -15,10 +12,10 @@ android {

    defaultConfig {
        applicationId "com.termux"
-        minSdkVersion 24
+        minSdkVersion 21
        targetSdkVersion 28
-        versionCode 95
-        versionName "0.95"
+        versionCode 83
+        versionName "0.83"

        externalNativeBuild {
            ndkBuild {
@@ -29,7 +26,6 @@ android {
        ndk {
            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
        }
-
    }

    signingConfigs {
@@ -57,23 +53,10 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
-
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/cpp/Android.mk"
-        }
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }

 dependencies {
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'junit:junit:4.12'
 }

 task versionName {
@@ -81,68 +64,3 @@ task versionName {
    print android.defaultConfig.versionName
  }
 }
-
-def downloadBootstrap(String arch, String expectedChecksum, int version) {
-    def digest = java.security.MessageDigest.getInstance("SHA-256")
-
-    def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
-    def file = new File(projectDir, localUrl)
-    if (file.exists()) {
-        def buffer = new byte[8192]
-        def input = new FileInputStream(file)
-        while (true) {
-            def readBytes = input.read(buffer)
-            if (readBytes < 0) break
-            digest.update(buffer, 0, readBytes)
-        }
-        def checksum = new BigInteger(1, digest.digest()).toString(16)
-        if (checksum == expectedChecksum) {
-            return
-        } else {
-            logger.quiet("Deleting old local file with wrong hash: " + localUrl)
-            file.delete()
-        }
-    }
-
-    def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=bootstrap-" + arch + "-v" + version + ".zip"
-    logger.quiet("Downloading " + remoteUrl + " ...")
-
-    file.parentFile.mkdirs()
-    def out = new BufferedOutputStream(new FileOutputStream(file))
-
-    def connection = new URL(remoteUrl).openConnection()
-    connection.setInstanceFollowRedirects(true)
-    def digestStream = new java.security.DigestInputStream(connection.inputStream, digest)
-    out << digestStream
-    out.close()
-
-    def checksum = new BigInteger(1, digest.digest()).toString(16)
-    if (checksum != expectedChecksum) {
-        file.delete()
-        throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
-    }
-}
-
-clean {
-    doLast {
-        def tree = fileTree(new File(projectDir, 'src/main/cpp'))
-        tree.include 'bootstrap-*.zip'
-        tree.each { it.delete() }
-    }
-}
-
-task downloadBootstraps(){
-    doLast {
-        def version = 25
-        downloadBootstrap("aarch64", "633baa1f7edfd81f6064338a68d1149aa203d4b24cbc4f7c64283aaca109609e", version)
-        downloadBootstrap("arm",     "a581a22e0d79a0e8cef9395b1bd951ba066ac2d688522e17cca0b3e1c0649daa", version)
-        downloadBootstrap("i686",    "8288e13f0a6ddeb2ff9406d8f968a8930a58e9318d09fadb2b7c8970a034cfdc", version)
-        downloadBootstrap("x86_64",  "c99b80a18d6bbb64c24c5a64d6ee6b8d4306729ebd172662b807bcb4a46dd39a", version)
-    }
-}
-
-afterEvaluate {
-  android.applicationVariants.all { variant ->
-    variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
-  }
-}
@@ -8,19 +8,13 @@
    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
    <uses-feature android:name="android.software.leanback" android:required="false" />

-    <permission android:name="com.termux.permission.RUN_COMMAND"
-        android:label="@string/run_command_permission_label"
-        android:description="@string/run_command_permission_description"
-        android:icon="@drawable/ic_launcher"
-        android:protectionLevel="dangerous" />
-
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>

    <application
        android:extractNativeLibs="true"
@@ -37,11 +31,11 @@

        <activity
            android:name="com.termux.app.TermuxActivity"
-	    android:label="@string/application_name"
-	    android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:label="@string/application_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:launchMode="singleTask"
            android:resizeableActivity="true"
-	    android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
@@ -85,7 +79,6 @@
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT" />
                <data android:mimeType="text/*" />
-                <data android:mimeType="application/*log*" />
                <data android:mimeType="application/json" />
                <data android:mimeType="application/*xml*" />
                <data android:mimeType="application/*latex*" />
@@ -120,15 +113,6 @@
            android:name="com.termux.app.TermuxService"
            android:exported="false" />

-        <service
-            android:name=".app.RunCommandService"
-            android:exported="true"
-            android:permission="com.termux.permission.RUN_COMMAND" >
-            <intent-filter>
-                <action android:name="com.termux.RUN_COMMAND" />
-            </intent-filter>
-        </service>
-
        <receiver android:name=".app.TermuxOpenReceiver" />

        <provider android:authorities="com.termux.files"
@@ -136,8 +120,8 @@
                  android:exported="true"
                  android:grantUriPermissions="true"
                  android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
-	<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-	<meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
+
+        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
    </application>

 </manifest>
@@ -1,5 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtermux-bootstrap
-LOCAL_SRC_FILES := termux-bootstrap-zip.S termux-bootstrap.c
-include $(BUILD_SHARED_LIBRARY)
@@ -1,18 +0,0 @@
-     .global blob
-     .global blob_size
-     .section .rodata
- blob:
- #if defined __i686__
-     .incbin "bootstrap-i686.zip"
- #elif defined __x86_64__
-     .incbin "bootstrap-x86_64.zip"
- #elif defined __aarch64__
-     .incbin "bootstrap-aarch64.zip"
- #elif defined __arm__
-     .incbin "bootstrap-arm.zip"
- #else
- # error Unsupported arch
- #endif
- 1:
- blob_size:
-     .int 1b - blob
@@ -1,11 +0,0 @@
-#include <jni.h>
-
-extern jbyte blob[];
-extern int blob_size;
-
-JNIEXPORT jbyteArray JNICALL Java_com_termux_app_TermuxInstaller_getZip(JNIEnv *env, __attribute__((__unused__)) jobject This)
-{
-    jbyteArray ret = (*env)->NewByteArray(env, blob_size);
-    (*env)->SetByteArrayRegion(env, ret, 0, blob_size, blob);
-    return ret;
-}
@@ -1,9 +1,5 @@
 package com.termux.app;

-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.os.Bundle;
 import android.util.Log;

 import java.io.BufferedReader;
@@ -28,11 +24,7 @@ public final class BackgroundJob {

    final Process mProcess;

-    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service){
-        this(cwd, fileToExecute, args, service, null);
-    }
-
-    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service) {
        String[] env = buildEnvironment(false, cwd);
        if (cwd == null) cwd = TermuxService.HOME_PATH;

@@ -51,28 +43,6 @@ public final class BackgroundJob {

        mProcess = process;
        final int pid = getPid(mProcess);
-        final Bundle result = new Bundle();
-        final StringBuilder outResult = new StringBuilder();
-        final StringBuilder errResult = new StringBuilder();
-
-        Thread errThread = new Thread() {
-            @Override
-            public void run() {
-                InputStream stderr = mProcess.getErrorStream();
-                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
-                String line;
-                try {
-                    // FIXME: Long lines.
-                    while ((line = reader.readLine()) != null) {
-                        errResult.append(line).append('\n');
-                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
-                    }
-                } catch (IOException e) {
-                    // Ignore.
-                }
-            }
-        };
-        errThread.start();

        new Thread() {
            @Override
@@ -80,13 +50,11 @@ public final class BackgroundJob {
                Log.i(LOG_TAG, "[" + pid + "] starting: " + processDescription);
                InputStream stdout = mProcess.getInputStream();
                BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
-
                String line;
                try {
                    // FIXME: Long lines.
                    while ((line = reader.readLine()) != null) {
                        Log.i(LOG_TAG, "[" + pid + "] stdout: " + line);
-                        outResult.append(line).append('\n');
                    }
                } catch (IOException e) {
                    Log.e(LOG_TAG, "Error reading output", e);
@@ -100,28 +68,29 @@ public final class BackgroundJob {
                    } else {
                        Log.w(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
                    }
-
-                    result.putString("stdout", outResult.toString());
-                    result.putInt("exitCode", exitCode);
-
-                    errThread.join();
-                    result.putString("stderr", errResult.toString());
-
-                    Intent data = new Intent();
-                    data.putExtra("result", result);
-
-                    if(pendingIntent != null) {
-                        try {
-                            pendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
-                        } catch (PendingIntent.CanceledException e) {
-                            // The caller doesn't want the result? That's fine, just ignore
-                        }
-                    }
                } catch (InterruptedException e) {
-                    // Ignore
+                    // Ignore.
                }
            }
        }.start();
+
+
+        new Thread() {
+            @Override
+            public void run() {
+                InputStream stderr = mProcess.getErrorStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        };
    }

    private static void addToEnvIfPresent(List<String> environment, String name) {
@@ -141,7 +110,7 @@ public final class BackgroundJob {
        environment.add("TERM=xterm-256color");
        environment.add("HOME=" + TermuxService.HOME_PATH);
        environment.add("PREFIX=" + TermuxService.PREFIX_PATH);
-        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
+        environment.add("BOOTCLASSPATH" + System.getenv("BOOTCLASSPATH"));
        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
        environment.add("ANDROID_DATA=" + System.getenv("ANDROID_DATA"));
        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
@@ -154,9 +123,7 @@ public final class BackgroundJob {
            // Keep the default path so that system binaries can be used in the failsafe session.
            environment.add("PATH= " + System.getenv("PATH"));
        } else {
-            if (shouldAddLdLibraryPath()) {
-                environment.add("LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib");
-            }
+            environment.add("LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib");
            environment.add("LANG=en_US.UTF-8");
            environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets");
            environment.add("PWD=" + cwd);
@@ -166,20 +133,6 @@ public final class BackgroundJob {
        return environment.toArray(new String[0]);
    }

-    private static boolean shouldAddLdLibraryPath() {
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(TermuxService.PREFIX_PATH + "/etc/apt/sources.list")))) {
-            String line;
-            while ((line = in.readLine()) != null) {
-                if (!line.startsWith("#") && line.contains("//termux.net stable")) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            Log.e(LOG_TAG, "Error trying to read sources.list", e);
-        }
-        return false;
-    }
-
    public static int getPid(Process p) {
        try {
            Field f = p.getClass().getDeclaredField("pid");
@@ -1,338 +0,0 @@
-package com.termux.app;
-
-import androidx.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class ExtraKeysInfos {
-
-    /**
-     * Matrix of buttons displayed
-     */
-    private ExtraKeyButton[][] buttons;
-
-    /**
-     * This corresponds to one of the CharMapDisplay below
-     */
-    private String style = "default";
-
-    public ExtraKeysInfos(String propertiesInfo, String style) throws JSONException {
-        this.style = style;
-
-        // Convert String propertiesInfo to Array of Arrays
-        JSONArray arr = new JSONArray(propertiesInfo);
-        Object[][] matrix = new Object[arr.length()][];
-        for (int i = 0; i < arr.length(); i++) {
-            JSONArray line = arr.getJSONArray(i);
-            matrix[i] = new Object[line.length()];
-            for (int j = 0; j < line.length(); j++) {
-                matrix[i][j] = line.get(j);
-            }
-        }
-
-        // convert matrix to buttons
-        this.buttons = new ExtraKeyButton[matrix.length][];
-        for (int i = 0; i < matrix.length; i++) {
-            this.buttons[i] = new ExtraKeyButton[matrix[i].length];
-            for (int j = 0; j < matrix[i].length; j++) {
-                Object key = matrix[i][j];
-
-                JSONObject jobject = normalizeKeyConfig(key);
-
-                ExtraKeyButton button;
-
-                if(! jobject.has("popup")) {
-                    // no popup
-                    button = new ExtraKeyButton(getSelectedCharMap(), jobject);
-                } else {
-                    // a popup
-                    JSONObject popupJobject = normalizeKeyConfig(jobject.get("popup"));
-                    ExtraKeyButton popup = new ExtraKeyButton(getSelectedCharMap(), popupJobject);
-                    button = new ExtraKeyButton(getSelectedCharMap(), jobject, popup);
-                }
-
-                this.buttons[i][j] = button;
-            }
-        }
-    }
-
-    /**
-     * "hello" -> {"key": "hello"}
-     */
-    private static JSONObject normalizeKeyConfig(Object key) throws JSONException {
-        JSONObject jobject;
-        if(key instanceof String) {
-            jobject = new JSONObject();
-            jobject.put("key", key);
-        } else if(key instanceof JSONObject) {
-            jobject = (JSONObject) key;
-        } else {
-            throw new JSONException("An key in the extra-key matrix must be a string or an object");
-        }
-        return jobject;
-    }
-
-    public ExtraKeyButton[][] getMatrix() {
-        return buttons;
-    }
-
-    /**
-     * HashMap that implements Python dict.get(key, default) function.
-     * Default java.util .get(key) is then the same as .get(key, null);
-     */
-    static class CleverMap<K,V> extends HashMap<K,V> {
-        V get(K key, V defaultValue) {
-            if(containsKey(key))
-                return get(key);
-            else
-                return defaultValue;
-        }
-    }
-
-    static class CharDisplayMap extends CleverMap<String, String> {}
-
-    /**
-     * Keys are displayed in a natural looking way, like "→" for "RIGHT"
-     */
-    static final CharDisplayMap classicArrowsDisplay = new CharDisplayMap() {{
-        // classic arrow keys (for ◀ ▶ ▲ ▼ @see arrowVariationDisplay)
-        put("LEFT", "←"); // U+2190 ← LEFTWARDS ARROW
-        put("RIGHT", "→"); // U+2192 → RIGHTWARDS ARROW
-        put("UP", "↑"); // U+2191 ↑ UPWARDS ARROW
-        put("DOWN", "↓"); // U+2193 ↓ DOWNWARDS ARROW
-    }};
-
-    static final CharDisplayMap wellKnownCharactersDisplay = new CharDisplayMap() {{
-        // well known characters // https://en.wikipedia.org/wiki/{Enter_key, Tab_key, Delete_key}
-        put("ENTER", "↲"); // U+21B2 ↲ DOWNWARDS ARROW WITH TIP LEFTWARDS
-        put("TAB", "↹"); // U+21B9 ↹ LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
-        put("BKSP", "⌫"); // U+232B ⌫ ERASE TO THE LEFT sometimes seen and easy to understand
-        put("DEL", "⌦"); // U+2326 ⌦ ERASE TO THE RIGHT not well known but easy to understand
-        put("DRAWER", "☰"); // U+2630 ☰ TRIGRAM FOR HEAVEN not well known but easy to understand
-        put("KEYBOARD", "⌨"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
-    }};
-
-    static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{
-        // https://en.wikipedia.org/wiki/{Home_key, End_key, Page_Up_and_Page_Down_keys}
-        // home key can mean "goto the beginning of line" or "goto first page" depending on context, hence the diagonal
-        put("HOME", "⇱"); // from IEC 9995 // U+21F1 ⇱ NORTH WEST ARROW TO CORNER
-        put("END", "⇲"); // from IEC 9995 // ⇲ // U+21F2 ⇲ SOUTH EAST ARROW TO CORNER
-        put("PGUP", "⇑"); // no ISO character exists, U+21D1 ⇑ UPWARDS DOUBLE ARROW will do the trick
-        put("PGDN", "⇓"); // no ISO character exists, U+21D3 ⇓ DOWNWARDS DOUBLE ARROW will do the trick
-    }};
-
-    static final CharDisplayMap arrowTriangleVariationDisplay = new CharDisplayMap() {{
-        // alternative to classic arrow keys
-        put("LEFT", "◀"); // U+25C0 ◀ BLACK LEFT-POINTING TRIANGLE
-        put("RIGHT", "▶"); // U+25B6 ▶ BLACK RIGHT-POINTING TRIANGLE
-        put("UP", "▲"); // U+25B2 ▲ BLACK UP-POINTING TRIANGLE
-        put("DOWN", "▼"); // U+25BC ▼ BLACK DOWN-POINTING TRIANGLE
-    }};
-
-    static final CharDisplayMap notKnownIsoCharacters = new CharDisplayMap() {{
-        // Control chars that are more clear as text // https://en.wikipedia.org/wiki/{Function_key, Alt_key, Control_key, Esc_key}
-        // put("FN", "FN"); // no ISO character exists
-        put("CTRL", "⎈"); // ISO character "U+2388 ⎈ HELM SYMBOL" is unknown to people and never printed on computers, however "U+25C7 ◇ WHITE DIAMOND" is a nice presentation, and "^" for terminal app and mac is often used
-        put("ALT", "⎇"); // ISO character "U+2387 ⎇ ALTERNATIVE KEY SYMBOL'" is unknown to people and only printed as the Option key "⌥" on Mac computer
-        put("ESC", "⎋"); // ISO character "U+238B ⎋ BROKEN CIRCLE WITH NORTHWEST ARROW" is unknown to people and not often printed on computers
-    }};
-
-    static final CharDisplayMap nicerLookingDisplay = new CharDisplayMap() {{
-        // nicer looking for most cases
-        put("-", "―"); // U+2015 ― HORIZONTAL BAR
-    }};
-
-    /**
-     * Multiple maps are available to quickly change
-     * the style of the keys.
-     */
-
-    /**
-     * Some classic symbols everybody knows
-     */
-    private static final CharDisplayMap defaultCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        putAll(wellKnownCharactersDisplay);
-        putAll(nicerLookingDisplay);
-        // all other characters are displayed as themselves
-    }};
-
-    /**
-     * Classic symbols and less known symbols
-     */
-    private static final CharDisplayMap lotsOfArrowsCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        putAll(wellKnownCharactersDisplay);
-        putAll(lessKnownCharactersDisplay); // NEW
-        putAll(nicerLookingDisplay);
-    }};
-
-    /**
-     * Only arrows
-     */
-    private static final CharDisplayMap arrowsOnlyCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        // putAll(wellKnownCharactersDisplay); // REMOVED
-        // putAll(lessKnownCharactersDisplay); // REMOVED
-        putAll(nicerLookingDisplay);
-    }};
-
-    /**
-     * Full Iso
-     */
-    private static final CharDisplayMap fullIsoCharDisplay = new CharDisplayMap() {{
-        putAll(classicArrowsDisplay);
-        putAll(wellKnownCharactersDisplay);
-        putAll(lessKnownCharactersDisplay); // NEW
-        putAll(nicerLookingDisplay);
-        putAll(notKnownIsoCharacters); // NEW
-    }};
-
-    /**
-     * Some people might call our keys differently
-     */
-    static private final CharDisplayMap controlCharsAliases = new CharDisplayMap() {{
-        put("ESCAPE", "ESC");
-        put("CONTROL", "CTRL");
-        put("RETURN", "ENTER"); // Technically different keys, but most applications won't see the difference
-        put("FUNCTION", "FN");
-        // no alias for ALT
-
-        // Directions are sometimes written as first and last letter for brevety
-        put("LT", "LEFT");
-        put("RT", "RIGHT");
-        put("DN", "DOWN");
-        // put("UP", "UP"); well, "UP" is already two letters
-
-        put("PAGEUP", "PGUP");
-        put("PAGE_UP", "PGUP");
-        put("PAGE UP", "PGUP");
-        put("PAGE-UP", "PGUP");
-
-        // no alias for HOME
-        // no alias for END
-
-        put("PAGEDOWN", "PGDN");
-        put("PAGE_DOWN", "PGDN");
-        put("PAGE-DOWN", "PGDN");
-
-        put("DELETE", "DEL");
-        put("BACKSPACE", "BKSP");
-
-        // easier for writing in termux.properties
-        put("BACKSLASH", "\\");
-        put("QUOTE", "\"");
-        put("APOSTROPHE", "'");
-    }};
-
-    CharDisplayMap getSelectedCharMap() {
-        switch (style) {
-            case "arrows-only":
-                return arrowsOnlyCharDisplay;
-            case "arrows-all":
-                return lotsOfArrowsCharDisplay;
-            case "all":
-                return fullIsoCharDisplay;
-            case "none":
-                return new CharDisplayMap();
-            default:
-                return defaultCharDisplay;
-        }
-    }
-
-    /**
-     * Applies the 'controlCharsAliases' mapping to all the strings in *buttons*
-     * Modifies the array, doesn't return a new one.
-     */
-    public static String replaceAlias(String key) {
-        return controlCharsAliases.get(key, key);
-    }
-}
-
-class ExtraKeyButton {
-
-    /**
-     * The key that will be sent to the terminal, either a control character
-     * defined in ExtraKeysView.keyCodesForString (LEFT, RIGHT, PGUP...) or
-     * some text.
-     */
-    private String key;
-
-    /**
-     * If the key is a macro, i.e. a sequence of keys separated by space.
-     */
-    private boolean macro;
-
-    /**
-     * The text that will be shown on the button.
-     */
-    private String display;
-
-    /**
-     * The information of the popup (triggered by swipe up).
-     */
-    @Nullable
-    private ExtraKeyButton popup = null;
-
-    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
-        this(charDisplayMap, config, null);
-    }
-
-    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config, ExtraKeyButton popup) throws JSONException {
-        String keyFromConfig = config.optString("key", null);
-        String macroFromConfig = config.optString("macro", null);
-        String[] keys;
-        if (keyFromConfig != null && macroFromConfig != null) {
-            throw new JSONException("Both key and macro can't be set for the same key");
-        } else if (keyFromConfig != null) {
-            keys = new String[]{keyFromConfig};
-            this.macro = false;
-        } else if (macroFromConfig != null) {
-            keys = macroFromConfig.split(" ");
-            this.macro = true;
-        } else {
-            throw new JSONException("All keys have to specify either key or macro");
-        }
-
-        for (int i = 0; i < keys.length; i++) {
-            keys[i] = ExtraKeysInfos.replaceAlias(keys[i]);
-        }
-
-        this.key = String.join(" ", keys);
-
-        String displayFromConfig = config.optString("display", null);
-        if (displayFromConfig != null) {
-            this.display = displayFromConfig;
-        } else {
-            this.display = Arrays.stream(keys)
-                .map(key -> charDisplayMap.get(key, key))
-                .collect(Collectors.joining(" "));
-        }
-
-        this.popup = popup;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public boolean isMacro() {
-        return macro;
-    }
-
-    public String getDisplay() {
-        return display;
-    }
-
-    @Nullable
-    public ExtraKeyButton getPopup() {
-        return popup;
-    }
-}
@@ -1,6 +1,5 @@
 package com.termux.app;

-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
@@ -14,22 +13,19 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.Arrays;

-import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.PopupWindow;
 import android.widget.ToggleButton;

 import com.termux.R;
+import com.termux.terminal.TerminalSession;
 import com.termux.view.TerminalView;

-import androidx.drawerlayout.widget.DrawerLayout;
-
 /**
 * A view showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
 * keyboard.
@@ -39,14 +35,31 @@ public final class ExtraKeysView extends GridLayout {
    private static final int TEXT_COLOR = 0xFFFFFFFF;
    private static final int BUTTON_COLOR = 0x00000000;
    private static final int INTERESTING_COLOR = 0xFF80DEEA;
-    private static final int BUTTON_PRESSED_COLOR = 0xFF7F7F7F;
+    private static final int BUTTON_PRESSED_COLOR = 0x7FFFFFFF;

    public ExtraKeysView(Context context, AttributeSet attrs) {
        super(context, attrs);
    }
-
+    
+    /**
+     * HashMap that implements Python dict.get(key, default) function.
+     * Default java.util .get(key) is then the same as .get(key, null);
+     */
+    static class CleverMap<K,V> extends HashMap<K,V> {
+        V get(K key, V defaultValue) {
+            if(containsKey(key))
+                return get(key);
+            else
+                return defaultValue;
+        }
+    }
+    
+    static class CharDisplayMap extends CleverMap<String, String> {}
+    
+    /**
+     * Keys are displayed in a natural looking way, like "→" for "RIGHT"
+     */
    static final Map<String, Integer> keyCodesForString = new HashMap<String, Integer>() {{
-        put("SPACE", KeyEvent.KEYCODE_SPACE);
        put("ESC", KeyEvent.KEYCODE_ESCAPE);
        put("TAB", KeyEvent.KEYCODE_TAB);
        put("HOME", KeyEvent.KEYCODE_MOVE_HOME);
@@ -74,79 +87,45 @@ public final class ExtraKeysView extends GridLayout {
        put("F11", KeyEvent.KEYCODE_F11);
        put("F12", KeyEvent.KEYCODE_F12);
    }};
-
-    private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean forceLeftAltDown) {
+    
+    static void sendKey(View view, String keyName) {
        TerminalView terminalView = view.findViewById(R.id.terminal_view);
-        if ("KEYBOARD".equals(keyName)) {
-            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(0, 0);
-        } else if ("DRAWER".equals(keyName)) {
-            DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
-            drawer.openDrawer(Gravity.LEFT);
-        } else if (keyCodesForString.containsKey(keyName)) {
+        if (keyCodesForString.containsKey(keyName)) {
            int keyCode = keyCodesForString.get(keyName);
-            int metaState = 0;
-            if (forceCtrlDown) {
-                metaState |= KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
-            }
-            if (forceLeftAltDown) {
-                metaState |= KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
-            }
-            KeyEvent keyEvent = new KeyEvent(0, 0, KeyEvent.ACTION_UP, keyCode, 0, metaState);
-            terminalView.onKeyDown(keyCode, keyEvent);
+            terminalView.onKeyDown(keyCode, new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+            // view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
        } else {
            // not a control char
-            keyName.codePoints().forEach(codePoint -> {
-                terminalView.inputCodePoint(codePoint, forceCtrlDown, forceLeftAltDown);
-            });
+            TerminalSession session = terminalView.getCurrentSession();
+            if (session != null && keyName.length() > 0)
+                session.write(keyName);
        }
    }
-
-    private void sendKey(View view, ExtraKeyButton buttonInfo) {
-        if (buttonInfo.isMacro()) {
-            String[] keys = buttonInfo.getKey().split(" ");
-            boolean ctrlDown = false;
-            boolean altDown = false;
-            for (String key : keys) {
-                if ("CTRL".equals(key)) {
-                    ctrlDown = true;
-                } else if ("ALT".equals(key)) {
-                    altDown = true;
-                } else {
-                    sendKey(view, key, ctrlDown, altDown);
-                    ctrlDown = false;
-                    altDown = false;
-                }
-            }
-        } else {
-            sendKey(view, buttonInfo.getKey(), false, false);
-        }
-    }
-
+    
    public enum SpecialButton {
        CTRL, ALT, FN
    }
-
+    
    private static class SpecialButtonState {
        boolean isOn = false;
        ToggleButton button = null;
    }
-
+    
    private Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
        put(SpecialButton.CTRL, new SpecialButtonState());
        put(SpecialButton.ALT, new SpecialButtonState());
        put(SpecialButton.FN, new SpecialButtonState());
    }};
-
+    
    private ScheduledExecutorService scheduledExecutor;
    private PopupWindow popupWindow;
    private int longPressCount;
-
+    
    public boolean readSpecialButton(SpecialButton name) {
        SpecialButtonState state = specialButtons.get(name);
        if (state == null)
            throw new RuntimeException("Must be a valid special button (see source)");
-
+        
        if (! state.isOn)
            return false;

@@ -187,21 +166,145 @@ public final class ExtraKeysView extends GridLayout {
        popupWindow.setFocusable(false);
        popupWindow.showAsDropDown(view, 0, -2 * height);
    }
+    
+    static final CharDisplayMap classicArrowsDisplay = new CharDisplayMap() {{
+        // classic arrow keys (for ◀ ▶ ▲ ▼ @see arrowVariationDisplay) 
+        put("LEFT", "←"); // U+2190 ← LEFTWARDS ARROW
+        put("RIGHT", "→"); // U+2192 → RIGHTWARDS ARROW
+        put("UP", "↑"); // U+2191 ↑ UPWARDS ARROW
+        put("DOWN", "↓"); // U+2193 ↓ DOWNWARDS ARROW
+    }};

+    static final CharDisplayMap wellKnownCharactersDisplay = new CharDisplayMap() {{
+        // well known characters // https://en.wikipedia.org/wiki/{Enter_key, Tab_key, Delete_key}
+        put("ENTER", "↲"); // U+21B2 ↲ DOWNWARDS ARROW WITH TIP LEFTWARDS
+        put("TAB", "↹"); // U+21B9 ↹ LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
+        put("BKSP", "⌫"); // U+232B ⌫ ERASE TO THE LEFT sometimes seen and easy to understand
+        put("DEL", "⌦"); // U+2326 ⌦ ERASE TO THE RIGHT not well known but easy to understand
+    }};
+
+    static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{
+        // https://en.wikipedia.org/wiki/{Home_key, End_key, Page_Up_and_Page_Down_keys}
+        // home key can mean "goto the beginning of line" or "goto first page" depending on context, hence the diagonal
+        put("HOME", "⇱"); // from IEC 9995 // U+21F1 ⇱ NORTH WEST ARROW TO CORNER
+        put("END", "⇲"); // from IEC 9995 // ⇲ // U+21F2 ⇲ SOUTH EAST ARROW TO CORNER
+        put("PGUP", "⇑"); // no ISO character exists, U+21D1 ⇑ UPWARDS DOUBLE ARROW will do the trick
+        put("PGDN", "⇓"); // no ISO character exists, U+21D3 ⇓ DOWNWARDS DOUBLE ARROW will do the trick
+    }};
+    
+    static final CharDisplayMap arrowTriangleVariationDisplay = new CharDisplayMap() {{
+        // alternative to classic arrow keys 
+        put("LEFT", "◀"); // U+25C0 ◀ BLACK LEFT-POINTING TRIANGLE
+        put("RIGHT", "▶"); // U+25B6 ▶ BLACK RIGHT-POINTING TRIANGLE
+        put("UP", "▲"); // U+25B2 ▲ BLACK UP-POINTING TRIANGLE
+        put("DOWN", "▼"); // U+25BC ▼ BLACK DOWN-POINTING TRIANGLE
+    }};
+    
+    static final CharDisplayMap notKnownIsoCharacters = new CharDisplayMap() {{
+        // Control chars that are more clear as text // https://en.wikipedia.org/wiki/{Function_key, Alt_key, Control_key, Esc_key}
+        // put("FN", "FN"); // no ISO character exists
+        put("CTRL", "⎈"); // ISO character "U+2388 ⎈ HELM SYMBOL" is unknown to people and never printed on computers, however "U+25C7 ◇ WHITE DIAMOND" is a nice presentation, and "^" for terminal app and mac is often used 
+        put("ALT", "⎇"); // ISO character "U+2387 ⎇ ALTERNATIVE KEY SYMBOL'" is unknown to people and only printed as the Option key "⌥" on Mac computer
+        put("ESC", "⎋"); // ISO character "U+238B ⎋ BROKEN CIRCLE WITH NORTHWEST ARROW" is unknown to people and not often printed on computers 
+    }};
+    
+    static final CharDisplayMap nicerLookingDisplay = new CharDisplayMap() {{
+        // nicer looking for most cases
+        put("-", "―"); // U+2015 ― HORIZONTAL BAR
+    }};
+    
+    /**
+     * Keys are displayed in a natural looking way, like "→" for "RIGHT" or "↲" for ENTER
+     */
+    public static final CharDisplayMap defaultCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(nicerLookingDisplay);
+        // all other characters are displayed as themselves
+    }};
+    
+    public static final CharDisplayMap lotsOfArrowsCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+    }};
+    
+    public static final CharDisplayMap arrowsOnlyCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        // putAll(wellKnownCharactersDisplay); // REMOVED
+        // putAll(lessKnownCharactersDisplay); // REMOVED
+        putAll(nicerLookingDisplay);
+    }};
+    
+    public static final CharDisplayMap fullIsoCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+        putAll(notKnownIsoCharacters); // NEW
+    }};
+    
+    /**
+     * Some people might call our keys differently
+     */
+    static final CharDisplayMap controlCharsAliases = new CharDisplayMap() {{
+        put("ESCAPE", "ESC");
+        put("CONTROL", "CTRL");
+        put("RETURN", "ENTER"); // Technically different keys, but most applications won't see the difference
+        put("FUNCTION", "FN");
+        // no alias for ALT
+        
+        // Directions are sometimes written as first and last letter for brevety
+        put("LT", "LEFT"); 
+        put("RT", "RIGHT");
+        put("DN", "DOWN");
+        // put("UP", "UP"); well, "UP" is already two letters
+        
+        put("PAGEUP", "PGUP");
+        put("PAGE_UP", "PGUP");
+        put("PAGE UP", "PGUP");
+        put("PAGE-UP", "PGUP");
+        
+        // no alias for HOME
+        // no alias for END
+        
+        put("PAGEDOWN", "PGDN");
+        put("PAGE_DOWN", "PGDN");
+        put("PAGE-DOWN", "PGDN");
+        
+        put("DELETE", "DEL");
+        put("BACKSPACE", "BKSP");
+        
+        // easier for writing in termux.properties
+        put("BACKSLASH", "\\");
+        put("QUOTE", "\"");
+        put("APOSTROPHE", "'");
+    }};
+    
+    /**
+     * Applies the 'controlCharsAliases' mapping to all the strings in *buttons*
+     * Modifies the array, doesn't return a new one.
+     */
+    void replaceAliases(String[][] buttons) {
+        for(int i = 0; i < buttons.length; i++)
+            for(int j = 0; j < buttons[i].length; j++)
+                buttons[i][j] = controlCharsAliases.get(buttons[i][j], buttons[i][j]);
+    }
+    
    /**
     * General util function to compute the longest column length in a matrix.
     */
-    static int maximumLength(Object[][] matrix) {
+    static int maximumLength(String[][] matrix) {
        int m = 0;
-        for (Object[] row : matrix)
-            m = Math.max(m, row.length);
+        for (String[] aMatrix : matrix) m = Math.max(m, aMatrix.length);
        return m;
    }
-
+    
    /**
     * Reload the view given parameters in termux.properties
     *
-     * @param infos matrix as defined in termux.properties extrakeys
+     * @param buttons matrix of String as defined in termux.properties extrakeys
     * Can Contain The Strings CTRL ALT TAB FN ENTER LEFT RIGHT UP DOWN or normal strings
     * Some aliases are possible like RETURN for ENTER, LT for LEFT and more (@see controlCharsAliases for the whole list).
     * Any string of length > 1 in total Uppercase will print a warning
@@ -213,36 +316,36 @@ public final class ExtraKeysView extends GridLayout {
     * "−" will input a "−" character
     * "-_-" will input the string "-_-"
     */
-    @SuppressLint("ClickableViewAccessibility")
-    void reload(ExtraKeysInfos infos) {
-        if(infos == null)
-            return;
-
+    void reload(String[][] buttons, CharDisplayMap charDisplayMap) {
        for(SpecialButtonState state : specialButtons.values())
            state.button = null;
-
+            
        removeAllViews();
+        
+        replaceAliases(buttons); // modifies the array

-        ExtraKeyButton[][] buttons = infos.getMatrix();
+        final int rows = buttons.length;
+        final int cols = maximumLength(buttons);

-        setRowCount(buttons.length);
-        setColumnCount(maximumLength(buttons));
+        setRowCount(rows);
+        setColumnCount(cols);

-        for (int row = 0; row < buttons.length; row++) {
+        for (int row = 0; row < rows; row++) {
            for (int col = 0; col < buttons[row].length; col++) {
-                final ExtraKeyButton buttonInfo = buttons[row][col];
-
+                final String buttonText = buttons[row][col];
+                
                Button button;
-                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
-                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey())); // for valueOf: https://stackoverflow.com/a/604426/1980630
+                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonText)) {
+                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonText)); // for valueOf: https://stackoverflow.com/a/604426/1980630
                    state.isOn = true;
                    button = state.button = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
                    button.setClickable(true);
                } else {
                    button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
                }
-
-                button.setText(buttonInfo.getDisplay());
+                
+                final String displayedText = charDisplayMap.get(buttonText, buttonText);
+                button.setText(displayedText);
                button.setTextColor(TEXT_COLOR);
                button.setPadding(0, 0, 0, 0);

@@ -262,12 +365,12 @@ public final class ExtraKeysView extends GridLayout {
                    }

                    View root = getRootView();
-                    if (Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
+                    if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonText)) {
                        ToggleButton self = (ToggleButton) finalButton;
                        self.setChecked(self.isChecked());
                        self.setTextColor(self.isChecked() ? INTERESTING_COLOR : TEXT_COLOR);
                    } else {
-                        sendKey(root, buttonInfo);
+                        sendKey(root, buttonText);
                    }
                });

@@ -277,26 +380,22 @@ public final class ExtraKeysView extends GridLayout {
                        case MotionEvent.ACTION_DOWN:
                            longPressCount = 0;
                            v.setBackgroundColor(BUTTON_PRESSED_COLOR);
-                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL").contains(buttonInfo.getKey())) {
-                                // autorepeat
+                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT").contains(buttonText)) {
                                scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
                                scheduledExecutor.scheduleWithFixedDelay(() -> {
                                    longPressCount++;
-                                    sendKey(root, buttonInfo);
+                                    sendKey(root, buttonText);
                                }, 400, 80, TimeUnit.MILLISECONDS);
                            }
                            return true;

                        case MotionEvent.ACTION_MOVE:
-                            if (buttonInfo.getPopup() != null) {
+                            // These two keys have a Move-Up button appearing
+                            if (Arrays.asList("/", "-").contains(buttonText)) {
                                if (popupWindow == null && event.getY() < 0) {
-                                    if (scheduledExecutor != null) {
-                                        scheduledExecutor.shutdownNow();
-                                        scheduledExecutor = null;
-                                    }
                                    v.setBackgroundColor(BUTTON_COLOR);
-                                    String extraButtonDisplayedText = buttonInfo.getPopup().getDisplay();
-                                    popup(v, extraButtonDisplayedText);
+                                    String text = "-".equals(buttonText) ? "|" : "\\";
+                                    popup(v, text);
                                }
                                if (popupWindow != null && event.getY() > 0) {
                                    v.setBackgroundColor(BUTTON_PRESSED_COLOR);
@@ -319,14 +418,12 @@ public final class ExtraKeysView extends GridLayout {
                                scheduledExecutor.shutdownNow();
                                scheduledExecutor = null;
                            }
-                            if (longPressCount == 0 || popupWindow != null) {
-                                if (popupWindow != null) {
+                            if (longPressCount == 0) {
+                                if (popupWindow != null && Arrays.asList("/", "-").contains(buttonText)) {
                                    popupWindow.setContentView(null);
                                    popupWindow.dismiss();
                                    popupWindow = null;
-                                    if (buttonInfo.getPopup() != null) {
-                                        sendKey(root, buttonInfo.getPopup());
-                                    }
+                                    sendKey(root, "-".equals(buttonText) ? "|" : "\\");
                                } else {
                                    v.performClick();
                                }
@@ -340,7 +437,11 @@ public final class ExtraKeysView extends GridLayout {

                LayoutParams param = new GridLayout.LayoutParams();
                param.width = 0;
-                param.height = 0;
+                if(Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) { // special handle api 21
+                    param.height = (int)(37.5 * getResources().getDisplayMetrics().density + 0.5); // 37.5 equal to R.id.viewpager layout_height / rows in DP
+                } else {
+                    param.height = 0;
+                }
                param.setMargins(0, 0, 0, 0);
                param.columnSpec = GridLayout.spec(col, GridLayout.FILL, 1.f);
                param.rowSpec = GridLayout.spec(row, GridLayout.FILL, 1.f);
@@ -1,86 +0,0 @@
-package com.termux.app;
-
-import android.app.Service;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Build;
-import android.os.IBinder;
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
-/**
- * When allow-external-apps property is set to "true", Termux is able to process execute intents
- * sent by third-party applications.
- *
- * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
- * granted by user.
- *
- * Sample code to run command "top":
- *   Intent intent = new Intent();
- *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
- *   intent.setAction("com.termux.RUN_COMMAND");
- *   intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
- *   startService(intent);
- */
-public class RunCommandService extends Service {
-
-    public static final String RUN_COMMAND_ACTION = "com.termux.RUN_COMMAND";
-    public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
-    public static final String RUN_COMMAND_ARGUMENTS = "com.termux.RUN_COMMAND_ARGUMENTS";
-    public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
-
-    class LocalBinder extends Binder {
-        public final RunCommandService service = RunCommandService.this;
-    }
-
-    private final IBinder mBinder = new RunCommandService.LocalBinder();
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
-            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(intent.getStringExtra(RUN_COMMAND_PATH)).build();
-
-            Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
-            execIntent.setClass(this, TermuxService.class);
-            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringExtra(RUN_COMMAND_ARGUMENTS));
-            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, intent.getStringExtra(RUN_COMMAND_WORKDIR));
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                this.startForegroundService(execIntent);
-            } else {
-                this.startService(execIntent);
-            }
-        }
-
-        return Service.START_NOT_STICKY;
-    }
-
-    private boolean allowExternalApps() {
-        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
-        if (!propsFile.exists())
-            propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
-
-        Properties props = new Properties();
-        try {
-            if (propsFile.isFile() && propsFile.canRead()) {
-                try (FileInputStream in = new FileInputStream(propsFile)) {
-                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
-                }
-            }
-        } catch (Exception e) {
-            Log.e("termux", "Error loading props", e);
-        }
-
-        return props.getProperty("allow-external-apps", "false").equals("true");
-    }
-}
@@ -148,7 +148,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                mSettings.reloadFromProperties(TermuxActivity.this);

                if (mExtraKeysView != null) {
-                    mExtraKeysView.reload(mSettings.mExtraKeys);
+                    mExtraKeysView.reload(mSettings.mExtraKeys, ExtraKeysView.defaultCharDisplay);
                }
            }
        }
@@ -188,12 +188,18 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    }

    /** For processes to access shared internal storage (/sdcard) we need this permission. */
+    @TargetApi(Build.VERSION_CODES.M)
    public boolean ensureStoragePermissionGranted() {
-        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-            return true;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                return true;
+            } else {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
+                return false;
+            }
        } else {
-            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
-            return false;
+            // Always granted before Android 6.0.
+            return true;
        }
    }

@@ -229,7 +235,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection


        ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
-        layoutParams.height = layoutParams.height * (mSettings.mExtraKeys == null ? 0 : mSettings.mExtraKeys.getMatrix().length);
+        layoutParams.height = layoutParams.height * mSettings.mExtraKeys.length;
        viewPager.setLayoutParams(layoutParams);

        viewPager.setAdapter(new PagerAdapter() {
@@ -250,7 +256,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                View layout;
                if (position == 0) {
                    layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
-                    mExtraKeysView.reload(mSettings.mExtraKeys);
+                    mExtraKeysView.reload(mSettings.mExtraKeys, ExtraKeysView.defaultCharDisplay);
                } else {
                    layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
                    final EditText editText = layout.findViewById(R.id.text_input);
@@ -603,9 +609,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
            new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                .setPositiveButton(android.R.string.ok, null).show();
        } else {
-            TerminalSession currentSession = getCurrentTermSession();
-            String workingDirectory = (currentSession == null) ? null : currentSession.getCwd();
-            TerminalSession newSession = mTermService.createTermSession(null, null, workingDirectory, failSafe);
+            TerminalSession newSession = mTermService.createTermSession(null, null, null, failSafe);
            if (sessionName != null) {
                newSession.mSessionName = sessionName;
            }
@@ -733,9 +737,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        // Resource path with optional query string.
        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");

-        // Fragment.
-        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
-
        // End second matching group.
        regex_sb.append(")");

@@ -757,7 +758,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
    }

    void showUrlSelection() {
-        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
+        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptText();
        LinkedHashSet<CharSequence> urlSet = extractUrls(text);
        if (urlSet.isEmpty()) {
            new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
 import android.os.UserManager;
 import android.system.Os;
@@ -15,12 +16,14 @@ import com.termux.R;
 import com.termux.terminal.EmulatorDebug;

 import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -35,7 +38,7 @@ import java.util.zip.ZipInputStream;
 * <p/>
 * (3) A staging folder, $STAGING_PREFIX, is {@link #deleteFolder(File)} if left over from broken installation below.
 * <p/>
- * (4) The zip file is loaded from a shared library.
+ * (4) The architecture is determined and an appropriate bootstrap zip url is determined in {@link #determineZipUrl()}.
 * <p/>
 * (5) The zip, containing entries relative to the $PREFIX, is is downloaded and extracted by a zip input stream
 * continuously encountering zip file entries:
@@ -79,8 +82,8 @@ final class TermuxInstaller {
                    final byte[] buffer = new byte[8096];
                    final List<Pair<String, String>> symlinks = new ArrayList<>(50);

-                    final byte[] zipBytes = loadZipBytes();
-                    try (ZipInputStream zipInput = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
+                    final URL zipUrl = determineZipUrl();
+                    try (ZipInputStream zipInput = new ZipInputStream(zipUrl.openStream())) {
                        ZipEntry zipEntry;
                        while ((zipEntry = zipInput.getNextEntry()) != null) {
                            if (zipEntry.getName().equals("SYMLINKS.txt")) {
@@ -164,13 +167,32 @@ final class TermuxInstaller {
        }
    }

-    public static byte[] loadZipBytes() {
-        // Only load the shared library when necessary to save memory usage.
-        System.loadLibrary("termux-bootstrap");
-        return getZip();
+    /** Get bootstrap zip url for this systems cpu architecture. */
+    private static URL determineZipUrl() throws MalformedURLException {
+        String archName = determineTermuxArchName();
+        String url = "https://termux.net/bootstrap/new/bootstrap-" + archName + ".zip";
+        return new URL(url);
    }

-    public static native byte[] getZip();
+    private static String determineTermuxArchName() {
+        // Note that we cannot use System.getProperty("os.arch") since that may give e.g. "aarch64"
+        // while a 64-bit runtime may not be installed (like on the Samsung Galaxy S5 Neo).
+        // Instead we search through the supported abi:s on the device, see:
+        // http://developer.android.com/ndk/guides/abis.html
+        // Note that we search for abi:s in preferred order (the ordering of the
+        // Build.SUPPORTED_ABIS list) to avoid e.g. installing arm on an x86 system where arm
+        // emulation is available.
+        for (String androidArch : Build.SUPPORTED_ABIS) {
+            switch (androidArch) {
+                case "arm64-v8a": return "aarch64";
+                case "armeabi-v7a": return "arm";
+                case "x86_64": return "x86_64";
+                case "x86": return "i686";
+            }
+        }
+        throw new RuntimeException("Unable to determine arch from Build.SUPPORTED_ABIS =  " +
+            Arrays.toString(Build.SUPPORTED_ABIS));
+    }

    /** Delete a folder and all its content or throw. Don't follow symlinks. */
    static void deleteFolder(File fileOrDirectory) throws IOException {
@@ -2,7 +2,6 @@ package com.termux.app;

 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.TypedValue;
@@ -10,7 +9,6 @@ import android.widget.Toast;
 import com.termux.terminal.TerminalSession;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;

 import java.io.File;
 import java.io.FileInputStream;
@@ -20,10 +18,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;

 import androidx.annotation.IntDef;
@@ -63,7 +58,7 @@ final class TermuxPreferences {
    private static final String CURRENT_SESSION_KEY = "current_session";
    private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";

-    private boolean mUseDarkUI;
+    private String mUseDarkUI;
    private boolean mScreenAlwaysOn;
    private int mFontSize;

@@ -71,10 +66,9 @@ final class TermuxPreferences {
    int mBellBehaviour = BELL_VIBRATE;

    boolean mBackIsEscape;
-    boolean mDisableVolumeVirtualKeys;
    boolean mShowExtraKeys;

-    ExtraKeysInfos mExtraKeys;
+    String[][] mExtraKeys;

    final List<KeyboardShortcut> shortcuts = new ArrayList<>();

@@ -134,7 +128,7 @@ final class TermuxPreferences {
    }

    boolean isUsingBlackUI() {
-        return mUseDarkUI;
+        return mUseDarkUI.toLowerCase().equals("true");
    }

    void setScreenAlwaysOn(Context context, boolean newValue) {
@@ -154,7 +148,7 @@ final class TermuxPreferences {
        }
        return null;
    }
-
+    
    void reloadFromProperties(Context context) {
        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
        if (!propsFile.exists())
@@ -167,8 +161,8 @@ final class TermuxPreferences {
                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
                }
            }
-        } catch (Exception e) {
-            Toast.makeText(context, "Could not open properties file termux.properties: " + e.getMessage(), Toast.LENGTH_LONG).show();
+        } catch (IOException e) {
+            Toast.makeText(context, "Could not open properties file termux.properties.", Toast.LENGTH_LONG).show();
            Log.e("termux", "Error loading props", e);
        }

@@ -184,39 +178,26 @@ final class TermuxPreferences {
                break;
        }

-        switch (props.getProperty("use-black-ui", "").toLowerCase()) {
-            case "true":
-                mUseDarkUI = true;
-                break;
-            case "false":
-                mUseDarkUI = false;
-                break;
-            default:
-                int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-                mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
-        }
-
-        String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+        mUseDarkUI = props.getProperty("use-black-ui", "false");

        try {
-            String extrakeyProp = props.getProperty("extra-keys", defaultExtraKeys);
-            String extraKeysStyle = props.getProperty("extra-keys-style", "default");
-            mExtraKeys = new ExtraKeysInfos(extrakeyProp, extraKeysStyle);
+            JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]"));
+
+            mExtraKeys = new String[arr.length()][];
+            for (int i = 0; i < arr.length(); i++) {
+                JSONArray line = arr.getJSONArray(i);
+                mExtraKeys[i] = new String[line.length()];
+                for (int j = 0; j < line.length(); j++) {
+                    mExtraKeys[i][j] = line.getString(j);
+                }
+            }
        } catch (JSONException e) {
            Toast.makeText(context, "Could not load the extra-keys property from the config: " + e.toString(), Toast.LENGTH_LONG).show();
            Log.e("termux", "Error loading props", e);
-
-            try {
-                mExtraKeys = new ExtraKeysInfos(defaultExtraKeys, "default");
-            } catch (JSONException e2) {
-                e2.printStackTrace();
-                Toast.makeText(context, "Can't create default extra keys", Toast.LENGTH_LONG).show();
-                mExtraKeys = null;
-            }
+            mExtraKeys = new String[0][];
        }

        mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
-        mDisableVolumeVirtualKeys = "volume".equals(props.getProperty("volume-keys", "virtual"));

        shortcuts.clear();
        parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
@@ -114,17 +114,19 @@ public final class TermuxService extends Service implements SessionChangedCallba
                mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
                mWifiLock.acquire();

-                String packageName = getPackageName();
-                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                    Intent whitelist = new Intent();
-                    whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    whitelist.setData(Uri.parse("package:" + packageName));
-                    whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    String packageName = getPackageName();
+                    if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                        Intent whitelist = new Intent();
+                        whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                        whitelist.setData(Uri.parse("package:" + packageName));
+                        whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

-                    try {
-                        startActivity(whitelist);
-                    } catch (ActivityNotFoundException e) {
-                        Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+                        try {
+                            startActivity(whitelist);
+                        } catch (ActivityNotFoundException e) {
+                            Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+                        }
                    }
                }

@@ -148,7 +150,7 @@ public final class TermuxService extends Service implements SessionChangedCallba
            String cwd = intent.getStringExtra(EXTRA_CURRENT_WORKING_DIRECTORY);

            if (intent.getBooleanExtra(EXTRA_EXECUTE_IN_BACKGROUND, false)) {
-                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, intent.getParcelableExtra("pendingIntent"));
+                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this);
                mBackgroundTasks.add(task);
                updateNotification();
            } else {
@@ -264,9 +264,7 @@ public final class TermuxViewClient implements TerminalViewClient {
    /** Handle dedicated volume buttons as virtual keys if applicable. */
    private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
        InputDevice inputDevice = event.getDevice();
-        if (mActivity.mSettings.mDisableVolumeVirtualKeys) {
-            return false;
-        } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+        if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
            // Do not steal dedicated buttons from a full external keyboard.
            return false;
        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
@@ -71,7 +71,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
        row.add(Root.COLUMN_ROOT_ID, getDocIdForFile(BASE_DIR));
        row.add(Root.COLUMN_DOCUMENT_ID, getDocIdForFile(BASE_DIR));
        row.add(Root.COLUMN_SUMMARY, null);
-        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD);
+        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH);
        row.add(Root.COLUMN_TITLE, applicationName);
        row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
        row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
@@ -117,29 +117,6 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
        return true;
    }

-    @Override
-    public String createDocument(String parentDocumentId, String mimeType, String displayName) throws FileNotFoundException {
-        File newFile = new File(parentDocumentId, displayName);
-        int noConflictId = 2;
-        while (newFile.exists()) {
-            newFile = new File(parentDocumentId, displayName + " (" + noConflictId++ + ")");
-        }
-        try {
-            boolean succeeded;
-            if (Document.MIME_TYPE_DIR.equals(mimeType)) {
-                succeeded = newFile.mkdir();
-            } else {
-                succeeded = newFile.createNewFile();
-            }
-            if (!succeeded) {
-                throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
-            }
-        } catch (IOException e) {
-            throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
-        }
-        return newFile.getPath();
-    }
-
    @Override
    public void deleteDocument(String documentId) throws FileNotFoundException {
        File file = getFileForDocId(documentId);
@@ -192,11 +169,6 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
        return result;
    }

-    @Override
-    public boolean isChildDocument(String parentDocumentId, String documentId) {
-        return documentId.startsWith(parentDocumentId);
-    }
-
    /**
     * Get the document id given a file. This document id must be consistent across time as other
     * applications may save the ID and use it to reference documents later.
@@ -248,11 +220,10 @@ public class TermuxDocumentsProvider extends DocumentsProvider {

        int flags = 0;
        if (file.isDirectory()) {
-            if (file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
+            if (file.isDirectory() && file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
        } else if (file.canWrite()) {
-            flags |= Document.FLAG_SUPPORTS_WRITE;
+            flags |= Document.FLAG_SUPPORTS_WRITE | Document.FLAG_SUPPORTS_DELETE;
        }
-        if (file.getParentFile().canWrite()) flags |= Document.FLAG_SUPPORTS_DELETE;

        final String displayName = file.getName();
        final String mimeType = getMimeType(file);
@@ -21,7 +21,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.regex.Pattern;

 public class TermuxFileReceiverActivity extends Activity {

@@ -37,11 +36,6 @@ public class TermuxFileReceiverActivity extends Activity {
     */
    boolean mFinishOnDismissNameDialog = true;

-    static boolean isSharedTextAnUrl(String sharedText) {
-        return Patterns.WEB_URL.matcher(sharedText).matches()
-            || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
-    }
-
    @Override
    protected void onResume() {
        super.onResume();
@@ -56,7 +50,7 @@ public class TermuxFileReceiverActivity extends Activity {
            final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);

            if (sharedText != null) {
-                if (isSharedTextAnUrl(sharedText)) {
+                if (Patterns.WEB_URL.matcher(sharedText).matches()) {
                    handleUrlAndFinish(sharedText);
                } else {
                    String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
@@ -1,40 +1,33 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
    <!--
        https://material.google.com/style/icons.html
    -->

-    <!-- A circle as the icon border. -->
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FFF"
-        android:strokeWidth="3"
-        android:pathData="M18,54
-                          A36,36 0 1,1 90,54
-                          A36,36 0 1,1 18,54 Z" />
+    <!-- Screen border. -->
+    <path android:fillColor="#00000000"
+          android:strokeColor="#FFF"
+          android:strokeWidth="3"
+          android:pathData="M7,4
+                            l34,0
+                            q3 0,3 3
+                            l0,34
+                            q0 3, -3 3
+                            l-34,0
+                            q-3 0, -3-3
+                            l0 -34
+                            q0 -3, 3 -3"
+          />

-    <!-- Keep in sync with ic_foreground.xml: -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M34,38
-                          h6
-                          l12,16
-                          l-12,16
-                          h-6
-                          l12,-16
-                          "
-        />
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M56,66
-                          h18
-                          v4
-                          h-18
-                          "
+    <!-- Block cursor. -->
+    <path android:fillColor="#FFF"
+          android:pathData="M14,14
+                            l5,0
+                            l0,10
+                            l-5,0"
        />

 </vector>
@@ -2,8 +2,6 @@
 <resources>
    <string name="application_name">Termux</string>
    <string name="shared_user_label">Termux user</string>
-    <string name="run_command_permission_label">Run commands in Termux environment</string>
-    <string name="run_command_permission_description">Allow third-party applications to execute arbitrary commands within Termux environment.</string>
    <string name="new_session">New session</string>
    <string name="new_session_failsafe">Failsafe</string>
    <string name="toggle_soft_keyboard">Keyboard</string>
@@ -15,7 +13,7 @@

    <string name="bootstrap_installer_body">Installing…</string>
    <string name="bootstrap_error_title">Unable to install</string>
-    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.</string>
+    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.\n\nCheck your network connection and try again.</string>
    <string name="bootstrap_error_abort">Abort</string>
    <string name="bootstrap_error_try_again">Try again</string>
    <string name="bootstrap_error_not_primary_user_message">Termux can only be installed on the primary user account.</string>
@@ -1,30 +1,25 @@
 package com.termux.app;

-import org.junit.Assert;
-import org.junit.Test;
+import junit.framework.TestCase;

 import java.util.Collections;
 import java.util.LinkedHashSet;

-public class TermuxActivityTest {
+public class TermuxActivityTest extends TestCase {

-    private void assertUrlsAre(String text, String... urls) {
-        LinkedHashSet<String> expected = new LinkedHashSet<>();
-        Collections.addAll(expected, urls);
-        Assert.assertEquals(expected, TermuxActivity.extractUrls(text));
-    }
+	private void assertUrlsAre(String text, String... urls) {
+		LinkedHashSet<String> expected = new LinkedHashSet<>();
+		Collections.addAll(expected, urls);
+		assertEquals(expected, TermuxActivity.extractUrls(text));
+	}

-    @Test
-    public void testExtractUrls() {
-        assertUrlsAre("hello http://example.com world", "http://example.com");
+	public void testExtractUrls() {
+		assertUrlsAre("hello http://example.com world", "http://example.com");

-        assertUrlsAre("http://example.com\nhttp://another.com", "http://example.com", "http://another.com");
+		assertUrlsAre("http://example.com\nhttp://another.com", "http://example.com", "http://another.com");

-        assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
-            "http://example.com", "http://more.example.com", "https://more.example.com");
-
-        assertUrlsAre("hello https://example.com/#bar https://example.com/foo#bar",
-            "https://example.com/#bar", "https://example.com/foo#bar");
-    }
+		assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
+				"http://example.com", "http://more.example.com", "https://more.example.com");
+	}

 }
@@ -1,32 +0,0 @@
-package com.termux.filepicker;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class TermuxFileReceiverActivityTest {
-
-    @Test
-    public void testIsSharedTextAnUrl() {
-        List<String> validUrls = new ArrayList<>();
-        validUrls.add("http://example.com");
-        validUrls.add("https://example.com");
-        validUrls.add("https://example.com/path/parameter=foo");
-        validUrls.add("magnet:?xt=urn:btih:d540fc48eb12f2833163eed6421d449dd8f1ce1f&dn=Ubuntu+desktop+19.04+%2864bit%29&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80&tr=udp%3A%2F%2Ftracker.ccc.de%3A80");
-        for (String url : validUrls) {
-            Assert.assertTrue(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
-        }
-
-        List<String> invalidUrls = new ArrayList<>();
-        invalidUrls.add("a test with example.com");
-        for (String url : invalidUrls) {
-            Assert.assertFalse(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
-        }
-    }
-
-}
@@ -4,7 +4,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:3.5.2'
    }
 }

@@ -13,4 +13,3 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
-android.useAndroidX=true
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=`expr $i + 1`
+        i=$((i+1))
    done
    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -175,9 +175,14 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@@ -18,7 +18,6 @@ ext {

 android {
    compileSdkVersion 28
-    ndkVersion '21.3.6528147'

    defaultConfig {
        minSdkVersion 21
@@ -61,7 +60,7 @@ tasks.withType(Test) {
 }

 dependencies {
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.12'
 }

 apply from: '../scripts/bintray-publish.gradle'
@@ -45,19 +45,11 @@ public final class TerminalBuffer {
        return getSelectedText(0, -getActiveTranscriptRows(), mColumns, mScreenRows, false).trim();
    }

-    public String getTranscriptTextWithFullLinesJoined() {
-        return getSelectedText(0, -getActiveTranscriptRows(), mColumns, mScreenRows, true, true).trim();
-    }
-
    public String getSelectedText(int selX1, int selY1, int selX2, int selY2) {
        return getSelectedText(selX1, selY1, selX2, selY2, true);
    }

    public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines) {
-        return getSelectedText(selX1, selY1, selX2, selY2, true, false);
-    }
-
-    public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolean joinBackLines, boolean joinFullLines) {
        final StringBuilder builder = new StringBuilder();
        final int columns = mColumns;

@@ -95,8 +87,7 @@ public final class TerminalBuffer {
            }
            if (lastPrintingCharIndex != -1)
                builder.append(line, x1Index, lastPrintingCharIndex - x1Index + 1);
-            boolean lineFillsWidth = lastPrintingCharIndex == x2Index - 1;
-            if ((!joinBackLines || !rowLineWrap) && (!joinFullLines || !lineFillsWidth)
+            if ((!joinBackLines || !rowLineWrap)
                && row < selY2 && row < mScreenRows - 1) builder.append('\n');
        }
        return builder.toString();
@@ -1267,7 +1267,6 @@ public final class TerminalEmulator {
                break;
            case 'c': // RIS - Reset to Initial State (http://vt100.net/docs/vt510-rm/RIS).
                reset();
-                mMainBuffer.clearTranscript();
                blockClear(0, 0, mColumns, mRows);
                setCursorPosition(0, 0);
                break;
@@ -8,7 +8,6 @@ import android.system.Os;
 import android.system.OsConstants;
 import android.util.Log;

-import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -340,26 +339,4 @@ public final class TerminalSession extends TerminalOutput {
        return mShellPid;
    }

-    /** Returns the shell's working directory or null if it was unavailable. */
-    public String getCwd() {
-        if (mShellPid < 1) {
-            return null;
-        }
-        try {
-            final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid);
-            String outputPath = new File(cwdSymlink).getCanonicalPath();
-            String outputPathWithTrailingSlash = outputPath;
-            if (!outputPath.endsWith("/")) {
-                outputPathWithTrailingSlash += '/';
-            }
-            if (!cwdSymlink.equals(outputPathWithTrailingSlash)) {
-                return outputPath;
-            }
-        } catch (IOException | SecurityException e) {
-            Log.e(EmulatorDebug.LOG_TAG, "Error getting current directory", e);
-        }
-        return null;
-    }
-
-
 }
@@ -37,12 +37,4 @@ public class ScreenBufferTest extends TerminalTestCase {
 		withTerminalSized(5, 3).enterString("ABCDE\r\nFGHIJ").assertLinesAre("ABCDE", "FGHIJ", "     ");
 		assertEquals("ABCDE\nFG", mTerminal.getSelectedText(0, 0, 1, 1));
 	}
-
-	public void testGetSelectedTextJoinFullLines() {
-		withTerminalSized(5, 3).enterString("ABCDE\r\nFG");
-		assertEquals("ABCDEFG", mTerminal.getScreen().getSelectedText(0, 0, 1, 1, true, true));
-
-		withTerminalSized(5, 3).enterString("ABC\r\nFG");
-		assertEquals("ABC\nFG", mTerminal.getScreen().getSelectedText(0, 0, 1, 1, true, true));
-	}
 }
@@ -20,7 +20,7 @@ android {
    compileSdkVersion 28

    dependencies {
-        implementation "androidx.annotation:annotation:1.1.0"
+        implementation "androidx.annotation:annotation:1.0.1"
        api project(":terminal-emulator")
    }

@@ -44,7 +44,7 @@ android {
 }

 dependencies {
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.12'
 }

 apply from: '../scripts/bintray-publish.gradle'
@@ -1,10 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="24dp"
-    android:viewportWidth="132"
-    android:viewportHeight="66">
-  <path
-      android:pathData="M52.3,1.6c-5.7,2.1 -12.9,8.6 -16,14.8 -2.2,4.1 -2.8,6.9 -3.1,14.3 -0.6,12.6 1.3,17.8 9.3,25.8 8,8 13.2,9.9 25.8,9.3 11.1,-0.5 17.3,-3.2 23.5,-10.3 6.5,-7.4 7.2,-10.8 7.2,-34.7l0,-20.8 -21.2,0.1c-16.1,-0 -22.3,0.4 -25.5,1.5z"
-      android:fillColor="#2196F3"
-      android:strokeColor="#00000000"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/text_select_handle_left_mtrl_alpha"
+        android:tint="#2196F3" />
@@ -1,10 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="24dp"
-    android:viewportWidth="132"
-    android:viewportHeight="66">
-  <path
-      android:pathData="M33,20.8c0,23.9 0.7,27.3 7.2,34.7 6.2,7.1 12.4,9.8 23.5,10.3 12.6,0.6 17.8,-1.3 25.8,-9.3 8,-8 9.9,-13.2 9.3,-25.8 -0.5,-11.1 -3.2,-17.3 -10.3,-23.5 -7.4,-6.5 -10.8,-7.2 -34.7,-7.2l-20.8,-0 0,20.8z"
-      android:fillColor="#2196F3"
-      android:strokeColor="#00000000"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/text_select_handle_right_mtrl_alpha"
+        android:tint="#2196F3" />
Author	SHA1	Message	Date
Leonid Plyushch	068cb7da50	update gradle wrapper	2019-12-02 17:22:11 +02:00
Leonid Plyushch	919dcfdf0e	extra keys: handle actions UP & CANCEL separately Related issue: https://github.com/termux/termux-app/issues/905	2019-11-24 19:11:14 +01:00
Leonid Plyushch	8a560ebdad	extra keys: improve handling of DnD mode Do not disturb mode is now handled only for SDKs pre-28. Extra keys will not vibrate only when total silence mode is used.	2019-11-24 19:11:09 +01:00
Fredrik Fornwall	847745a06e	Remove outdated tests Remove tests that asserted that Cursor Down (CUD) and Cursor Up (CUU) escape sequences were affected by the scrolling region set by DECSTBM. This was incorrect and recently fixed: https://github.com/termux/termux-app/issues/1340	2019-11-24 19:10:59 +01:00
Fredrik Fornwall	8413c4d136	Bump version to 0.83	2019-11-24 19:10:30 +01:00
Fredrik Fornwall	58389b506f	Do not limit cursor movement to scroll region The scrolling region set by DECSTBM should not affect the Cursor Down (CUD) and Cursor Up (CUU) escape sequences. Fixes #1340.	2019-11-10 22:10:10 +01:00
Fredrik Fornwall	d4c0b7cfd0	Bump version to 0.81	2019-11-10 19:15:08 +01:00
Fredrik Fornwall	908fe1ef70	Use updated android 5 bootstrap zips	2019-11-10 19:14:48 +01:00
Fredrik Fornwall	18cb23ec16	Revert "Include bootstrap zips as shared libraries" This reverts commit `e334db0c5b`.	2019-11-10 19:09:46 +01:00
Fredrik Fornwall	0e8b83c09f	Update Android gradle plug-in	2019-11-10 19:06:28 +01:00
Fredrik Fornwall	465eeb9373	Bump version to 0.79	2019-11-03 22:40:40 +01:00
Fredrik Fornwall	a4cf8f6cda	Bump version to 0.78	2019-11-03 19:17:37 +01:00
Fredrik Fornwall	4fca04b523	Bump version to 0.77	2019-11-03 19:09:55 +01:00
Leonid Plyushch	cd30112feb	always set LD_LIBRARY_PATH	2019-10-28 13:41:26 +01:00
Fredrik Fornwall	e334db0c5b	Include bootstrap zips as shared libraries	2019-10-28 13:41:26 +01:00
Leonid Plyushch	456443acf2	do not allow to backup data by Google Why: * During backup process Termux is being killed in most cases. * Backup data is limited to 25 MB. * Backup may not be performed/updated in certain cases.	2019-10-28 13:36:48 +02:00