d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wrong tran_id issue

Browse source
This commit is contained in:
Chethan2k1 2020-09-10 09:56:14 +05:30
parent 898be090af
commit e70b4e4268
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/TimelineView.qml
View file

@ -118,7 +118,7 @@ Page {
deviceVerificationList.add(flow.tranId);
break;
}
var dialog = deviceVerificationDialog.createObject(timelineRoot, {flow: flow,isRequest = isRequest});
var dialog = deviceVerificationDialog.createObject(timelineRoot, {flow: flow,isRequest: isRequest,tran_id: flow.tranId});
dialog.show();
}
}

4
resources/qml/UserProfile.qml
View file

@ -94,7 +94,7 @@ ApplicationWindow{
newFlow.userId = profile.userid;
newFlow.sender = true;
deviceVerificationList.add(newFlow.tranId);
var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest: true});
var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest: true,tran_id: newFlow.tranId});
dialog.show();
}
}
@ -206,7 +206,7 @@ ApplicationWindow{
deviceVerificationList.updateProfile(newFlow.userId);
}else{
deviceVerificationList.add(newFlow.tranId);
var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest:false});
var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest:false,tran_id: newFlow.tranId});
dialog.show();
}
}

19
resources/qml/device-verification/DeviceVerification.qml
View file

@ -24,6 +24,7 @@ ApplicationWindow {
property var flow
property bool isRequest
property var tran_id
Connections {
target: flow
@ -82,6 +83,7 @@ ApplicationWindow {
}
onClicked: {
dialog.close();
deviceVerificationList.remove(tran_id);
delete flow;
}
}
@ -141,7 +143,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
}
}
Item {
@ -205,7 +207,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
}
}
Item {
@ -267,7 +269,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
}
}
Item {
@ -426,7 +428,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
}
}
Item {
@ -487,8 +489,7 @@ ApplicationWindow {
onClicked: {
dialog.close();
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(flow.tranId);
delete flow;
deviceVerificationList.remove(tran_id);
}
}
Item {
@ -534,7 +535,7 @@ ApplicationWindow {
}
onClicked: {
dialog.close()
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
delete flow;
}
}
@ -578,7 +579,7 @@ ApplicationWindow {
}
onClicked: {
dialog.close();
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
}
}
}
@ -622,7 +623,7 @@ ApplicationWindow {
text: qsTr("Close")
onClicked: {
dialog.close()
deviceVerificationList.remove(flow.tranId);
deviceVerificationList.remove(tran_id);
delete flow;
}
}