From 6da339028dbb649aef234cba8d97802d226b294c Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sat, 20 Jul 2019 14:04:34 +0000
Subject: [PATCH] [plugins/photo] Send cancel packet when user aborts camera

---
 .../kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java   | 2 ++
 src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java
index 8810bbb1..aeb76e1b 100644
--- a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoActivity.java
@@ -64,6 +64,8 @@ public class PhotoActivity extends AppCompatActivity {
 
         if (resultCode == -1) {
             plugin.sendPhoto(photoURI);
+        } else {
+            plugin.sendCancel();
         }
         finish();
     }
diff --git a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java
index 17760668..6992fd78 100644
--- a/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/PhotoPlugin/PhotoPlugin.java
@@ -88,4 +88,10 @@ public class PhotoPlugin extends Plugin {
     public Drawable getIcon() {
         return ContextCompat.getDrawable(context, R.drawable.ic_camera);
     }
+
+    void sendCancel() {
+        NetworkPacket np = new NetworkPacket(PACKET_TYPE_PHOTO);
+        np.set("cancel", true);
+        device.sendPacket(np);
+    }
 }