- improve android handling of long press paste

Author: polymonster

core/pen/source/android/os.cpp

@@ -857,4 +857,14 @@ namespace pen
         }
     }
 
+    bool os_tapped()
+    {
+        auto env = get_jni_env();
+        if(env)
+        {
+            jmethodID method = env->GetMethodID(s_android_context.m_activity_class, "wasTapped", "()Z");
+            return env->CallBooleanMethod(s_android_context.m_activity_object, method);
+        }
+    }
+
 } // namespace pen

core/template/android/activity/pen_activity.java

@@ -15,7 +15,7 @@
 import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.content.ClipboardManager;
-import android.content.ClipData;
+
 
 import android.graphics.Canvas;
 
@@ -30,6 +30,7 @@
 import android.view.inputmethod.EditorInfo;
 import android.view.MenuItem;
 import android.view.ViewGroup;
+import android.view.GestureDetector;
 
 import androidx.security.crypto.EncryptedSharedPreferences;
 import androidx.security.crypto.MasterKey;
@@ -168,6 +169,7 @@ public class pen_activity extends Activity {
     private SharedPreferences m_sharedPrefs;
     private boolean m_canUseSharedPrefs;
 
+    public boolean tapped = false;
     public String clipboard_string = "";
     public boolean paste_enabled = false;
     final float[] lastTouch = new float[2];
@@ -261,6 +263,7 @@ protected void onCreate(Bundle arg0) {
         getWindow().setDecorFitsSystemWindows(false);
         getWindow().setStatusBarColor(android.graphics.Color.TRANSPARENT);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
 
         init(this);
         FMOD.init(this);
@@ -277,20 +280,34 @@ protected void onCreate(Bundle arg0) {
         // paste menu on long click
         m_surfaceView.setLongClickable(true);
 
+        GestureDetector gestureDetector = new GestureDetector(m_context,
+            new GestureDetector.SimpleOnGestureListener() {
+                @Override
+                public boolean onSingleTapConfirmed(MotionEvent e) {
+                    tapped = true;
+                    return true;
+                }
+            }
+        );
+
         m_surfaceView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (event.getAction() == MotionEvent.ACTION_DOWN) {
                     lastTouch[0] = event.getX();
                     lastTouch[1] = event.getY();
                 }
+                gestureDetector.onTouchEvent(event);
                 return false; // IMPORTANT: do not block long-press detection
             }
         });
 
         m_surfaceView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
+                if(!paste_enabled)
+                    return false;
+
                 showPastePopup(v, (int)lastTouch[0], (int)lastTouch[1]);
                 return true;
             }
@@ -315,7 +332,7 @@ protected void onResume() {
 	@Override
 	protected void onPause() {
 		super.onPause();
-        
+
         // kill the process when app is backgrounded
         android.os.Process.killProcess(android.os.Process.myPid());
         System.exit(0);
@@ -399,7 +416,7 @@ public static void createDirectory(String strdir)
     {
         File dir = new File(strdir);
         if (!dir.exists()) {
-            dir.mkdirs(); 
+            dir.mkdirs();
         }
     }
 
@@ -459,4 +476,11 @@ void clearClipboardString()
     {
         clipboard_string = "";
     }
+
+    boolean wasTapped()
+    {
+        boolean res = tapped;
+        tapped = false;
+        return res;
+    }
 }