Bug fixes

termux · Aug 28, 2021 · c6511a4 · c6511a4
1 parent 21aa999
commit c6511a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -18,6 +18,7 @@
 import android.widget.FrameLayout;
 import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
 import com.termux.x11.TermuxAppSharedProperties;
+import com.termux.x11.TerminalExtraKeys;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -44,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         kbd = findViewById(R.id.additionalKbd);
 	frm = findViewById(R.id.frame);
 
-	extraKeysView.setExtraKeysViewClient(new TerminalExtraKeys(LorieService.getOnKeyListener()));
+	extraKeysView.setExtraKeysViewClient(new TerminalExtraKeys(LorieService.getOnKeyListener(), this));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             getWindow().

diff --git a/app/src/main/java/com/termux/x11/TerminalExtraKeys.java b/app/src/main/java/com/termux/x11/TerminalExtraKeys.java
@@ -12,6 +12,9 @@
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.view.KeyEvent;
+import android.view.KeyCharacterMap;
+import android.text.TextUtils;
+import android.app.ActivityManager;
 
 import java.lang.Character;
 
@@ -27,9 +30,11 @@
 public class TerminalExtraKeys implements ExtraKeysView.IExtraKeysView {
 
     private final View.OnKeyListener mEventListener;
+    private final MainActivity act;
 
-    public TerminalExtraKeys(@NonNull View.OnkeyListener eventlistener) {
+    public TerminalExtraKeys(@NonNull View.OnKeyListener eventlistener, MainActivity mact) {
         mEventListener = eventlistener;
+	act = mact;
     }
 
     SurfaceView lorieView = findViewById(R.id.lorieView);
@@ -87,7 +92,7 @@ protected void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrl
                     if (events != null) {
                         for (KeyEvent event : events) {
 			    Integer keyCode = event.getKeyCode();
-			    mEventListener.onKey(lorieView, keyCode, keyEvent);
+			    mEventListener.onKey(lorieView, keyCode, event);
 			}
 		    }
             });
@@ -100,7 +105,6 @@ public boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton but
     }
 
     @SuppressLint("RtlHardcoded")
-    @Override
     public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDown, boolean altDown, boolean shiftDown, boolean fnDown) {
         if ("KEYBOARD".equals(key)) {
 
@@ -113,21 +117,20 @@ public void onTerminalExtraKeyButtonClick(View view, String key, boolean ctrlDow
 	     Intent preferencesIntent = new Intent(getApplicationContext(), LoriePreferences.class);
              preferencesIntent.setAction(ACTION_START_PREFERENCES_ACTIVITY);
 
-	     PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
              PendingIntent pendingPreferencesIntent = PendingIntent.getActivity(getApplicationContext(), 0, preferencesIntent, 0);
 
         } else if ("PASTE".equals(key)) {
 
-	    ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+	    ClipboardManager clipboard = (ClipboardManager) act.getSystemService(Context.CLIPBOARD_SERVICE);
             ClipData clipData = clipboard.getPrimaryClip();
 
 	    if (clipData != null) {
-            	CharSequence paste = clipData.getItemAt(0).coerceToText(mActivity);
+            	CharSequence paste = clipData.getItemAt(0).coerceToText(act);
             	if (!TextUtils.isEmpty(paste)) lorieView.paste(paste.toString());
             }
 
         } else {
-            super.onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
+            onTerminalExtraKeyButtonClick(view, key, ctrlDown, altDown, shiftDown, fnDown);
         }
     }