inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

format

Browse source
This commit is contained in:
Sorunome 2020-05-27 10:33:42 +02:00
parent f78657957a
commit 8d75c2a0af
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/room.dart
View file

@ -592,7 +592,9 @@ class Room {
final event = room.getState('im.ponies.room_emotes', stateKey); final event = room.getState('im.ponies.room_emotes', stateKey);
if (event != null && stateKeyEntry.value is Map) { if (event != null && stateKeyEntry.value is Map) {
addEmotePack( addEmotePack(
(room.canonicalAlias?.isEmpty ?? true) ? room.id : canonicalAlias, (room.canonicalAlias?.isEmpty ?? true)
? room.id
: canonicalAlias,
event.content, event.content,
stateKeyEntry.value['name']); stateKeyEntry.value['name']);
} }

3
lib/src/utils/device_keys_list.dart
View file

@ -27,7 +27,8 @@ class DeviceKeysList {
return null; return null;
} }
CrossSigningKey getCrossSigningKey(String type) => crossSigningKeys.values.firstWhere((k) => k.usage.contains(type)); CrossSigningKey getCrossSigningKey(String type) =>
crossSigningKeys.values.firstWhere((k) => k.usage.contains(type));
CrossSigningKey get masterKey => getCrossSigningKey('master'); CrossSigningKey get masterKey => getCrossSigningKey('master');
CrossSigningKey get selfSigningKey => getCrossSigningKey('self_signing'); CrossSigningKey get selfSigningKey => getCrossSigningKey('self_signing');

6
lib/src/utils/key_verification.dart
View file

@ -151,7 +151,8 @@ class KeyVerification {
randomString(512) + DateTime.now().millisecondsSinceEpoch.toString(); randomString(512) + DateTime.now().millisecondsSinceEpoch.toString();
} }
if (client.crossSigning.enabled && if (client.crossSigning.enabled &&
!(await client.crossSigning.isCached()) && !client.isUnknownSession) { !(await client.crossSigning.isCached()) &&
!client.isUnknownSession) {
setState(KeyVerificationState.askSSSS); setState(KeyVerificationState.askSSSS);
_nextAction = 'request'; _nextAction = 'request';
} else { } else {
@ -358,7 +359,8 @@ class KeyVerification {
var verifiedMasterKey = false; var verifiedMasterKey = false;
final wasUnknownSession = client.isUnknownSession; final wasUnknownSession = client.isUnknownSession;
for (final key in _verifiedDevices) { for (final key in _verifiedDevices) {
await key.setVerified(true, false); // we don't want to sign the keys juuuust yet await key.setVerified(
true, false); // we don't want to sign the keys juuuust yet
if (key is CrossSigningKey && key.usage.contains('master')) { if (key is CrossSigningKey && key.usage.contains('master')) {
verifiedMasterKey = true; verifiedMasterKey = true;
} }