version 0.105

remove restrictions from viewable file types
Fixes https://github.com/termux/termux-app/issues/1872 and similar issues.
2021-01-06 14:31:56 +02:00 · 2021-01-06 14:28:28 +02:00 · 2021-01-06 14:23:15 +02:00 · 2021-01-04 22:41:56 +01:00 · 2021-01-02 09:12:14 +01:00 · 2021-01-02 09:12:14 +01:00
20 changed files with 229 additions and 199 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
    dependencies {
        implementation "androidx.annotation:annotation:1.1.0"
        implementation "androidx.viewpager:viewpager:1.0.0"
-        implementation "androidx.drawerlayout:drawerlayout:1.1.0"
+        implementation "androidx.drawerlayout:drawerlayout:1.1.1"
        implementation project(":terminal-view")
    }

@@ -17,8 +17,8 @@ android {
        applicationId "com.termux"
        minSdkVersion project.properties.minSdkVersion.toInteger()
        targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 104
-        versionName "0.104"
+        versionCode 105
+        versionName "0.105"

        externalNativeBuild {
            ndkBuild {
@@ -64,6 +64,10 @@ android {
        }
    }

+    lintOptions {
+        disable 'ProtectedPermissions'
+    }
+
    testOptions {
        unitTests {
            includeAndroidResources = true
@@ -72,8 +76,8 @@ android {
 }

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

 task versionName {
@@ -133,11 +137,11 @@ clean {

 task downloadBootstraps(){
    doLast {
-        def version = 34
-        downloadBootstrap("aarch64", "7f56e8ee5573a8351925ff4010c6dea240cd56194ba0b9a686c3d8289859a05", version)
-        downloadBootstrap("arm",     "fa41377fb07cac2e4c15f32f3e7ea8116d60efadc1261176acb42646a71637f0", version)
-        downloadBootstrap("i686",    "61dcae560e706f808e524b8c3b234c47ea0e2bf6c6b0d5edebe53e6fdb956fe1", version)
-        downloadBootstrap("x86_64",  "1b616a4d591809874a06b06f309441320a0b9781e8ef5c148123530303b2533d", version)
+        def version = 35
+        downloadBootstrap("aarch64", "6707cc641cde13dc2f24e819cd8ca3f1a9a003577523c25beff72690588594f5", version)
+        downloadBootstrap("arm",     "eadc9afb52900dc744fdb39ed0c3dbb87ad8ce6190b27946467df7aeab353fa7", version)
+        downloadBootstrap("i686",    "b674ef43c8388dd19e0d25b024b5792c8532ee0ddcc49f90c0716042724fa905", version)
+        downloadBootstrap("x86_64",  "86043eb76efededbdf5644686a899f4d762703fe18e23fb906a2482d593d7549", version)
    }
 }

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,16 +83,15 @@
                <data android:mimeType="text/*" />
                <data android:mimeType="video/*" />
            </intent-filter>
-            <!-- Be more restrictive for viewing files, restricting ourselves to text files. -->
+            <!-- Accept multiple file types to let Termux be usable as generic file viewer. -->
            <intent-filter tools:ignore="AppLinkUrlError">
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="image/*" />
                <data android:mimeType="text/*" />
-                <data android:mimeType="application/*log*" />
-                <data android:mimeType="application/json" />
-                <data android:mimeType="application/*xml*" />
-                <data android:mimeType="application/*latex*" />
-                <data android:mimeType="application/javascript" />
+                <data android:mimeType="video/*" />
            </intent-filter>
        </activity>

--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -861,7 +861,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                    // The startActivity() call is not documented to throw IllegalArgumentException.
                    // However, crash reporting shows that it sometimes does, so catch it here.
                    new AlertDialog.Builder(this).setMessage(R.string.styling_not_installed)
-                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=com.termux.styling")))).setNegativeButton(android.R.string.cancel, null).show();
+                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://f-droid.org/en/packages/com.termux.styling/")))).setNegativeButton(android.R.string.cancel, null).show();
                }
                return true;
            }
--- a/app/src/main/res/layout/extra_keys_right.xml
+++ b/app/src/main/res/layout/extra_keys_right.xml
@@ -7,6 +7,7 @@
    android:imeOptions="actionSend|flagNoFullscreen"
    android:maxLines="1"
    android:inputType="text"
+    android:importantForAutofill="no"
    android:textColor="@android:color/white"
    android:textColorHighlight="@android:color/darker_gray"
    android:paddingTop="0dp"
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,5 @@ android.useAndroidX=true

 minSdkVersion=24
 targetSdkVersion=28
-ndkVersion=21.3.6528147
+ndkVersion=22.0.7026061
 compileSdkVersion=28
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
-    id "com.github.dcendents.android-maven" version "2.0"
+    id "com.jfrog.bintray" version "1.8.5"
+    id "com.github.dcendents.android-maven" version "2.1"
 }

 apply plugin: 'com.android.library'
@@ -11,8 +11,8 @@ ext {
    libraryName = 'TerminalEmulator'
    artifact = 'terminal-emulator'
    libraryDescription = 'The terminal emulator used in Termux'
-    siteUrl = 'https://github.com/termux/termux'
-    gitUrl = 'https://github.com/termux/termux.git'
+    siteUrl = 'https://github.com/termux/termux-app'
+    gitUrl = 'https://github.com/termux/termux-app.git'
    libraryVersion = '0.52'
 }

@@ -52,6 +52,10 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }

 tasks.withType(Test) {
@@ -61,7 +65,7 @@ tasks.withType(Test) {
 }

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

 apply from: '../scripts/bintray-publish.gradle'
--- a/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
@@ -17,13 +17,13 @@ public class ByteQueueTest extends TestCase {

 	public void testCompleteWrites() throws Exception {
 		ByteQueue q = new ByteQueue(10);
-        assertTrue(q.write(new byte[]{1, 2, 3}, 0, 3));
+		assertTrue(q.write(new byte[]{1, 2, 3}, 0, 3));

 		byte[] arr = new byte[10];
 		assertEquals(3, q.read(arr, true));
 		assertArrayEquals(new byte[]{1, 2, 3}, new byte[]{arr[0], arr[1], arr[2]});

-        assertTrue(q.write(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 10));
+		assertTrue(q.write(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 10));
 		assertEquals(10, q.read(arr, true));
 		assertArrayEquals(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, arr);
 	}
@@ -43,7 +43,7 @@ public class ByteQueueTest extends TestCase {
 	public void testWriteNotesClosing() throws Exception {
 		ByteQueue q = new ByteQueue(10);
 		q.close();
-        assertFalse(q.write(new byte[]{1, 2, 3}, 0, 3));
+		assertFalse(q.write(new byte[]{1, 2, 3}, 0, 3));
 	}

 	public void testReadNonBlocking() throws Exception {
--- a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -35,31 +35,31 @@ public class ControlSequenceIntroducerTest extends TerminalTestCase {
 		withTerminalSized(3, 2).enterString("\033[0;38;2;255;255;255;48;2;0;0;0;1;2;3;4;5;7;8;9mabc").assertLinesAre("abc", "   ");
 	}

-    /** CSI Ps b  Repeat the preceding graphic character Ps times (REP). */
-    public void testRepeat() {
-        withTerminalSized(3, 2).enterString("a\033[b").assertLinesAre("aa ", "   ");
-        withTerminalSized(3, 2).enterString("a\033[2b").assertLinesAre("aaa", "   ");
-        // When no char has been output we ignore REP:
-        withTerminalSized(3, 2).enterString("\033[b").assertLinesAre("   ", "   ");
-        // This shows that REP outputs the last emitted code point and not the one relative to the
-        // current cursor position:
-        withTerminalSized(5, 2).enterString("abcde\033[2G\033[2b\n").assertLinesAre("aeede", "     ");
-    }
+	/** CSI Ps b  Repeat the preceding graphic character Ps times (REP). */
+	public void testRepeat() {
+		withTerminalSized(3, 2).enterString("a\033[b").assertLinesAre("aa ", "   ");
+		withTerminalSized(3, 2).enterString("a\033[2b").assertLinesAre("aaa", "   ");
+		// When no char has been output we ignore REP:
+		withTerminalSized(3, 2).enterString("\033[b").assertLinesAre("   ", "   ");
+		// This shows that REP outputs the last emitted code point and not the one relative to the
+		// current cursor position:
+		withTerminalSized(5, 2).enterString("abcde\033[2G\033[2b\n").assertLinesAre("aeede", "     ");
+	}

-    /** CSI 3 J  Clear scrollback (xterm, libvte; non-standard). */
-    public void testCsi3J() {
-        withTerminalSized(3, 2).enterString("a\r\nb\r\nc\r\nd");
-        assertEquals("a\nb\nc\nd", mTerminal.getScreen().getTranscriptText());
-        enterString("\033[3J");
-        assertEquals("c\nd", mTerminal.getScreen().getTranscriptText());
+	/** CSI 3 J  Clear scrollback (xterm, libvte; non-standard). */
+	public void testCsi3J() {
+		withTerminalSized(3, 2).enterString("a\r\nb\r\nc\r\nd");
+		assertEquals("a\nb\nc\nd", mTerminal.getScreen().getTranscriptText());
+		enterString("\033[3J");
+		assertEquals("c\nd", mTerminal.getScreen().getTranscriptText());

-        withTerminalSized(3, 2).enterString("Lorem_ipsum");
-        assertEquals("Lorem_ipsum", mTerminal.getScreen().getTranscriptText());
-        enterString("\033[3J");
-        assertEquals("ipsum", mTerminal.getScreen().getTranscriptText());
+		withTerminalSized(3, 2).enterString("Lorem_ipsum");
+		assertEquals("Lorem_ipsum", mTerminal.getScreen().getTranscriptText());
+		enterString("\033[3J");
+		assertEquals("ipsum", mTerminal.getScreen().getTranscriptText());

-        withTerminalSized(3, 2).enterString("w\r\nx\r\ny\r\nz\033[?1049h\033[3J\033[?1049l");
-        assertEquals("y\nz", mTerminal.getScreen().getTranscriptText());
-    }
+		withTerminalSized(3, 2).enterString("w\r\nx\r\ny\r\nz\033[?1049h\033[3J\033[?1049l");
+		assertEquals("y\nz", mTerminal.getScreen().getTranscriptText());
+	}

 }
--- a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
@@ -18,7 +18,7 @@ public class CursorAndScreenTest extends TerminalTestCase {
 		assertLinesAre("ABCDE", "FGHIJ", "KLMNO", "PQRST", "UVWXY");
 		for (int row = 0; row < 5; row++) {
 			for (int col = 0; col < 5; col++) {
-                long s = getStyleAt(row, col);
+				long s = getStyleAt(row, col);
 				Assert.assertEquals(col, TextStyle.decodeForeColor(s));
 				Assert.assertEquals(row, TextStyle.decodeBackColor(s));
 			}
@@ -43,7 +43,7 @@ public class CursorAndScreenTest extends TerminalTestCase {
 			for (int col = 0; col < 5; col++) {
 				int wantedForeground = (row == 1 || row == 2) ? 98 : col;
 				int wantedBackground = (row == 1 || row == 2) ? 99 : (row == 0 ? 2 : row);
-                long s = getStyleAt(row, col);
+				long s = getStyleAt(row, col);
 				Assert.assertEquals(wantedForeground, TextStyle.decodeForeColor(s));
 				Assert.assertEquals(wantedBackground, TextStyle.decodeBackColor(s));
 			}
@@ -159,11 +159,11 @@ public class CursorAndScreenTest extends TerminalTestCase {
 		}
 	}

-    /**
-     * See comments on horizontal tab handling in TerminalEmulator.java.
-     *
-     * We do not want to color already written cells when tabbing over them.
-     */
+	/**
+	 * See comments on horizontal tab handling in TerminalEmulator.java.
+	 * <p/>
+	 * We do not want to color already written cells when tabbing over them.
+	 */
 	public void DISABLED_testHorizontalTabColorsBackground() {
 		withTerminalSized(10, 3).enterString("\033[48;5;15m").enterString("\t");
 		assertCursorAt(0, 8);
@@ -214,14 +214,14 @@ public class CursorAndScreenTest extends TerminalTestCase {
 				"              -");
 	}

-    public void testBackspaceAcrossWrappedLines() {
-        // Backspace should not go to previous line if not auto-wrapped:
-        withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", "   ");
-        // Backspace should go to previous line if auto-wrapped:
-        withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y  ", "   ").enterString("\b\b#").assertLinesAre("hi#", "y  ", "   ");
-        // Initial backspace should do nothing:
-        withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
-    }
+	public void testBackspaceAcrossWrappedLines() {
+		// Backspace should not go to previous line if not auto-wrapped:
+		withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", "   ");
+		// Backspace should go to previous line if auto-wrapped:
+		withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y  ", "   ").enterString("\b\b#").assertLinesAre("hi#", "y  ", "   ");
+		// Initial backspace should do nothing:
+		withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
+	}

 	public void testCursorSaveRestoreLocation() {
 		// DEC save/restore
--- a/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
@@ -174,18 +174,18 @@ public class KeyHandlerTest extends TestCase {
 		assertKeysEquals("\033[23;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F11, KeyHandler.KEYMOD_SHIFT, false, false));
 		assertKeysEquals("\033[24;2~", KeyHandler.getCode(KeyEvent.KEYCODE_F12, KeyHandler.KEYMOD_SHIFT, false, false));

-        assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
-        assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
-        assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
-        assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
-        assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
-        assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
-        assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
-        assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
-        assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
-        assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
-        assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, 0, false, false));
-        assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
-    }
+		assertKeysEquals("0", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_0, 0, false, false));
+		assertKeysEquals("1", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_1, 0, false, false));
+		assertKeysEquals("2", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_2, 0, false, false));
+		assertKeysEquals("3", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_3, 0, false, false));
+		assertKeysEquals("4", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_4, 0, false, false));
+		assertKeysEquals("5", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_5, 0, false, false));
+		assertKeysEquals("6", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_6, 0, false, false));
+		assertKeysEquals("7", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_7, 0, false, false));
+		assertKeysEquals("8", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_8, 0, false, false));
+		assertKeysEquals("9", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_9, 0, false, false));
+		assertKeysEquals(",", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_COMMA, 0, false, false));
+		assertKeysEquals(".", KeyHandler.getCode(KeyEvent.KEYCODE_NUMPAD_DOT, 0, false, false));
+	}

 }
