From eac171ab0fd3f548e2a61468129c9da70085b706 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Thu, 3 Dec 2020 20:32:21 +0100
Subject: [PATCH] device: Add separate state for delete which will claim
 internally

Also rename the different claim states to make them a bit more
understandable.
---
 src/device.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/device.c b/src/device.c
index bd5a38a..3dd803b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -65,7 +65,8 @@ typedef enum {
 typedef enum {
 	STATE_CLAIMED,
 	STATE_UNCLAIMED,
-	STATE_IGNORED,
+	STATE_AUTO_CLAIM,
+	STATE_ANYTIME,
 } FprintDeviceClaimState;
 
 typedef struct {
@@ -510,11 +511,9 @@ get_claim_state_for_invocation (GDBusMethodInvocation *invocation)
 	if (g_str_equal (method_name, "Claim")) {
 		return STATE_UNCLAIMED;
 	} else if (g_str_equal (method_name, "DeleteEnrolledFingers")) {
-		if (g_object_get_qdata (G_OBJECT (invocation), quark_auth_user))
-			return STATE_CLAIMED;
-		return STATE_IGNORED;
+		return STATE_AUTO_CLAIM;
 	} else if (g_str_equal (method_name, "ListEnrolledFingers")) {
-		return STATE_IGNORED;
+		return STATE_ANYTIME;
 	}
 
 	return STATE_CLAIMED;
@@ -532,10 +531,12 @@ _fprint_device_check_claimed (FprintDevice *rdev,
 
 	requested_state = get_claim_state_for_invocation (invocation);
 
-	if (requested_state == STATE_IGNORED)
+	if (requested_state == STATE_ANYTIME)
 		return TRUE;
 
 	session = session_data_get (priv);
+	if (requested_state == STATE_AUTO_CLAIM)
+		requested_state = session ? STATE_CLAIMED : STATE_UNCLAIMED;
 
 	if (requested_state == STATE_UNCLAIMED) {
 		/* Is it already claimed? */