2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'soru/verification-dialog' into 'main'

Browse source 
fix: Show bootstrap dialog in the appropriate places

See merge request famedly/fluffychat!549
This commit is contained in:
Krille Fear 2021-11-19 10:32:36 +00:00
commit e9c549495c
3 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/pages/chat/events/message_content.dart
View file

@ -2,12 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:matrix/encryption/utils/key_verification.dart';
import 'package:matrix/matrix.dart';
import 'package:matrix_link_text/link_text.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -15,6 +13,7 @@ import '../../../config/app_config.dart';
import '../../../pages/video_viewer/video_viewer.dart';
import '../../../utils/platform_infos.dart';
import '../../../utils/url_launcher.dart';
import '../../bootstrap/bootstrap_dialog.dart';
import 'audio_player.dart';
import 'html_message.dart';
import 'image_bubble.dart';
@ -44,22 +43,12 @@ class MessageContent extends StatelessWidget {
}
final client = Matrix.of(context).client;
if (client.isUnknownSession && client.encryption.crossSigning.enabled) {
final req =
await client.userDeviceKeys[client.userID].startVerification();
req.onUpdate = () async {
if (req.state == KeyVerificationState.done) {
for (var i = 0; i < 12; i++) {
if (await client.encryption.keyManager.isCached()) {
break;
}
await Future.delayed(const Duration(seconds: 1));
}
final timeline = await event.room.getTimeline();
timeline.requestKeys();
timeline.cancelSubscriptions();
}
};
await KeyVerificationDialog(request: req).show(context);
await BootstrapDialog(
client: Matrix.of(context).client,
).show(context);
final timeline = await event.room.getTimeline();
timeline.requestKeys();
timeline.cancelSubscriptions();
} else {
final success = await showFutureLoadingDialog(
context: context,