--- a/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
@@ -93,7 +93,7 @@ public class ResizeTest extends TerminalTestCase {
 		enterString("\033[2J");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
@@ -105,7 +105,7 @@ public class ResizeTest extends TerminalTestCase {
 		// After resize, screen should still be same color:
 		for (int r = 0; r < rows - 2; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
--- a/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -107,24 +107,24 @@ public class ScrollRegionTest extends TerminalTestCase {
 		assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY");
 	}

-    /** See https://github.com/termux/termux-app/issues/1340 */
-    public void testScrollRegionDoesNotLimitCursorMovement() {
-        withTerminalSized(6, 4)
-            .enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
-            .assertLinesAre(
-                "      ",
-                "   xxx",
-                "aaa   ",
-                "      "
-            );
+	/** See https://github.com/termux/termux-app/issues/1340 */
+	public void testScrollRegionDoesNotLimitCursorMovement() {
+		withTerminalSized(6, 4)
+			.enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
+			.assertLinesAre(
+				"      ",
+				"   xxx",
+				"aaa   ",
+				"      "
+			);

-        withTerminalSized(6, 4)
-            .enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
-            .assertLinesAre(
-                "      ",
-                "      ",
-                "aaa   ",
-                "   xxx"
-            );
-    }
+		withTerminalSized(6, 4)
+			.enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
+			.assertLinesAre(
+				"      ",
+				"      ",
+				"aaa   ",
+				"   xxx"
+			);
+	}
 }
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
@@ -159,7 +159,7 @@ public class TerminalTest extends TerminalTestCase {
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);

-        // Invalid parameter:
+		// Invalid parameter:
 		enterString("\033[48;8;129m");
 		assertEquals(119, mTerminal.mForeColor);
 		assertEquals(129, mTerminal.mBackColor);
@@ -169,30 +169,30 @@ public class TerminalTest extends TerminalTestCase {
 		assertEquals(178, mTerminal.mForeColor);
 		assertEquals(179, mTerminal.mBackColor);

-        // 24 bit colors:
-        enterString(("\033[0m")); // Reset fg and bg colors.
-        enterString("\033[38;2;255;127;2m");
-        int expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-        enterString("\033[48;2;1;2;254m");
-        int expectedBackground = 0xff000000 | (1 << 16) | (2 << 8) | 254;
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
+		// 24 bit colors:
+		enterString(("\033[0m")); // Reset fg and bg colors.
+		enterString("\033[38;2;255;127;2m");
+		int expectedForeground = 0xff000000 | (255 << 16) | (127 << 8) | 2;
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
+		enterString("\033[48;2;1;2;254m");
+		int expectedBackground = 0xff000000 | (1 << 16) | (2 << 8) | 254;
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);

-        // 24 bit colors, set fg and bg at once:
-        enterString(("\033[0m")); // Reset fg and bg colors.
-        assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
-        assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
-        enterString("\033[38;2;255;127;2;48;2;1;2;254m");
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
+		// 24 bit colors, set fg and bg at once:
+		enterString(("\033[0m")); // Reset fg and bg colors.
+		assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, mTerminal.mForeColor);
+		assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, mTerminal.mBackColor);
+		enterString("\033[38;2;255;127;2;48;2;1;2;254m");
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);

-        // 24 bit colors, invalid input:
-        enterString("\033[38;2;300;127;2;48;2;1;300;254m");
-        assertEquals(expectedForeground, mTerminal.mForeColor);
-        assertEquals(expectedBackground, mTerminal.mBackColor);
-    }
+		// 24 bit colors, invalid input:
+		enterString("\033[38;2;300;127;2;48;2;1;300;254m");
+		assertEquals(expectedForeground, mTerminal.mForeColor);
+		assertEquals(expectedBackground, mTerminal.mBackColor);
+	}

 	public void testBackgroundColorErase() {
 		final int rows = 3;
@@ -200,7 +200,7 @@ public class TerminalTest extends TerminalTestCase {
 		withTerminalSized(cols, rows);
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.decodeForeColor(style));
 				assertEquals(TextStyle.COLOR_INDEX_BACKGROUND, TextStyle.decodeBackColor(style));
 			}
@@ -213,7 +213,7 @@ public class TerminalTest extends TerminalTestCase {
 		enterString("\033[2J");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals(119, TextStyle.decodeForeColor(style));
 				assertEquals(129, TextStyle.decodeBackColor(style));
 			}
@@ -224,7 +224,7 @@ public class TerminalTest extends TerminalTestCase {
 		enterString("\033[2L");
 		for (int r = 0; r < rows; r++) {
 			for (int c = 0; c < cols; c++) {
-                long style = getStyleAt(r, c);
+				long style = getStyleAt(r, c);
 				assertEquals((r == 0 || r == 1) ? 139 : 129, TextStyle.decodeBackColor(style));
 			}
 		}
@@ -289,9 +289,9 @@ public class TerminalTest extends TerminalTestCase {
 		withTerminalSized(3, 3).enterString("abc\r ").assertLinesAre(" bc", "   ", "   ").assertCursorAt(0, 1);
 	}

-    public void testTab() {
-        withTerminalSized(11, 2).enterString("01234567890\r\tXX").assertLinesAre("01234567XX0", "           ");
-        withTerminalSized(11, 2).enterString("01234567890\033[44m\r\tXX").assertLinesAre("01234567XX0", "           ");
-    }
+	public void testTab() {
+		withTerminalSized(11, 2).enterString("01234567890\r\tXX").assertLinesAre("01234567XX0", "           ");
+		withTerminalSized(11, 2).enterString("01234567890\033[44m\r\tXX").assertLinesAre("01234567XX0", "           ");
+	}

 }
--- a/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -18,7 +18,7 @@ public abstract class TerminalTestCase extends TestCase {
 		public final List<ChangedTitle> titleChanges = new ArrayList<>();
 		public final List<String> clipboardPuts = new ArrayList<>();
 		public int bellsRung = 0;
-        public int colorsChanged = 0;
+		public int colorsChanged = 0;

 		@Override
 		public void write(byte[] data, int offset, int count) {
@@ -26,10 +26,10 @@ public abstract class TerminalTestCase extends TestCase {
 		}

 		public String getOutputAndClear() {
-            String result = new String(baos.toByteArray(), StandardCharsets.UTF_8);
-            baos.reset();
-            return result;
-        }
+			String result = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+			baos.reset();
+			return result;
+		}

 		@Override
 		public void titleChanged(String oldTitle, String newTitle) {
@@ -46,11 +46,11 @@ public abstract class TerminalTestCase extends TestCase {
 			bellsRung++;
 		}

-        @Override
-        public void onColorsChanged() {
-            colorsChanged++;
-        }
-    }
+		@Override
+		public void onColorsChanged() {
+			colorsChanged++;
+		}
+	}

 	public TerminalEmulator mTerminal;
 	public MockTerminalOutput mOutput;
--- a/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
@@ -22,23 +22,23 @@ public class TextStyleTest extends TestCase {
 		}
 	}

-    public void testEncoding24Bit() {
-        int[] values = {255, 240, 127, 1, 0};
-        for (int red : values) {
-            for (int green : values) {
-                for (int blue : values) {
-                    int argb = 0xFF000000 | (red << 16) | (green << 8) | blue;
-                    long encoded = TextStyle.encode(argb, 0, 0);
-                    assertEquals(argb, TextStyle.decodeForeColor(encoded));
-                    encoded = TextStyle.encode(0, argb, 0);
-                    assertEquals(argb, TextStyle.decodeBackColor(encoded));
-                }
-            }
-        }
-    }
+	public void testEncoding24Bit() {
+		int[] values = {255, 240, 127, 1, 0};
+		for (int red : values) {
+			for (int green : values) {
+				for (int blue : values) {
+					int argb = 0xFF000000 | (red << 16) | (green << 8) | blue;
+					long encoded = TextStyle.encode(argb, 0, 0);
+					assertEquals(argb, TextStyle.decodeForeColor(encoded));
+					encoded = TextStyle.encode(0, argb, 0);
+					assertEquals(argb, TextStyle.decodeBackColor(encoded));
+				}
+			}
+		}
+	}


-    public void testEncodingCombinations() {
+	public void testEncodingCombinations() {
 		for (int f1 : ALL_EFFECTS) {
 			for (int f2 : ALL_EFFECTS) {
 				int combined = f1 | f2;
@@ -54,9 +54,9 @@ public class TextStyleTest extends TestCase {
 	}

 	public void testEncodingProtected() {
-        long encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
+		long encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
 				TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH);
-        assertEquals(0, (TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED));
+		assertEquals(0, (TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED));
 		encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
 				TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH | TextStyle.CHARACTER_ATTRIBUTE_PROTECTED);
 		assertTrue((TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_PROTECTED) != 0);
--- a/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
@@ -15,12 +15,12 @@ public class WcWidthTest extends TestCase {
 		}
 	}

-    public void testSomeWidthOne() {
-        assertWidthIs(1, 'å');
-        assertWidthIs(1, 'ä');
-        assertWidthIs(1, 'ö');
-        assertWidthIs(1, 0x23F2);
-    }
+	public void testSomeWidthOne() {
+		assertWidthIs(1, 'å');
+		assertWidthIs(1, 'ä');
+		assertWidthIs(1, 'ö');
+		assertWidthIs(1, 0x23F2);
+	}

 	public void testSomeWide() {
 		assertWidthIs(2, 'Ａ');
@@ -44,18 +44,18 @@ public class WcWidthTest extends TestCase {
 	}

 	public void testCombining() {
-        assertWidthIs(0, 0x0302);
-        assertWidthIs(0, 0x0308);
-        assertWidthIs(0, 0xFE0F);
-    }
+		assertWidthIs(0, 0x0302);
+		assertWidthIs(0, 0x0308);
+		assertWidthIs(0, 0xFE0F);
+	}

-    public void testWordJoiner() {
-        // https://en.wikipedia.org/wiki/Word_joiner
-        // The word joiner (WJ) is a code point in Unicode used to separate words when using scripts
-        // that do not use explicit spacing. It is encoded since Unicode version 3.2
-        // (released in 2002) as U+2060 WORD JOINER (HTML &#8288;).
-        // The word joiner does not produce any space, and prohibits a line break at its position.
-        assertWidthIs(0, 0x2060);
+	public void testWordJoiner() {
+		// https://en.wikipedia.org/wiki/Word_joiner
+		// The word joiner (WJ) is a code point in Unicode used to separate words when using scripts
+		// that do not use explicit spacing. It is encoded since Unicode version 3.2
+		// (released in 2002) as U+2060 WORD JOINER (HTML &#8288;).
+		// The word joiner does not produce any space, and prohibits a line break at its position.
+		assertWidthIs(0, 0x2060);
 	}

 	public void testSofthyphen() {
@@ -72,10 +72,10 @@ public class WcWidthTest extends TestCase {
 		assertWidthIs(1, 0x11A3);
 	}

-    public void testEmojis() {
-        assertWidthIs(2, 0x1F428); // KOALA.
-        assertWidthIs(2, 0x231a);  // WATCH.
-        assertWidthIs(2, 0x1F643); // UPSIDE-DOWN FACE (Unicode 8).
-    }
+	public void testEmojis() {
+		assertWidthIs(2, 0x1F428); // KOALA.
+		assertWidthIs(2, 0x231a);  // WATCH.
+		assertWidthIs(2, 0x1F643); // UPSIDE-DOWN FACE (Unicode 8).
+	}

 }
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
-    id "com.github.dcendents.android-maven" version "2.0"
+    id "com.jfrog.bintray" version "1.8.5"
+    id "com.github.dcendents.android-maven" version "2.1"
 }

 apply plugin: 'com.android.library'
@@ -11,8 +11,8 @@ ext {
    libraryName = 'TerminalView'
    artifact = 'terminal-view'
    libraryDescription = 'The terminal view used in Termux'
-    siteUrl = 'https://github.com/termux/termux'
-    gitUrl = 'https://github.com/termux/termux.git'
+    siteUrl = 'https://github.com/termux/termux-app'
+    gitUrl = 'https://github.com/termux/termux-app.git'
    libraryVersion = '0.50'
 }

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

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

 apply from: '../scripts/bintray-publish.gradle'
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -255,20 +255,7 @@ public final class TerminalView extends View {

    @Override
    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        File propsFile = new File(getContext().getFilesDir() + "/home/.termux/termux.properties");
-        if (!propsFile.exists())
-            propsFile = new File(getContext().getFilesDir() + "/home/.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);
-        }
+        Properties props = getProperties();

        if (props.getProperty("enforce-char-based-input", "false").equals("true")) {
            // Some keyboards seems do not reset the internal state on TYPE_NULL.
@@ -552,6 +539,8 @@ public final class TerminalView extends View {

    @Override
    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        Properties props = getProperties();
+
        if (LOG_KEY_EVENTS)
            Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
        if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -567,6 +556,11 @@ public final class TerminalView extends View {
                        return onKeyUp(keyCode, event);
                }
            }
+        } else if (props.getProperty("ctrl-space-workaround", "false").equals("true") &&
+                   keyCode == KeyEvent.KEYCODE_SPACE && event.isCtrlPressed()) {
+            /* ctrl + space does not work on some ROMs without this workaround.
+               However, this breaks it on devices where it works out of the box. */
+            return onKeyDown(keyCode, event);
        }
        return super.onKeyPreIme(keyCode, event);
    }
@@ -1197,7 +1191,7 @@ public final class TerminalView extends View {
            final ActionMode.Callback callback = new ActionMode.Callback() {
                @Override
                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                    int show = MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+                    int show = MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT;

                    ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                    menu.add(Menu.NONE, 1, Menu.NONE, R.string.copy_text).setShowAsAction(show);
@@ -1544,6 +1538,34 @@ public final class TerminalView extends View {
        }
    }

+    private Properties getProperties() {
+        File propsFile;
+        Properties props = new Properties();
+        String possiblePropLocations[] = {
+            getContext().getFilesDir() + "/home/.termux/termux.properties",
+            getContext().getFilesDir() + "/home/.config/termux/termux.properties"
+        };
+
+        propsFile = new File(possiblePropLocations[0]);
+        int i = 1;
+        while (!propsFile.exists() && i <= possiblePropLocations.length) {
+            propsFile = new File(possiblePropLocations[i]);
+            i += 1;
+        }
+
+        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;
+    }
+
    @RequiresApi(api = Build.VERSION_CODES.O)
    @Override
    public void autofill(AutofillValue value) {
Author	SHA1	Message	Date
Leonid Pliushch	a56cba6843	version 0.105	2021-01-06 14:31:56 +02:00
Leonid Pliushch	9228982632	remove restrictions from viewable file types Fixes https://github.com/termux/termux-app/issues/1872 and similar issues.	2021-01-06 14:28:28 +02:00
Leonid Pliushch	38114784f1	update bootstrap archives	2021-01-06 14:23:15 +02:00
Henrik Grimler	b805f1486c	Merge pull request #1869 from termux/ctrlspace Add workaround property to fix ctrl+space on devices where this does not work	2021-01-04 22:41:56 +01:00
Henrik Grimler	7d31b7f480	terminal-emulator: tests: change spaces to tabs for consistency	2021-01-02 09:12:14 +01:00
Henrik Grimler	a0298285e3	terminal-emulator: tests: avoid error about methods not being mocked unitTests.returnDefaultValues = true fixes it. More info: http://g.co/androidstudio/not-mocked	2021-01-02 09:12:14 +01:00
Lucy Phipps	538a1d5cdf	F-Droid URL for Termux:Styling	2021-01-01 23:48:34 +02:00
Henrik Grimler	f1e973f0d2	terminal-view: add "ctrl-space-workaround" property Makes it possible to run ctrl+space with hardware keyboards on devices/ROMs where it otherwise is broken. On devices where it already works this workaround breaks ctrl+space though. Where to add this fix was investigated and found by @5bodnar.	2021-01-01 19:20:16 +01:00
Henrik Grimler	b467b68f7b	terminal-view: mv code to get properties to its own function	2021-01-01 19:20:11 +01:00
Henrik Grimler	b895cbbb1e	app: set importantForAutofill="no" for extra keys input field Fixes warning "extra_keys_right.xml:2: Missing autofillHints attribute".	2021-01-01 18:13:37 +01:00
Henrik Grimler	fc30eba247	terminal-view: silence warning from use of SHOW_AS_ACTION_ALWAYS ``` Prefer "SHOW_AS_ACTION_IF_ROOM" instead of "SHOW_AS_ACTION_ALWAYS" ```	2021-01-01 18:13:36 +01:00
Henrik Grimler	b1d4c0c7fe	app: disable test for "ProtectedPermissions" Needed for tests to pass after READ_LOGS and WRITE_SECURE_SETTINGS were added to AndroidManifest.xml.	2021-01-01 18:13:36 +01:00
Henrik Grimler	7fe5bd32c8	Update ndk to r22	2021-01-01 18:12:53 +01:00
Henrik Grimler	43bbef9a11	Update plugins and gradle to latest versions	2021-01-01 18:12:53 +01:00
Henrik Grimler	eaea0f74a5	Fix github links for terminal-{emulator,view} jcenter packages	2021-01-01 18:12:53 +01:00