* chore: Nicer invite selection view
* chore: Do not request thousands of users on invite page
* build(deps): bump rexml from 3.3.6 to 3.3.9 in /ios
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.6...v3.3.9)
---
updated-dependencies:
- dependency-name: rexml
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
* design: Highlight emoji only messages
* chore: Follow up emoji only messages
* Translated using Weblate (Galician)
Currently translated at 100.0% (672 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Russian)
Currently translated at 99.7% (670 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/
* design: New login design
* chore: Improve spaces design
* chore: Improve spaces design
* chore: Improved UX for creating groups and spaces
* Translated using Weblate (German)
Currently translated at 100.0% (672 of 672 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* feat: Better wallpapers with blur and opacity sliders and improved styles page
* chore: Follow up wallpaper configs
* chore: Add max length to state messages
* chore: Follow up wallpaper design
* feat: Open account manage url when using MAS
* chore: follow up wellknown fetch
* Translated using Weblate (Arabic)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Finnish)
Currently translated at 79.0% (533 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fi/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (674 of 674 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* build: Add links to snapcraft.yaml file
* chore: Nicer empty page
* chore: Polish chat bubble colors
* chore: Follow up chat bubble design
* refactor: Remove unnecessary builder widget
* chore: Design adjustments
* chore: Follow up design
* refactor: Display two lines on new messages
* chore: Design follow up
* Translated using Weblate (Arabic)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (German)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* Translated using Weblate (Estonian)
Currently translated at 99.7% (676 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Basque)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* chore: Follow up message bubbles
* chore: Follow up design
* chore: Follow up design
* chore: Follow up colors
* chore: Follow up homeserverpicker UX
* chore: Design follow up
* feat: Add about server page
* chore: Follow up update snackbar
* chore: Polish login design
* chore: Follow up login page
* chore: Follow up homeserver picker
* chore: Follow up appbar shadow
* refactor: Performance boost for avatar widget
* Revert "refactor: Performance boost for avatar widget"
This reverts commit 58577bb9e8.
* Translated using Weblate (Estonian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (678 of 678 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Basque)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Galician)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Korean)
Currently translated at 100.0% (687 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ko/
* chore: Follow up homeserver input field
* refactor: Move to upstream geolocator
* chore: Follow up send file dialog
* Translated using Weblate (Spanish)
Currently translated at 74.6% (513 of 687 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/
* refactor: Migrate to newer keyboard shortcuts package
* refactor: Remove keyboard shortcuts
This package right now
makes the web app
nearly unusable as it
throws multiple errors on
every key press. The
package seems to be
unmaintained. I tried
two other packages
and none of them worked.
* build: Update matrix dart sdk to 0.35.0
* chore: Better FluffyChat Logo for PWA
* build: (deps): bump samuelmeuli/action-snapcraft from 2 to 3
Bumps [samuelmeuli/action-snapcraft](https://github.com/samuelmeuli/action-snapcraft) from 2 to 3.
- [Release notes](https://github.com/samuelmeuli/action-snapcraft/releases)
- [Commits](https://github.com/samuelmeuli/action-snapcraft/compare/v2...v3)
---
updated-dependencies:
- dependency-name: samuelmeuli/action-snapcraft
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: Follow up send file dialog
* feat: Add markdown context actions for text input
* build: Update flutter to 3.24.5
* build: Remove snapcraft build workaround
* chore: Better error message when join room failed
* chore: Follow up join room
* chore: Make error dialog show full error
* chore: Follow up loading dialog
* chore: Follow up loading dialog
* build: Snapcraft from local build file
* chore: Follow up build snap
* chore: Follow up snapcraft in ci
* build: Revert build snapcraft changes
* build: Try downgrading flutter web auth
* chore: add hint in pubspec.yaml regarding flutter_web_auth_2
* Translated using Weblate (Estonian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Galician)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Irish)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Basque)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Italian)
Currently translated at 100.0% (688 of 688 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Basque)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Irish)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/
* Translated using Weblate (Latvian)
Currently translated at 100.0% (694 of 694 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/
* Translated using Weblate (Estonian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
* Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/
* Translated using Weblate (Irish)
Currently translated at 99.8% (694 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (German)
Currently translated at 99.5% (692 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/
* fix: dont use thumbnails for emoticons
* chore: Improve presence performance
* Translated using Weblate (Basque)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/
* Translated using Weblate (Galician)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/
* Translated using Weblate (Irish)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/
* Translated using Weblate (Russian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (695 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/
* Translated using Weblate (Catalan)
Currently translated at 95.1% (661 of 695 strings)
Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ca/
* build: Bump version
* chore: Follow up send file dialog for images
* chore: Follow up send multiple images
* build: Add android build workaround for new flutter version
* build: Use file selector to save files
* chore: Follow up save file on desktop
* chore: Adjust default linux window height
* refactor: Update to new receive sharing intent package
* fluffychat merge
* fluffychat merge
* fluffychat merge
* fix android build
* fluffychat merge
* fluffychat merge
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Krille <c.kussowski@famedly.com>
Co-authored-by: Krille-chan <christian-kussowski@posteo.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: josé m <correoxm@disroot.org>
Co-authored-by: v1s7 <v1s7@users.noreply.hosted.weblate.org>
Co-authored-by: Christian <christian-pauly@posteo.de>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Priit Jõerüüt <hwlate@joeruut.com>
Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Co-authored-by: Linerly <linerly@proton.me>
Co-authored-by: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv>
Co-authored-by: xabirequejo <xabi.rn@gmail.com>
Co-authored-by: Bezruchenko Simon <worcposj44@gmail.com>
Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com>
Co-authored-by: Bruno Roh <kane.roh429@gmail.com>
Co-authored-by: Kimby <kimisaes@naver.com>
Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Co-authored-by: Angelo Schirinzi <muten619@hotmail.it>
Co-authored-by: Marek Vospěl <marek@vospel.cz>
Co-authored-by: Александр (Alexandr1995) <stupino19951406@gmail.com>
417 lines
13 KiB
Dart
417 lines
13 KiB
Dart
import 'dart:convert';
|
|
import 'dart:ui';
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
|
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
|
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
|
import 'package:matrix/encryption.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/widgets/adaptive_dialog_action.dart';
|
|
import 'package:fluffychat/widgets/avatar.dart';
|
|
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
|
|
|
class KeyVerificationDialog extends StatefulWidget {
|
|
Future<void> show(BuildContext context) => showAdaptiveDialog(
|
|
context: context,
|
|
builder: (context) => this,
|
|
barrierDismissible: false,
|
|
);
|
|
|
|
final KeyVerification request;
|
|
|
|
const KeyVerificationDialog({
|
|
super.key,
|
|
required this.request,
|
|
});
|
|
|
|
@override
|
|
KeyVerificationPageState createState() => KeyVerificationPageState();
|
|
}
|
|
|
|
class KeyVerificationPageState extends State<KeyVerificationDialog> {
|
|
void Function()? originalOnUpdate;
|
|
late final List<dynamic> sasEmoji;
|
|
|
|
@override
|
|
void initState() {
|
|
originalOnUpdate = widget.request.onUpdate;
|
|
widget.request.onUpdate = () {
|
|
originalOnUpdate?.call();
|
|
setState(() {});
|
|
};
|
|
widget.request.client.getProfileFromUserId(widget.request.userId).then((p) {
|
|
profile = p;
|
|
setState(() {});
|
|
});
|
|
rootBundle.loadString('assets/sas-emoji.json').then((e) {
|
|
sasEmoji = json.decode(e);
|
|
setState(() {});
|
|
});
|
|
super.initState();
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
widget.request.onUpdate =
|
|
originalOnUpdate; // don't want to get updates anymore
|
|
if (![KeyVerificationState.error, KeyVerificationState.done]
|
|
.contains(widget.request.state)) {
|
|
widget.request.cancel('m.user');
|
|
}
|
|
super.dispose();
|
|
}
|
|
|
|
Profile? profile;
|
|
|
|
Future<void> checkInput(String input) async {
|
|
if (input.isEmpty) return;
|
|
|
|
final valid = await showFutureLoadingDialog(
|
|
context: context,
|
|
future: () async {
|
|
// make sure the loading spinner shows before we test the keys
|
|
await Future.delayed(const Duration(milliseconds: 100));
|
|
var valid = false;
|
|
try {
|
|
await widget.request.openSSSS(keyOrPassphrase: input);
|
|
valid = true;
|
|
} catch (_) {
|
|
valid = false;
|
|
}
|
|
return valid;
|
|
},
|
|
);
|
|
if (valid.error != null) {
|
|
await showOkAlertDialog(
|
|
useRootNavigator: false,
|
|
context: context,
|
|
message: L10n.of(context).incorrectPassphraseOrKey,
|
|
);
|
|
}
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
|
|
User? user;
|
|
final directChatId =
|
|
widget.request.client.getDirectChatFromUserId(widget.request.userId);
|
|
if (directChatId != null) {
|
|
user = widget.request.client
|
|
.getRoomById(directChatId)!
|
|
.unsafeGetUserFromMemoryOrFallback(widget.request.userId);
|
|
}
|
|
final displayName =
|
|
user?.calcDisplayname() ?? widget.request.userId.localpart!;
|
|
var title = Text(L10n.of(context).verifyTitle);
|
|
Widget body;
|
|
final buttons = <Widget>[];
|
|
|
|
switch (widget.request.state) {
|
|
case KeyVerificationState.showQRSuccess:
|
|
case KeyVerificationState.confirmQRScan:
|
|
throw 'Not implemented';
|
|
case KeyVerificationState.askSSSS:
|
|
// prompt the user for their ssss passphrase / key
|
|
final textEditingController = TextEditingController();
|
|
String input;
|
|
body = Container(
|
|
margin: const EdgeInsets.only(left: 8.0, right: 8.0),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
Text(
|
|
L10n.of(context).askSSSSSign,
|
|
style: const TextStyle(fontSize: 20),
|
|
),
|
|
Container(height: 10),
|
|
TextField(
|
|
controller: textEditingController,
|
|
autofocus: false,
|
|
autocorrect: false,
|
|
onSubmitted: (s) {
|
|
input = s;
|
|
checkInput(input);
|
|
},
|
|
minLines: 1,
|
|
maxLines: 1,
|
|
obscureText: true,
|
|
decoration: InputDecoration(
|
|
hintText: L10n.of(context).passphraseOrKey,
|
|
prefixStyle: TextStyle(color: theme.colorScheme.primary),
|
|
suffixStyle: TextStyle(color: theme.colorScheme.primary),
|
|
border: const OutlineInputBorder(),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
buttons.add(
|
|
AdaptiveDialogAction(
|
|
child: Text(
|
|
L10n.of(context).submit,
|
|
),
|
|
onPressed: () => checkInput(textEditingController.text),
|
|
),
|
|
);
|
|
buttons.add(
|
|
AdaptiveDialogAction(
|
|
child: Text(
|
|
L10n.of(context).skip,
|
|
),
|
|
onPressed: () => widget.request.openSSSS(skip: true),
|
|
),
|
|
);
|
|
break;
|
|
case KeyVerificationState.askAccept:
|
|
title = Text(L10n.of(context).newVerificationRequest);
|
|
body = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
const SizedBox(height: 16),
|
|
Avatar(
|
|
mxContent: user?.avatarUrl,
|
|
name: displayName,
|
|
size: Avatar.defaultSize * 2,
|
|
),
|
|
const SizedBox(height: 16),
|
|
Text(
|
|
L10n.of(context).askVerificationRequest(displayName),
|
|
),
|
|
],
|
|
);
|
|
buttons.add(
|
|
TextButton.icon(
|
|
icon: const Icon(Icons.close),
|
|
style: TextButton.styleFrom(foregroundColor: Colors.red),
|
|
label: Text(L10n.of(context).reject),
|
|
onPressed: () => widget.request
|
|
.rejectVerification()
|
|
.then((_) => Navigator.of(context, rootNavigator: false).pop()),
|
|
),
|
|
);
|
|
buttons.add(
|
|
TextButton.icon(
|
|
icon: const Icon(Icons.check),
|
|
label: Text(L10n.of(context).accept),
|
|
onPressed: () => widget.request.acceptVerification(),
|
|
),
|
|
);
|
|
break;
|
|
case KeyVerificationState.askChoice:
|
|
case KeyVerificationState.waitingAccept:
|
|
body = Center(
|
|
child: Column(
|
|
children: <Widget>[
|
|
Stack(
|
|
alignment: Alignment.center,
|
|
children: [
|
|
Avatar(
|
|
mxContent: user?.avatarUrl,
|
|
name: displayName,
|
|
),
|
|
const SizedBox(
|
|
width: Avatar.defaultSize + 2,
|
|
height: Avatar.defaultSize + 2,
|
|
child: CircularProgressIndicator(strokeWidth: 2),
|
|
),
|
|
],
|
|
),
|
|
const SizedBox(height: 16),
|
|
Text(
|
|
L10n.of(context).waitingPartnerAcceptRequest,
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
buttons.add(
|
|
TextButton.icon(
|
|
icon: const Icon(Icons.close),
|
|
label: Text(L10n.of(context).cancel),
|
|
onPressed: () => widget.request.cancel(),
|
|
),
|
|
);
|
|
|
|
break;
|
|
case KeyVerificationState.askSas:
|
|
TextSpan compareWidget;
|
|
// maybe add a button to switch between the two and only determine default
|
|
// view for if "emoji" is a present sasType or not?
|
|
|
|
if (widget.request.sasTypes.contains('emoji')) {
|
|
title = Text(
|
|
L10n.of(context).compareEmojiMatch,
|
|
maxLines: 1,
|
|
style: const TextStyle(fontSize: 16),
|
|
);
|
|
compareWidget = TextSpan(
|
|
children: widget.request.sasEmojis
|
|
.map((e) => WidgetSpan(child: _Emoji(e, sasEmoji)))
|
|
.toList(),
|
|
);
|
|
} else {
|
|
title = Text(L10n.of(context).compareNumbersMatch);
|
|
final numbers = widget.request.sasNumbers;
|
|
final numbstr = '${numbers[0]}-${numbers[1]}-${numbers[2]}';
|
|
compareWidget =
|
|
TextSpan(text: numbstr, style: const TextStyle(fontSize: 40));
|
|
}
|
|
body = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
Text.rich(
|
|
compareWidget,
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
);
|
|
buttons.add(
|
|
TextButton.icon(
|
|
icon: const Icon(Icons.close),
|
|
style: TextButton.styleFrom(
|
|
foregroundColor: Colors.red,
|
|
),
|
|
label: Text(L10n.of(context).theyDontMatch),
|
|
onPressed: () => widget.request.rejectSas(),
|
|
),
|
|
);
|
|
buttons.add(
|
|
TextButton.icon(
|
|
icon: const Icon(Icons.check_outlined),
|
|
label: Text(L10n.of(context).theyMatch),
|
|
onPressed: () => widget.request.acceptSas(),
|
|
),
|
|
);
|
|
break;
|
|
case KeyVerificationState.waitingSas:
|
|
final acceptText = widget.request.sasTypes.contains('emoji')
|
|
? L10n.of(context).waitingPartnerEmoji
|
|
: L10n.of(context).waitingPartnerNumbers;
|
|
body = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
const CircularProgressIndicator.adaptive(strokeWidth: 2),
|
|
const SizedBox(height: 10),
|
|
Text(
|
|
acceptText,
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
);
|
|
break;
|
|
case KeyVerificationState.done:
|
|
body = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
const Icon(
|
|
Icons.check_circle_outlined,
|
|
color: Colors.green,
|
|
size: 128.0,
|
|
),
|
|
const SizedBox(height: 10),
|
|
Text(
|
|
L10n.of(context).verifySuccess,
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
);
|
|
buttons.add(
|
|
AdaptiveDialogAction(
|
|
child: Text(
|
|
L10n.of(context).close,
|
|
),
|
|
onPressed: () => Navigator.of(context, rootNavigator: false).pop(),
|
|
),
|
|
);
|
|
break;
|
|
case KeyVerificationState.error:
|
|
title = const Text('');
|
|
body = Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
const Icon(Icons.cancel, color: Colors.red, size: 128.0),
|
|
const SizedBox(height: 16),
|
|
// TODO: Add better error UI to user
|
|
Text(
|
|
'Error ${widget.request.canceledCode}: ${widget.request.canceledReason}',
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
);
|
|
buttons.add(
|
|
AdaptiveDialogAction(
|
|
child: Text(
|
|
L10n.of(context).close,
|
|
),
|
|
onPressed: () => Navigator.of(context, rootNavigator: false).pop(),
|
|
),
|
|
);
|
|
break;
|
|
}
|
|
|
|
return AlertDialog.adaptive(
|
|
title: title,
|
|
content: SizedBox(
|
|
height: 256,
|
|
width: 256,
|
|
child: ListView(
|
|
children: [body],
|
|
),
|
|
),
|
|
actions: buttons,
|
|
);
|
|
}
|
|
}
|
|
|
|
class _Emoji extends StatelessWidget {
|
|
final KeyVerificationEmoji emoji;
|
|
final List<dynamic>? sasEmoji;
|
|
|
|
const _Emoji(this.emoji, this.sasEmoji);
|
|
|
|
String getLocalizedName() {
|
|
final sasEmoji = this.sasEmoji;
|
|
if (sasEmoji == null) {
|
|
// asset is still being loaded
|
|
return emoji.name;
|
|
}
|
|
final translations = Map<String, String?>.from(
|
|
sasEmoji[emoji.number]['translated_descriptions'],
|
|
);
|
|
translations['en'] = emoji.name;
|
|
for (final locale in PlatformDispatcher.instance.locales) {
|
|
final wantLocaleParts = locale.toString().split('_');
|
|
final wantLanguage = wantLocaleParts.removeAt(0);
|
|
for (final haveLocale in translations.keys) {
|
|
final haveLocaleParts = haveLocale.split('_');
|
|
final haveLanguage = haveLocaleParts.removeAt(0);
|
|
if (haveLanguage == wantLanguage &&
|
|
(Set.from(haveLocaleParts)..removeAll(wantLocaleParts)).isEmpty &&
|
|
(translations[haveLocale]?.isNotEmpty ?? false)) {
|
|
return translations[haveLocale]!;
|
|
}
|
|
}
|
|
}
|
|
return emoji.name;
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
Text(emoji.emoji, style: const TextStyle(fontSize: 50)),
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 4.0),
|
|
child: Text(getLocalizedName()),
|
|
),
|
|
const SizedBox(height: 10, width: 5),
|
|
],
|
|
);
|
|
}
|
|
}
|