Prevent crash when clearing the focus of the URL bar

This change prevents a crash when clearing the focus of the URL bar from the wrong thread.
Igalia · May 10, 2024 · 250300e · 250300e
1 parent 67ad3c3
commit 250300e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/KeyboardWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/KeyboardWidget.java
@@ -1008,16 +1008,17 @@ private void handleDone() {
         }
         final InputConnection connection = mInputConnection;
         final int action = mEditorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;
+        final boolean hide = (action == EditorInfo.IME_ACTION_DONE) || (action == EditorInfo.IME_ACTION_GO) ||
+                (action == EditorInfo.IME_ACTION_SEARCH) || (action == EditorInfo.IME_ACTION_SEND);
         postInputCommand(() -> postDisplayCommand(() -> {
             // Handle the action before clearing the focus, otherwise URL autocomplete will be lost.
             connection.performEditorAction(action);
 
-            boolean hide = (action == EditorInfo.IME_ACTION_DONE) || (action == EditorInfo.IME_ACTION_GO) ||
-                (action == EditorInfo.IME_ACTION_SEARCH) || (action == EditorInfo.IME_ACTION_SEND);
-
-            if (hide && mFocusedView != null) {
-                mFocusedView.clearFocus();
-            }
+            postUICommand(() -> {
+                if (hide && mFocusedView != null) {
+                    mFocusedView.clearFocus();
+                }
+            });
         }));
     }