From 38caa1831f3425a9cf1cf3f037297bd4b066364a Mon Sep 17 00:00:00 2001
From: Albert Vaca <albert.vaca@datadoghq.com>
Date: Thu, 27 Jun 2019 10:15:28 -0400
Subject: [PATCH 1/3] WIP Pointer feature in presenter plugin

---
 res/layout/activity_presenter.xml             | 47 ++++++-----
 res/values/strings.xml                        |  1 +
 .../PresenterPlugin/PresenterActivity.java    | 78 ++++++++++++++++++-
 .../PresenterPlugin/PresenterPlugin.java      | 37 ++++++++-
 4 files changed, 141 insertions(+), 22 deletions(-)

diff --git a/res/layout/activity_presenter.xml b/res/layout/activity_presenter.xml
index bd759419..eb237fc9 100644
--- a/res/layout/activity_presenter.xml
+++ b/res/layout/activity_presenter.xml
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:gravity="center"
+    android:padding="12dp"
     android:orientation="vertical">
 
-    <Space
+    <TextView
+        style="@android:style/TextAppearance.Medium"
+        android:id="@+id/textView"
+        android:layout_weight="0"
+        android:layout_marginBottom="6dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/top_space"/>
+        android:text="@string/presenter_lock_tip" />
+
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginBottom="6dp"
         android:orientation="horizontal"
-        android:layout_below="@id/top_space"
-        android:layout_above="@id/textView">
+        android:layout_weight="1">
 
         <ImageButton
             android:id="@+id/previous_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
+            android:layout_weight="0.25"
+            android:layout_marginRight="3dp"
+            android:layout_marginEnd="3dp"
             android:src="@drawable/ic_previous_black"
             android:theme="@style/DisableableButton" />
 
@@ -33,6 +39,8 @@
             android:id="@+id/next_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
+            android:layout_marginLeft="3dp"
+            android:layout_marginStart="3dp"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_ff"
             android:src="@drawable/ic_next_black"
@@ -40,13 +48,16 @@
 
     </LinearLayout>
 
-    <TextView
-        style="@android:style/TextAppearance.Medium"
-        android:padding="12dip"
-        android:id="@+id/textView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:text="@string/presenter_lock_tip" />
 
-</RelativeLayout>
+    <Button
+        android:id="@+id/pointer_button"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="6dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.30"
+        android:visibility="gone"
+        android:text="@string/presenter_pointer"
+        android:theme="@style/DisableableButton" />
+
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f3bd0cb..fb043dd7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -361,4 +361,5 @@
 
     <string name="findmyphone_preference_key_ringtone" translatable="false">findmyphone_ringtone</string>
     <string name="no_app_for_opening">No suitable app found to open this file</string>
+    <string name="presenter_pointer">Pointer</string>
 </resources>
diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
index fedea60c..43dd70a0 100644
--- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
@@ -21,28 +21,90 @@
 package org.kde.kdeconnect.Plugins.PresenterPlugin;
 
 import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorEventListener2;
+import android.hardware.SensorManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.os.PowerManager;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.UserInterface.ThemeUtil;
 import org.kde.kdeconnect_tp.R;
 
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.media.VolumeProviderCompat;
 
-public class PresenterActivity extends AppCompatActivity {
+import static androidx.core.math.MathUtils.clamp;
+
+public class PresenterActivity extends AppCompatActivity implements SensorEventListener {
 
     private MediaSessionCompat mMediaSession;
 
     private PresenterPlugin plugin;
 
+    private SensorManager sensorManager;
+    private float xPos, yPos;
+    private float xOffset, yOffset;
+
+    // TODO: Decide if move to desktop
+    static final float xMax = 800, yMax = 600;
+    static final float sensitivity = 0.05f;
+    static final float amplitude = 1.f;
+
+    public void gyroscopeEvent(SensorEvent event) {
+        xPos += -event.values[2];
+        yPos += -event.values[0];
+
+        float percentX = clamp((xPos - xOffset) * sensitivity, -amplitude, amplitude)/amplitude;
+        float percentY = clamp((yPos - yOffset) * sensitivity, -amplitude, amplitude)/amplitude;
+
+        plugin.sendPointer(percentX, percentY);
+    }
+
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_GYROSCOPE) {
+            gyroscopeEvent(event);
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        //Ignored
+    }
+
+    void enablePointer() {
+        if (sensorManager != null) {
+            return; //Already enabled
+        }
+        sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+        findViewById(R.id.pointer_button).setVisibility(View.VISIBLE);
+        findViewById(R.id.pointer_button).setOnTouchListener((v, event) -> {
+            if(event.getAction() == MotionEvent.ACTION_DOWN){
+                yOffset = yPos;
+                xOffset = xPos;
+                sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE), SensorManager.SENSOR_DELAY_GAME);
+                v.performClick(); // The linter complains if this is not called
+            }
+            else if (event.getAction() == MotionEvent.ACTION_UP) {
+                sensorManager.unregisterListener(this);
+            }
+            return true;
+        });
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -56,6 +118,12 @@ public class PresenterActivity extends AppCompatActivity {
             this.plugin = plugin;
             findViewById(R.id.next_button).setOnClickListener(v -> plugin.sendNext());
             findViewById(R.id.previous_button).setOnClickListener(v -> plugin.sendPrevious());
+            plugin.setPointerEnabledCallback(new Handler() {
+                @Override
+                public void handleMessage(Message msg) {
+                    enablePointer();
+                }
+            });
         }));
     }
     @Override
