Handle more states in KeyVerificationDialog
We were specifically missing WAITINGFORKEY and WAITINGFORACCEPT, which does happen and could be delayed - resulting in a blank screen for a few seconds. CCBUG: 508483
This commit is contained in:
@@ -50,6 +50,22 @@ Kirigami.Page {
|
|||||||
sourceComponent: message
|
sourceComponent: message
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
State {
|
||||||
|
name: "waitingForKey"
|
||||||
|
when: root.session.state === KeyVerificationSession.WAITINGFORKEY
|
||||||
|
PropertyChanges {
|
||||||
|
target: stateLoader
|
||||||
|
sourceComponent: message
|
||||||
|
}
|
||||||
|
},
|
||||||
|
State {
|
||||||
|
name: "waitingForAccept"
|
||||||
|
when: root.session.state === KeyVerificationSession.WAITINGFORACCEPT
|
||||||
|
PropertyChanges {
|
||||||
|
target: stateLoader
|
||||||
|
sourceComponent: message
|
||||||
|
}
|
||||||
|
},
|
||||||
State {
|
State {
|
||||||
name: "waitingForMac"
|
name: "waitingForMac"
|
||||||
when: root.session.state === KeyVerificationSession.WAITINGFORMAC
|
when: root.session.state === KeyVerificationSession.WAITINGFORMAC
|
||||||
@@ -127,7 +143,9 @@ Kirigami.Page {
|
|||||||
case KeyVerificationSession.WAITINGFORREADY:
|
case KeyVerificationSession.WAITINGFORREADY:
|
||||||
case KeyVerificationSession.INCOMING:
|
case KeyVerificationSession.INCOMING:
|
||||||
case KeyVerificationSession.WAITINGFORMAC:
|
case KeyVerificationSession.WAITINGFORMAC:
|
||||||
return "security-medium-symbolic";
|
case KeyVerificationSession.WAITINGFORKEY:
|
||||||
|
case KeyVerificationSession.WAITINGFORACCEPT:
|
||||||
|
return "security-medium-symbolic";
|
||||||
case KeyVerificationSession.DONE:
|
case KeyVerificationSession.DONE:
|
||||||
return "security-high";
|
return "security-high";
|
||||||
default:
|
default:
|
||||||
@@ -141,9 +159,13 @@ Kirigami.Page {
|
|||||||
case KeyVerificationSession.INCOMING:
|
case KeyVerificationSession.INCOMING:
|
||||||
return i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId);
|
return i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId);
|
||||||
case KeyVerificationSession.WAITINGFORMAC:
|
case KeyVerificationSession.WAITINGFORMAC:
|
||||||
|
return i18n("Waiting for other party to send us keys.");
|
||||||
|
case KeyVerificationSession.WAITINGFORKEY:
|
||||||
|
return i18n("Waiting for other party to confirm our keys.");
|
||||||
|
case KeyVerificationSession.WAITINGFORACCEPT:
|
||||||
return i18n("Waiting for other party to verify.");
|
return i18n("Waiting for other party to verify.");
|
||||||
case KeyVerificationSession.DONE:
|
case KeyVerificationSession.DONE:
|
||||||
return i18n("Successfully verified device **%1**", root.session.remoteDeviceId)
|
return i18n("Successfully verified device **%1**", root.session.remoteDeviceId);
|
||||||
default:
|
default:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user