ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to libquotient changes for matrix-rust-sdk-crypto

Browse Source
This commit is contained in:
Tobias Fella
2024-10-11 20:36:10 +02:00
committed by Tobias Fella
parent 4078d3f2dc
commit c8eb62989c
1 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/qml/KeyVerificationDialog.qml
View File

@@ -29,7 +29,7 @@ Kirigami.Page {
}, },
State { State {
name: "waitingForVerification" name: "waitingForVerification"
when: root.session.state === KeyVerificationSession.WAITINGFORVERIFICATION when: root.session.state === KeyVerificationSession.TRANSITIONED && root.session.sasState === KeyVerificationSession.KEYSEXCHANGED
PropertyChanges { PropertyChanges {
stateLoader.sourceComponent: emojiSas stateLoader.sourceComponent: emojiSas
} }
@@ -78,7 +78,15 @@ Kirigami.Page {
}, },
State { State {
name: "done" name: "done"
when: root.session.state === KeyVerificationSession.DONE when: root.session.sasState === KeyVerificationSession.SASDONE
PropertyChanges {
target: stateLoader
sourceComponent: message
}
},
State {
name: "confirmed"
when: root.session.state === KeyVerificationSession.TRANSITIONED && root.session.sasState === KeyVerificationSession.CONFIRMED
PropertyChanges { PropertyChanges {
stateLoader.sourceComponent: message stateLoader.sourceComponent: message
} }
@@ -141,6 +149,14 @@ Kirigami.Page {
return "security-medium-symbolic"; return "security-medium-symbolic";
case KeyVerificationSession.DONE: case KeyVerificationSession.DONE:
return "security-high"; return "security-high";
case KeyVerificationSession.TRANSITIONED: {
if (root.session.sasState === KeyVerificationSession.CONFIRMED) {
return "security-high";
}
if (root.session.sasState === KeyVerificationSession.SASDONE) {
return "security-high";
}
}
default: default:
return ""; return "";
} }
@@ -149,16 +165,38 @@ Kirigami.Page {
switch (root.session.state) { switch (root.session.state) {
case KeyVerificationSession.WAITINGFORREADY: case KeyVerificationSession.WAITINGFORREADY:
return i18n("Waiting for device to accept verification."); return i18n("Waiting for device to accept verification.");
case KeyVerificationSession.INCOMING: case KeyVerificationSession.INCOMING: {
return i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId); if (root.session.remoteDeviceId.length > 0) {
return i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId);
} else {
return i18n("Incoming key verification request from **%1**", root.session.remoteUserId);
}
}
case KeyVerificationSession.WAITINGFORMAC: case KeyVerificationSession.WAITINGFORMAC:
return i18n("Waiting for other party to send us keys."); return i18n("Waiting for other party to send us keys.");
case KeyVerificationSession.WAITINGFORKEY: case KeyVerificationSession.WAITINGFORKEY:
return i18n("Waiting for other party to confirm our keys."); return i18n("Waiting for other party to confirm our keys.");
case KeyVerificationSession.WAITINGFORACCEPT: 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); if (root.session.remoteDeviceId.length > 0) {
return i18n("Successfully verified device **%1**", root.session.remoteDeviceId)
} else {
return i18nc("@info", "Successfully verified **%1**", root.session.remoteUserId)
}
}
case KeyVerificationSession.TRANSITIONED: {
if (root.session.sasState === KeyVerificationSession.CONFIRMED) {
return i18nc("@info", "Waiting for remote party to confirm verification");
}
if (root.session.sasState === KeyVerificationSession.SASDONE) {
if (root.session.remoteDeviceId.length > 0) {
return i18n("Successfully verified device **%1**", root.session.remoteDeviceId)
} else {
return i18nc("@info", "Successfully verified **%1**", root.session.remoteUserId)
}
}
}
default: default:
return ""; return "";
} }