From 41b6ef0c32877384d4157a87aee01f67090b15a3 Mon Sep 17 00:00:00 2001
From: CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com>
Date: Wed, 17 Jun 2020 23:58:35 +0530
Subject: Add DeviceVerificationList to keep track of all flows and Popup on
 recieving start or request

---
 resources/qml/TimelineView.qml                     | 18 ++++---
 resources/qml/UserProfile.qml                      | 10 ++--
 .../qml/device-verification/DeviceVerification.qml | 60 ++++++++++++++++++----
 3 files changed, 67 insertions(+), 21 deletions(-)

(limited to 'resources/qml')

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index e4c820f8..5170a41a 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -103,20 +103,22 @@ Page {
 			id: deviceVerificationDialog
 			DeviceVerification {}
 		}
+		Component{
+        	id: deviceVerificationFlow
+        	DeviceVerificationFlow {}
+    	}
 		Connections {
 			target: timelineManager
-			onDeviceVerificationRequest: {
-				var dialog = deviceVerificationDialog.createObject(timelineRoot, {flow: deviceVerificationFlow});
+			onNewDeviceVerificationRequest: {
+				var newFlow = deviceVerificationFlow.createObject(timelineRoot,
+                {userId : userId,sender: false,deviceId : deviceId,tranId:transactionId});
+                deviceVerificationList.add(newFlow.tranId);
+				var dialog = deviceVerificationDialog.createObject(timelineRoot, 
+                    {flow: newFlow,sender: false});
 				dialog.show();
 			}
 		}
 
-		Button {
-			text: "test device verification"
-			onClicked: timelineManager.startDummyVerification()
-			z: 5
-		}
-
 		Label {
 			visible: !timelineManager.timeline && !timelineManager.isInitialSync
 			anchors.centerIn: parent
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index c40e6765..80415a29 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -33,8 +33,9 @@ ApplicationWindow{
 		id: deviceVerificationDialog
 		DeviceVerification {}
 	}
-    DeviceVerificationFlow {
+    Component{
         id: deviceVerificationFlow
+        DeviceVerificationFlow {}
     }
 
     background: Item{
@@ -111,10 +112,11 @@ ApplicationWindow{
                             id: verifyButton
                             text:"Verify"
                             onClicked: {
-                                deviceVerificationFlow.userId = user_data.userId
-                                deviceVerificationFlow.deviceId = model.deviceID
+                                var newFlow = deviceVerificationFlow.createObject(userProfileDialog,
+                                {userId : user_data.userId,sender: true,deviceId : model.deviceID});
+                                deviceVerificationList.add(newFlow.tranId);
 								var dialog = deviceVerificationDialog.createObject(userProfileDialog, 
-                                    {flow: deviceVerificationFlow,sender: true});
+                                    {flow: newFlow,sender: true});
 				                dialog.show();
                             }
                             contentItem: Text {
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index fca360f7..ad0edeb7 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -75,7 +75,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "Cancel"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification();
+							deviceVerificationList.remove(flow.tranId);
+							delete flow; 
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -127,7 +132,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "Deny"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification();
+							deviceVerificationList.remove(flow.tranId);
+							delete flow; 
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -166,7 +176,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "Cancel"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification();
+							deviceVerificationList.remove(flow.tranId);
+							delete flow; 
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -212,7 +227,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "They do not match!"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification();
+							deviceVerificationList.remove(flow.tranId);
+							delete flow; 
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -346,7 +366,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "They do not match!"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification();
+							deviceVerificationList.remove(flow.tranId);
+							delete flow; 
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -385,7 +410,12 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignLeft
 						text: "Cancel"
-						onClicked: { dialog.close(); flow.cancelVerification(); }
+						onClicked: { 
+							dialog.close(); 
+							flow.cancelVerification(); 
+							deviceVerificationList.remove(flow.tranId);
+							delete flow;
+						}
 					}
 					Item {
 						Layout.fillWidth: true
@@ -419,7 +449,11 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignRight
 						text: "Close"
-						onClicked: dialog.close()
+						onClicked: {
+							dialog.close()
+							deviceVerificationList.remove(flow.tranId);
+							delete flow;
+						}
 					}
 				}
 			}
@@ -450,7 +484,11 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignRight
 						text: "Close"
-						onClicked: dialog.close()
+						onClicked: {
+							dialog.close()
+							deviceVerificationList.remove(flow.tranId);
+							delete flow;
+						}
 					}
 				}
 			}
@@ -481,7 +519,11 @@ ApplicationWindow {
 					Button {
 						Layout.alignment: Qt.AlignRight
 						text: "Close"
-						onClicked: dialog.close()
+						onClicked: {
+							dialog.close()
+							deviceVerificationList.remove(flow.tranId);
+							delete flow;
+						}
 					}
 				}
 			}
-- 
cgit 1.5.1