Merge branch 'main' into dependabot/pub/unifiedpush-6.2.0
This commit is contained in:
Krille-chan
GitHub
commit
fa8963a519
6 changed files with 79 additions and 75 deletions
2
.github/workflows/integrate.yaml
vendored
2
.github/workflows/integrate.yaml
vendored
|
|
@ -45,7 +45,7 @@ jobs:
|
|||
cache: true
|
||||
- uses: moonrepo/setup-rust@v1
|
||||
- run: flutter pub get
|
||||
- run: flutter build apk --debug
|
||||
- run: flutter build apk --debug --target-platform android-arm64
|
||||
|
||||
build_debug_web:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class EncryptionButton extends StatelessWidget {
|
|||
.stream
|
||||
.where((s) => s.deviceLists != null),
|
||||
builder: (context, snapshot) {
|
||||
final shouldBeEncrypted = room.joinRules != JoinRules.public;
|
||||
return FutureBuilder<EncryptionHealthState>(
|
||||
future: room.encrypted
|
||||
? room.calcEncryptionHealthState()
|
||||
|
|
@ -46,9 +47,13 @@ class EncryptionButton extends StatelessWidget {
|
|||
),
|
||||
),
|
||||
child: Icon(
|
||||
room.encrypted ? Icons.lock_outlined : Icons.lock_open_outlined,
|
||||
room.encrypted
|
||||
? Icons.lock_outlined
|
||||
: Icons.no_encryption_outlined,
|
||||
size: 20,
|
||||
color: theme.colorScheme.onSurface,
|
||||
color: (shouldBeEncrypted && !room.encrypted)
|
||||
? theme.colorScheme.error
|
||||
: theme.colorScheme.onSurface,
|
||||
),
|
||||
),
|
||||
onPressed: () => context.go('/rooms/${room.id}/encryption'),
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import 'package:fluffychat/config/app_config.dart';
|
|||
import 'package:fluffychat/l10n/l10n.dart';
|
||||
import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart';
|
||||
import 'package:fluffychat/utils/beautify_string_extension.dart';
|
||||
import 'package:fluffychat/widgets/avatar.dart';
|
||||
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
|
||||
|
||||
class ChatEncryptionSettingsView extends StatelessWidget {
|
||||
|
|
@ -58,7 +59,6 @@ class ChatEncryptionSettingsView extends StatelessWidget {
|
|||
size: 128,
|
||||
color: theme.colorScheme.onInverseSurface,
|
||||
),
|
||||
const Divider(),
|
||||
if (room.isDirectChat)
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
|
|
@ -107,72 +107,73 @@ class ChatEncryptionSettingsView extends StatelessWidget {
|
|||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
itemCount: deviceKeys.length,
|
||||
itemBuilder: (BuildContext context, int i) =>
|
||||
SwitchListTile(
|
||||
value: !deviceKeys[i].blocked,
|
||||
activeThumbColor: deviceKeys[i].verified
|
||||
? Colors.green
|
||||
: Colors.orange,
|
||||
onChanged: (_) =>
|
||||
controller.toggleDeviceKey(deviceKeys[i]),
|
||||
title: Row(
|
||||
children: [
|
||||
Icon(
|
||||
deviceKeys[i].verified
|
||||
? Icons.verified_outlined
|
||||
: deviceKeys[i].blocked
|
||||
? Icons.block_outlined
|
||||
: Icons.info_outlined,
|
||||
color: deviceKeys[i].verified
|
||||
? Colors.green
|
||||
: deviceKeys[i].blocked
|
||||
? Colors.red
|
||||
: Colors.orange,
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
deviceKeys[i].deviceId ??
|
||||
L10n.of(context).unknownDevice,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Flexible(
|
||||
fit: FlexFit.loose,
|
||||
child: Material(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppConfig.borderRadius,
|
||||
itemBuilder: (BuildContext context, int i) => Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (i == 0 ||
|
||||
deviceKeys[i].userId !=
|
||||
deviceKeys[i - 1].userId) ...[
|
||||
const Divider(),
|
||||
FutureBuilder(
|
||||
future: room.client
|
||||
.getUserProfile(deviceKeys[i].userId),
|
||||
builder: (context, snapshot) {
|
||||
final displayname =
|
||||
snapshot.data?.displayname ??
|
||||
deviceKeys[i].userId.localpart ??
|
||||
deviceKeys[i].userId;
|
||||
return ListTile(
|
||||
leading: Avatar(
|
||||
name: displayname,
|
||||
mxContent: snapshot.data?.avatarUrl,
|
||||
),
|
||||
side: BorderSide(
|
||||
color: theme.colorScheme.primary,
|
||||
),
|
||||
),
|
||||
color: theme.colorScheme.primaryContainer,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(4.0),
|
||||
child: Text(
|
||||
deviceKeys[i].userId,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
color: theme.colorScheme.primary,
|
||||
fontSize: 12,
|
||||
fontStyle: FontStyle.italic,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
title: Text(displayname),
|
||||
subtitle: Text(deviceKeys[i].userId),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
subtitle: Text(
|
||||
deviceKeys[i].ed25519Key?.beautified ??
|
||||
L10n.of(context).unknownEncryptionAlgorithm,
|
||||
style: TextStyle(
|
||||
fontFamily: 'RobotoMono',
|
||||
color: theme.colorScheme.secondary,
|
||||
SwitchListTile(
|
||||
value: !deviceKeys[i].blocked,
|
||||
activeThumbColor: deviceKeys[i].verified
|
||||
? Colors.green
|
||||
: Colors.orange,
|
||||
onChanged: (_) =>
|
||||
controller.toggleDeviceKey(deviceKeys[i]),
|
||||
title: Row(
|
||||
children: [
|
||||
Text(
|
||||
deviceKeys[i].verified
|
||||
? L10n.of(context).verified
|
||||
: deviceKeys[i].blocked
|
||||
? L10n.of(context).blocked
|
||||
: L10n.of(context).unverified,
|
||||
style: TextStyle(
|
||||
color: deviceKeys[i].verified
|
||||
? Colors.green
|
||||
: deviceKeys[i].blocked
|
||||
? Colors.red
|
||||
: Colors.orange,
|
||||
),
|
||||
),
|
||||
const Text(' | ID: '),
|
||||
Text(
|
||||
deviceKeys[i].deviceId ??
|
||||
L10n.of(context).unknownDevice,
|
||||
),
|
||||
],
|
||||
),
|
||||
subtitle: Text(
|
||||
deviceKeys[i].ed25519Key?.beautified ??
|
||||
L10n.of(context).unknownEncryptionAlgorithm,
|
||||
style: TextStyle(
|
||||
fontFamily: 'RobotoMono',
|
||||
color: theme.colorScheme.secondary,
|
||||
fontSize: 11,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ class ChatListItem extends StatelessWidget {
|
|||
children: <Widget>[
|
||||
if (typingText.isEmpty &&
|
||||
ownMessage &&
|
||||
room.lastEvent!.status.isSending) ...[
|
||||
room.lastEvent?.status.isSending == true) ...[
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
height: 16,
|
||||
|
|
|
|||
11
pubspec.lock
11
pubspec.lock
|
|
@ -1113,12 +1113,11 @@ packages:
|
|||
matrix:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: HEAD
|
||||
resolved-ref: e772d4db6887ce853b0d685b45fb502ba0a4caca
|
||||
url: "https://github.com/famedly/matrix-dart-sdk.git"
|
||||
source: git
|
||||
version: "3.0.0"
|
||||
name: matrix
|
||||
sha256: "84354dd61f47b297631a3fe5eeebb5c1e0725f872b8fae75851a49cd5689c4f1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
|
|||
|
|
@ -52,8 +52,7 @@ dependencies:
|
|||
just_audio: ^0.10.5
|
||||
latlong2: ^0.9.1
|
||||
linkify: ^5.0.0
|
||||
matrix:
|
||||
git: https://github.com/famedly/matrix-dart-sdk.git
|
||||
matrix: ^3.0.1
|
||||
mime: ^2.0.0
|
||||
native_imaging: ^0.2.0
|
||||
opus_caf_converter_dart: ^1.0.1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue