Merge pull request #5 from billybox1926-jpg/workbench-app-issue-factory

Fix properties symlink, Caps Lock Ctrl, and shared URI routing

Author: billybox1926-jpg

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -11,7 +11,9 @@
 import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -860,8 +862,10 @@ public boolean isTerminalToolbarTextInputViewSelected() {
 
     public void termuxSessionListNotifyUpdated() {
         // Ensure adapter notification always runs on the UI thread to prevent
-        // IllegalStateException from ListView when modified from background. (#5027)
-        runOnUiThread(() -> mTermuxSessionListViewController.notifyDataSetChanged());
+        // IllegalStateException from ListView when modified from background. (#5027, #4706)
+        // Use postAtFrontOfQueue to ensure notifyDataSetChanged is processed before
+        // any pending layout passes that might see stale data.
+        new Handler(Looper.getMainLooper()).postAtFrontOfQueue(() -> mTermuxSessionListViewController.notifyDataSetChanged());
     }
 
     public boolean isVisible() {

app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java

@@ -58,7 +58,28 @@ static boolean isSharedTextAnUrl(String sharedText) {
         if (sharedText == null || sharedText.isEmpty()) return false;
 
         return Patterns.WEB_URL.matcher(sharedText).matches()
-            || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
+            || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText)
+            || isNonFileUrlScheme(sharedText);
+    }
+
+    /**
+     * Check if the shared text is a URL with a non-file URI scheme that should be opened
+     * with the url-opener script rather than saved as a file. (#3935)
+     */
+    static boolean isNonFileUrlScheme(String sharedText) {
+        try {
+            Uri uri = Uri.parse(sharedText);
+            String scheme = uri.getScheme();
+            if (scheme == null || scheme.isEmpty()) return false;
+            if (UriScheme.SCHEME_CONTENT.equalsIgnoreCase(scheme) || UriScheme.SCHEME_FILE.equalsIgnoreCase(scheme)) return false;
+            if (uri.getHost() != null && !uri.getHost().isEmpty()) return true;
+            return "mailto".equalsIgnoreCase(scheme) || "tel".equalsIgnoreCase(scheme)
+                || "irc".equalsIgnoreCase(scheme) || "ircs".equalsIgnoreCase(scheme)
+                || "gopher".equalsIgnoreCase(scheme) || "sftp".equalsIgnoreCase(scheme)
+                || "nfs".equalsIgnoreCase(scheme) || "smb".equalsIgnoreCase(scheme);
+        } catch (Exception e) {
+            return false;
+        }
     }
 
     @Override
@@ -79,7 +100,15 @@ protected void onResume() {
             final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
 
             if (sharedUri != null) {
-                handleContentUri(sharedUri, sharedTitle);
+                String sharedScheme = sharedUri.getScheme();
+                if (sharedScheme != null
+                    && !UriScheme.SCHEME_CONTENT.equals(sharedScheme)
+                    && !UriScheme.SCHEME_FILE.equals(sharedScheme)
+                    && sharedUri.getHost() != null && !sharedUri.getHost().isEmpty()) {
+                    handleUrlAndFinish(sharedUri.toString());
+                } else {
+                    handleContentUri(sharedUri, sharedTitle);
+                }
             } else if (sharedText != null) {
                 if (isSharedTextAnUrl(sharedText)) {
                     handleUrlAndFinish(sharedText);
@@ -142,24 +171,25 @@ void handleContentUri(@NonNull final Uri uri, String subjectFromIntent) {
         try {
             Logger.logVerbose(LOG_TAG, "uri: \"" + uri + "\", path: \"" + uri.getPath() + "\", fragment: \"" + uri.getFragment() + "\"");
 
-            String attachmentFileName = null;
+            // Offload all potentially blocking I/O to a background thread,
+            // including ContentResolver.query() and openInputStream(). (#5093)
+            new Thread(() -> {
+                try {
+                    String attachmentFileName = null;
 
-            String[] projection = new String[]{OpenableColumns.DISPLAY_NAME};
-            try (Cursor c = getContentResolver().query(uri, projection, null, null, null)) {
-                if (c != null && c.moveToFirst()) {
-                    final int fileNameColumnId = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                    if (fileNameColumnId >= 0) attachmentFileName = c.getString(fileNameColumnId);
-                }
-            }
+                    String[] projection = new String[]{OpenableColumns.DISPLAY_NAME};
+                    try (Cursor c = getContentResolver().query(uri, projection, null, null, null)) {
+                        if (c != null && c.moveToFirst()) {
+                            final int fileNameColumnId = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                            if (fileNameColumnId >= 0) attachmentFileName = c.getString(fileNameColumnId);
+                        }
+                    }
 
-            if (attachmentFileName == null) attachmentFileName = subjectFromIntent;
-            if (attachmentFileName == null) attachmentFileName = UriUtils.getUriFileBasename(uri, true);
+                    if (attachmentFileName == null) attachmentFileName = subjectFromIntent;
+                    if (attachmentFileName == null) attachmentFileName = UriUtils.getUriFileBasename(uri, true);
 
-            final String finalAttachmentFileName = attachmentFileName;
+                    final String finalAttachmentFileName = attachmentFileName;
 
-            // Offload potentially blocking I/O to a background thread
-            new Thread(() -> {
-                try {
                     InputStream in = getContentResolver().openInputStream(uri);
                     // Switch back to UI thread for dialog interaction
                     runOnUiThread(() -> promptNameAndSave(in, finalAttachmentFileName));

app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java

@@ -32,6 +32,7 @@
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSessionClient;
 import com.termux.terminal.TextStyle;
+import com.termux.shared.view.KeyboardUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -196,6 +197,14 @@ public void onCopyTextToClipboard(@NonNull TerminalSession session, String text)
         if (!mActivity.isVisible()) return;
 
         ShareUtils.copyTextToClipboard(mActivity, text);
+
+        // Re-show the keyboard after clipboard copy since some ROMs (e.g. Samsung)
+        // dismiss the keyboard when setPrimaryClip() is called. (#3884)
+        mActivity.getTerminalView().postDelayed(() -> {
+            if (mActivity.isVisible() && mActivity.getTerminalView().hasWindowFocus()) {
+                KeyboardUtils.showSoftKeyboard(mActivity, mActivity.getTerminalView());
+            }
+        }, 100);
     }
 
     @Override

app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java

@@ -62,6 +62,9 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
+    /** Keeping track of whether Caps Lock is being treated as Ctrl (physical keyboard remap). */
+    boolean mCapsLockAsCtrl;
+
     private Runnable mShowSoftKeyboardRunnable;
 
     private boolean mShowSoftKeyboardIgnoreOnce;
@@ -322,7 +325,12 @@ private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
 
     @Override
     public boolean readControlKey() {
-        return readExtraKeysSpecialButton(SpecialButton.CTRL) || mVirtualControlKeyDown;
+        return readExtraKeysSpecialButton(SpecialButton.CTRL) || mVirtualControlKeyDown || mCapsLockAsCtrl;
+    }
+
+    @Override
+    public void setCapsLockAsCtrl(boolean down) {
+        mCapsLockAsCtrl = down;
     }
 
     @Override

app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java

@@ -18,7 +18,7 @@ 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("https://example.com/path");
         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(FileReceiverActivity.isSharedTextAnUrl(url));

terminal-view/src/main/java/com/termux/view/TerminalView.java

@@ -784,6 +784,18 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             return true;
         } else if (keyCode == KeyEvent.KEYCODE_LANGUAGE_SWITCH) {
             return super.onKeyDown(keyCode, event);
+        } else if (keyCode == KeyEvent.KEYCODE_ZENKAKU_HANKAKU ||
+                   keyCode == KeyEvent.KEYCODE_HENKAN ||
+                   keyCode == KeyEvent.KEYCODE_MUHENKAN ||
+                   keyCode == KeyEvent.KEYCODE_YEN ||
+                   keyCode == KeyEvent.KEYCODE_RO) {
+            return super.onKeyDown(keyCode, event);
+        } else if (keyCode == KeyEvent.KEYCODE_CAPS_LOCK) {
+            // Treat Caps Lock as Ctrl for physical keyboards where Caps Lock is
+            // remapped to Ctrl at the Android system level. Toggle virtual Ctrl state
+            // on key down and consume the event so it does not toggle Caps Lock LED.
+            mClient.setCapsLockAsCtrl(event.getAction() == KeyEvent.ACTION_DOWN);
+            return true;
         }
 
         final int metaState = event.getMetaState();
@@ -971,6 +983,10 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
             invalidate();
             return true;
         } else if (event.isSystem()) {
+            if (keyCode == KeyEvent.KEYCODE_CAPS_LOCK) {
+                // Reset the Caps Lock as Ctrl state on key up. (#4281)
+                mClient.setCapsLockAsCtrl(false);
+            }
             // Let system key events through.
             return super.onKeyUp(keyCode, event);
         }

terminal-view/src/main/java/com/termux/view/TerminalViewClient.java

@@ -52,6 +52,8 @@ public interface TerminalViewClient {
 
     boolean readControlKey();
 
+    void setCapsLockAsCtrl(boolean down);
+
     boolean readAltKey();
 
     boolean readShiftKey();

termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java

@@ -258,8 +258,8 @@ public static Properties getPropertiesFromFile(Context context, File propertiesF
 
     /** Returns the first {@link File} found in
      * {@code propertiesFilePaths} from which app properties can be loaded. If the {@link File} found
-     * is not a regular file or is not readable, then {@code null} is returned. Symlinks **will not**
-     * be followed for potential security reasons.
+     * is not a regular file or is not readable, then {@code null} is returned. Symlinks will be
+     * followed so that properties files can be symlinks.
      *
      * @param propertiesFilePaths The {@link List<String>} containing properties file paths.
      * @param logTag If log tag to use for logging errors.
@@ -272,8 +272,8 @@ public static File getPropertiesFileFromList(List<String> propertiesFilePaths, @
         for(String propertiesFilePath : propertiesFilePaths) {
             File propertiesFile = new File(propertiesFilePath);
 
-            // Symlinks **will not** be followed.
-            FileType fileType = FileUtils.getFileType(propertiesFilePath, false);
+            // Follow symlinks so that termux.properties can be a symlink. (#4157)
+            FileType fileType = FileUtils.getFileType(propertiesFilePath, true);
             if (fileType == FileType.REGULAR) {
                 if (propertiesFile.canRead())
                     return propertiesFile;

termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java

@@ -77,6 +77,10 @@ public boolean readFnKey() {
         return false;
     }
 
+    @Override
+    public void setCapsLockAsCtrl(boolean down) {
+    }
+
 
 
     @Override