@@ -87,12 +155,18 @@ public class PresenterActivity extends AppCompatActivity {
             mMediaSession.setActive(true);
             return;
         }
-        createMediaSession(); //Mediasession will keep
+        createMediaSession();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
+
+        if (sensorManager != null) {
+            // Make sure we don't leave the listener on
+            sensorManager.unregisterListener(this);
+        }
+
         BackgroundService.removeGuiInUseCounter(this);
 
         if (mMediaSession != null) {
diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
index f36e5229..6a45376a 100644
--- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
@@ -24,6 +24,8 @@ package org.kde.kdeconnect.Plugins.PresenterPlugin;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Message;
 import android.view.KeyEvent;
 
 import org.kde.kdeconnect.NetworkPacket;
@@ -38,8 +40,13 @@ import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialK
 @PluginFactory.LoadablePlugin
 public class PresenterPlugin extends Plugin {
 
+    private final static String PACKET_TYPE_PRESENTER = "kdeconnect.presenter";
+    private final static String PACKET_TYPE_PRESENTER_CONFIG = "kdeconnect.presenter.config";
     private final static String PACKET_TYPE_MOUSEPAD_REQUEST = "kdeconnect.mousepad.request";
 
+    private boolean pointerEnabled = false;
+    private Handler pointerEnabledCallback = null;
+
     @Override
     public String getDisplayName() {
         return context.getString(R.string.pref_plugin_presenter);
@@ -72,14 +79,26 @@ public class PresenterPlugin extends Plugin {
         parentActivity.startActivity(intent);
     }
 
+    @Override
+    public boolean onPacketReceived(NetworkPacket np) {
+        if (np.getBoolean("presenter_enabled", false)) {
+            pointerEnabled = true;
+            if (pointerEnabledCallback != null) {
+                pointerEnabledCallback.dispatchMessage(new Message());
+            }
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public String[] getSupportedPacketTypes() {
-        return new String[0];
+        return new String[]{PACKET_TYPE_PRESENTER_CONFIG};
     }
 
     @Override
     public String[] getOutgoingPacketTypes() {
-        return new String[]{PACKET_TYPE_MOUSEPAD_REQUEST};
+        return new String[]{PACKET_TYPE_MOUSEPAD_REQUEST, PACKET_TYPE_PRESENTER};
     }
 
     @Override
@@ -87,6 +106,13 @@ public class PresenterPlugin extends Plugin {
         return context.getString(R.string.pref_plugin_presenter);
     }
 
+    public void setPointerEnabledCallback(Handler handler) {
+        this.pointerEnabledCallback = handler;
+        if (pointerEnabled) {
+            handler.dispatchMessage(new Message());
+        }
+    }
+
     public void sendNext() {
         NetworkPacket np = new NetworkPacket(PACKET_TYPE_MOUSEPAD_REQUEST);
         np.set("specialKey", SpecialKeysMap.get(KeyEvent.KEYCODE_PAGE_DOWN));
@@ -111,4 +137,11 @@ public class PresenterPlugin extends Plugin {
         device.sendPacket(np);
     }
 
+    public void sendPointer(float percentX, float percentY) {
+        NetworkPacket np = new NetworkPacket(PACKET_TYPE_PRESENTER);
+        np.set("px", percentX);
+        np.set("py", percentY);
+        device.sendPacket(np);
+    }
+
 }

From 98c366ee6a896769d741e4329596f6f5b5e66f2f Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Thu, 4 Jul 2019 23:20:11 +0200
Subject: [PATCH 2/3] Simplify enabling the pointer

---
 .../PresenterPlugin/PresenterActivity.java    | 18 ++++--------
 .../PresenterPlugin/PresenterPlugin.java      | 29 +++----------------
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
index 43dd70a0..955fece6 100644
--- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
@@ -59,17 +59,14 @@ public class PresenterActivity extends AppCompatActivity implements SensorEventL
     private float xPos, yPos;
     private float xOffset, yOffset;
 
-    // TODO: Decide if move to desktop
-    static final float xMax = 800, yMax = 600;
-    static final float sensitivity = 0.05f;
-    static final float amplitude = 1.f;
+    static final float SENSITIVITY = 0.05f; //TODO: Make configurable?
 
     public void gyroscopeEvent(SensorEvent event) {
         xPos += -event.values[2];
         yPos += -event.values[0];
 
-        float percentX = clamp((xPos - xOffset) * sensitivity, -amplitude, amplitude)/amplitude;
-        float percentY = clamp((yPos - yOffset) * sensitivity, -amplitude, amplitude)/amplitude;
+        float percentX = clamp((xPos - xOffset) * SENSITIVITY, -1.f, 1.f);
+        float percentY = clamp((yPos - yOffset) * SENSITIVITY, -1.f, 1.f);
 
         plugin.sendPointer(percentX, percentY);
     }
@@ -118,12 +115,9 @@ public class PresenterActivity extends AppCompatActivity implements SensorEventL
             this.plugin = plugin;
             findViewById(R.id.next_button).setOnClickListener(v -> plugin.sendNext());
             findViewById(R.id.previous_button).setOnClickListener(v -> plugin.sendPrevious());
-            plugin.setPointerEnabledCallback(new Handler() {
-                @Override
-                public void handleMessage(Message msg) {
-                    enablePointer();
-                }
-            });
+            if (plugin.isPointerSupported()) {
+                enablePointer();
+            }
         }));
     }
     @Override
diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
index 6a45376a..856f2ad7 100644
--- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
@@ -41,11 +41,11 @@ import static org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView.SpecialK
 public class PresenterPlugin extends Plugin {
 
     private final static String PACKET_TYPE_PRESENTER = "kdeconnect.presenter";
-    private final static String PACKET_TYPE_PRESENTER_CONFIG = "kdeconnect.presenter.config";
     private final static String PACKET_TYPE_MOUSEPAD_REQUEST = "kdeconnect.mousepad.request";
 
-    private boolean pointerEnabled = false;
-    private Handler pointerEnabledCallback = null;
+    public boolean isPointerSupported() {
+        return true; //TODO: Check capabilities
+    }
 
     @Override
     public String getDisplayName() {
@@ -80,21 +80,7 @@ public class PresenterPlugin extends Plugin {
     }
 
     @Override
-    public boolean onPacketReceived(NetworkPacket np) {
-        if (np.getBoolean("presenter_enabled", false)) {
-            pointerEnabled = true;
-            if (pointerEnabledCallback != null) {
-                pointerEnabledCallback.dispatchMessage(new Message());
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String[] getSupportedPacketTypes() {
-        return new String[]{PACKET_TYPE_PRESENTER_CONFIG};
-    }
+    public String[] getSupportedPacketTypes() {  return new String[0]; }
 
     @Override
     public String[] getOutgoingPacketTypes() {
@@ -106,13 +92,6 @@ public class PresenterPlugin extends Plugin {
         return context.getString(R.string.pref_plugin_presenter);
     }
 
-    public void setPointerEnabledCallback(Handler handler) {
-        this.pointerEnabledCallback = handler;
-        if (pointerEnabled) {
-            handler.dispatchMessage(new Message());
-        }
-    }
-
     public void sendNext() {
         NetworkPacket np = new NetworkPacket(PACKET_TYPE_MOUSEPAD_REQUEST);
         np.set("specialKey", SpecialKeysMap.get(KeyEvent.KEYCODE_PAGE_DOWN));

From 2595d97fad5c72d8d3a0c26bb05d9d2b9cf7ce83 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Fri, 19 Jul 2019 22:58:52 +0200
Subject: [PATCH 3/3] Use capabilities to enable presenter pointer

---
 src/org/kde/kdeconnect/Device.java                     | 10 +++++++++-
 .../Plugins/PresenterPlugin/PresenterPlugin.java       |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java
index 386e803d..5514f862 100644
--- a/src/org/kde/kdeconnect/Device.java
+++ b/src/org/kde/kdeconnect/Device.java
@@ -49,6 +49,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -86,6 +87,11 @@ public class Device implements BaseLink.PacketReceiver {
     private final SharedPreferences settings;
 
     private final CopyOnWriteArrayList<PluginsChangedListener> pluginsChangedListeners = new CopyOnWriteArrayList<>();
+    private Set<String> incomingCapabilities = new HashSet<>();
+
+    public boolean supportsPacketType(String type) {
+        return incomingCapabilities.contains(type);
+    }
 
     public interface PluginsChangedListener {
         void onPluginsChanged(Device device);
@@ -492,12 +498,14 @@ public class Device implements BaseLink.PacketReceiver {
 
         Set<String> outgoingCapabilities = identityPacket.getStringSet("outgoingCapabilities", null);
         Set<String> incomingCapabilities = identityPacket.getStringSet("incomingCapabilities", null);
+
+
         if (incomingCapabilities != null && outgoingCapabilities != null) {
             supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(incomingCapabilities, outgoingCapabilities));
         } else {
             supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins());
         }
-
+        this.incomingCapabilities = incomingCapabilities;
 
         reloadPluginsFromSettings();
 
diff --git a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
index 856f2ad7..74ff7c79 100644
--- a/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterPlugin.java
@@ -44,7 +44,7 @@ public class PresenterPlugin extends Plugin {
     private final static String PACKET_TYPE_MOUSEPAD_REQUEST = "kdeconnect.mousepad.request";
 
     public boolean isPointerSupported() {
-        return true; //TODO: Check capabilities
+        return device.supportsPacketType(PACKET_TYPE_PRESENTER);
     }
 
     @Override