From a4ad06ba64f23a4a61a58e6d083a31a8fc0513da Mon Sep 17 00:00:00 2001
From: Madhumita <madhu@gluu.org>
Date: Tue, 28 Sep 2021 16:40:50 +0530
Subject: [PATCH] fix: Fido2 enrollment cancelling #143

---
 .../org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java b/app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java
index 7bde84cc..957e0f91 100644
--- a/app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java
+++ b/app/src/main/java/org/gluu/casa/ui/vm/user/SecurityKey2ViewModel.java
@@ -296,7 +296,7 @@ public void add() {
 
 	@NotifyChange({ "uiEnrolled", "uiEnrolledPlatformAuthenticator", "newDevice", "newTouchId" })
 	public void cancel() {
-		logger.info("cancel invoked");
+		
 		boolean success = false;
 		try {
 			/*
@@ -306,10 +306,12 @@ public void cancel() {
 			 * pressing cancel), we need to be obliterate the entry
 			 */
 			FidoDevice dev = null;
-			if (platformAuthenticator && Utils.isNotEmpty(newTouchId.getNickName())) {
+			if (platformAuthenticator && Utils.isNotEmpty(newTouchId.getId())) {
 				dev = newTouchId;
-			} else if (Utils.isNotEmpty(newDevice.getNickName())) {
+				logger.debug("cancel invoked - platform authenticator");
+			} else if (Utils.isNotEmpty(newDevice.getId())) {
 				dev = newDevice;
+				logger.debug("cancel invoked");
 			}
 			if (dev != null) {
 				success = fido2Service.removeDevice(dev);