Compare commits
1 commit
main
...
krille/imp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50765afdc5 |
6 changed files with 52 additions and 6 deletions
|
|
@ -3134,5 +3134,24 @@
|
||||||
"removeAdminRights": "Remove admin rights",
|
"removeAdminRights": "Remove admin rights",
|
||||||
"powerLevel": "Power level",
|
"powerLevel": "Power level",
|
||||||
"setPowerLevelDescription": "Power levels define what a member is allowed to do in this room and usually range between 0 and 100.",
|
"setPowerLevelDescription": "Power levels define what a member is allowed to do in this room and usually range between 0 and 100.",
|
||||||
"owner": "Owner"
|
"owner": "Owner",
|
||||||
|
"userHasChangedTheirKeys": "{user} has changed their keys.",
|
||||||
|
"@userHasChangedTheirKeys": {
|
||||||
|
"type": "String",
|
||||||
|
"placeholders": {
|
||||||
|
"user": {
|
||||||
|
"type": "String"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"usersHaveChangedTheirKeys": "{users} have changed their keys.",
|
||||||
|
"@usersHaveChangedTheirKeys": {
|
||||||
|
"type": "String",
|
||||||
|
"placeholders": {
|
||||||
|
"users": {
|
||||||
|
"type": "String"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"check": "Check"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:matrix/matrix.dart';
|
import 'package:matrix/matrix.dart';
|
||||||
|
|
||||||
import 'package:fluffychat/config/setting_keys.dart';
|
import 'package:fluffychat/config/setting_keys.dart';
|
||||||
|
|
@ -51,6 +52,20 @@ class StateMessage extends StatelessWidget {
|
||||||
MatrixLocals(L10n.of(context)),
|
MatrixLocals(L10n.of(context)),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (event.type == EventTypes.TofuNotification) ...[
|
||||||
|
const TextSpan(text: ' '),
|
||||||
|
TextSpan(
|
||||||
|
text: L10n.of(context).check,
|
||||||
|
style: TextStyle(
|
||||||
|
color: theme.colorScheme.primary,
|
||||||
|
decoration: TextDecoration.underline,
|
||||||
|
),
|
||||||
|
recognizer: TapGestureRecognizer()
|
||||||
|
..onTap = () => context.go(
|
||||||
|
'/rooms/${event.room.id}/encryption',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
if (onExpand != null) ...[
|
if (onExpand != null) ...[
|
||||||
const TextSpan(text: '\n'),
|
const TextSpan(text: '\n'),
|
||||||
TextSpan(
|
TextSpan(
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,9 @@ abstract class ClientManager {
|
||||||
final shareKeysWith = AppSettings.shareKeysWith.value;
|
final shareKeysWith = AppSettings.shareKeysWith.value;
|
||||||
final enableSoftLogout = AppSettings.enableSoftLogout.value;
|
final enableSoftLogout = AppSettings.enableSoftLogout.value;
|
||||||
|
|
||||||
|
EventLocalizations.localizationsMap['sdk.matrix.dart.tofu_event'] =
|
||||||
|
(event, _, body) => body;
|
||||||
|
|
||||||
return Client(
|
return Client(
|
||||||
clientName,
|
clientName,
|
||||||
httpClient: CustomHttpClient.createHTTPClient(),
|
httpClient: CustomHttpClient.createHTTPClient(),
|
||||||
|
|
|
||||||
|
|
@ -371,4 +371,9 @@ class MatrixLocals extends MatrixLocalizations {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get pollHasBeenEnded => l10n.pollHasBeenEnded;
|
String get pollHasBeenEnded => l10n.pollHasBeenEnded;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String usersHaveChangedTheirKeys(List<String> users) => users.length == 1
|
||||||
|
? l10n.userHasChangedTheirKeys(users.single)
|
||||||
|
: l10n.usersHaveChangedTheirKeys(users.join(', '));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1127,10 +1127,11 @@ packages:
|
||||||
matrix:
|
matrix:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: matrix
|
path: "."
|
||||||
sha256: c0214ee99a73957d3c02d54a60afcf9acee577b0924749085d6fdf556e8eba42
|
ref: "krille/tofu-for-master-signing-keys"
|
||||||
url: "https://pub.dev"
|
resolved-ref: "1889d3020e757cfacc1de28d81f62ab83119a6b5"
|
||||||
source: hosted
|
url: "https://github.com/famedly/matrix-dart-sdk.git"
|
||||||
|
source: git
|
||||||
version: "6.1.1"
|
version: "6.1.1"
|
||||||
meta:
|
meta:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,10 @@ dependencies:
|
||||||
just_audio: ^0.10.5
|
just_audio: ^0.10.5
|
||||||
latlong2: ^0.9.1
|
latlong2: ^0.9.1
|
||||||
linkify: ^5.0.0
|
linkify: ^5.0.0
|
||||||
matrix: ^6.1.1
|
matrix: #^6.1.1
|
||||||
|
git:
|
||||||
|
url: https://github.com/famedly/matrix-dart-sdk.git
|
||||||
|
ref: krille/tofu-for-master-signing-keys
|
||||||
mime: ^2.0.0
|
mime: ^2.0.0
|
||||||
native_imaging: ^0.4.0
|
native_imaging: ^0.4.0
|
||||||
opus_caf_converter_dart: ^1.0.1
|
opus_caf_converter_dart: ^1.0.1
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue