feat: Verify and block devices in devices list

This commit is contained in:
Christian Pauly 2021-02-20 10:06:43 +01:00
parent 4c22fdf010
commit 8ebacfeae6
2 changed files with 152 additions and 43 deletions

View File

@ -448,6 +448,16 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"verified": "Verified",
"@verified": {
"type": "text",
"placeholders": {}
},
"blocked": "Blocked",
"@blocked": {
"type": "text",
"placeholders": {}
},
"zoomIn": "Zoom in", "zoomIn": "Zoom in",
"@zoomIn": { "@zoomIn": {
"type": "text", "type": "text",

View File

@ -1,5 +1,7 @@
import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/encryption/utils/key_verification.dart';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/components/dialogs/key_verification_dialog.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -81,6 +83,36 @@ class DevicesSettingsState extends State<DevicesSettings> {
} }
} }
void _verifyDeviceAction(BuildContext context, Device device) async {
final req = Matrix.of(context)
.client
.userDeviceKeys[Matrix.of(context).client.userID]
.deviceKeys[device.deviceId]
.startVerification();
req.onUpdate = () {
if ({KeyVerificationState.error, KeyVerificationState.done}
.contains(req.state)) {
setState(() => null);
}
};
await KeyVerificationDialog(
request: req,
l10n: L10n.of(context),
).show(context);
}
void _blockDeviceAction(BuildContext context, Device device) async {
final key = Matrix.of(context)
.client
.userDeviceKeys[Matrix.of(context).client.userID]
.deviceKeys[device.deviceId];
if (key.directVerified) {
await key.setVerified(false);
}
await key.setBlocked(true);
setState(() => null);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -118,6 +150,8 @@ class DevicesSettingsState extends State<DevicesSettings> {
thisDevice, thisDevice,
rename: (d) => _renameDeviceAction(context, d), rename: (d) => _renameDeviceAction(context, d),
remove: (d) => _removeDevicesAction(context, [d]), remove: (d) => _removeDevicesAction(context, [d]),
verify: (d) => _verifyDeviceAction(context, d),
block: (d) => _blockDeviceAction(context, d),
), ),
Divider(height: 1), Divider(height: 1),
if (devices.isNotEmpty) if (devices.isNotEmpty)
@ -153,6 +187,8 @@ class DevicesSettingsState extends State<DevicesSettings> {
devices[i], devices[i],
rename: (d) => _renameDeviceAction(context, d), rename: (d) => _renameDeviceAction(context, d),
remove: (d) => _removeDevicesAction(context, [d]), remove: (d) => _removeDevicesAction(context, [d]),
verify: (d) => _verifyDeviceAction(context, d),
block: (d) => _blockDeviceAction(context, d),
), ),
), ),
), ),
@ -164,62 +200,125 @@ class DevicesSettingsState extends State<DevicesSettings> {
} }
} }
enum UserDeviceListItemAction {
rename,
remove,
verify,
block,
}
class UserDeviceListItem extends StatelessWidget { class UserDeviceListItem extends StatelessWidget {
final Device userDevice; final Device userDevice;
final Function remove; final void Function(Device) remove;
final Function rename; final void Function(Device) rename;
final void Function(Device) verify;
final void Function(Device) block;
const UserDeviceListItem(this.userDevice, {this.remove, this.rename, Key key}) const UserDeviceListItem(
: super(key: key); this.userDevice, {
@required this.remove,
@required this.rename,
@required this.verify,
@required this.block,
Key key,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return PopupMenuButton( final keys = Matrix.of(context)
onSelected: (String action) { .client
.userDeviceKeys[Matrix.of(context).client.userID]
?.deviceKeys[userDevice.deviceId];
final displayname = (userDevice.displayName?.isNotEmpty ?? false)
? userDevice.displayName
: L10n.of(context).unknownDevice;
return ListTile(
onTap: () async {
final action = await showModalActionSheet<UserDeviceListItemAction>(
context: context,
actions: [
SheetAction(
key: UserDeviceListItemAction.rename,
label: L10n.of(context).changeDeviceName,
),
SheetAction(
key: UserDeviceListItemAction.verify,
label: L10n.of(context).verify,
),
if (keys != null) ...{
SheetAction(
key: UserDeviceListItemAction.block,
label: L10n.of(context).blockDevice,
isDestructiveAction: true,
),
SheetAction(
key: UserDeviceListItemAction.block,
label: L10n.of(context).delete,
isDestructiveAction: true,
),
},
],
);
switch (action) { switch (action) {
case 'remove': case UserDeviceListItemAction.rename:
if (remove != null) remove(userDevice); rename(userDevice);
break;
case UserDeviceListItemAction.remove:
remove(userDevice);
break;
case UserDeviceListItemAction.verify:
verify(userDevice);
break;
case UserDeviceListItemAction.block:
block(userDevice);
break; break;
case 'rename':
if (rename != null) rename(userDevice);
} }
}, },
itemBuilder: (BuildContext context) => [ leading: CircleAvatar(
PopupMenuItem<String>( foregroundColor: Theme.of(context).textTheme.bodyText1.color,
value: 'rename', backgroundColor: Theme.of(context).secondaryHeaderColor,
child: Text(L10n.of(context).changeDeviceName), child: Icon(displayname.toLowerCase().contains('android')
), ? Icons.phone_android_outlined
PopupMenuItem<String>( : displayname.toLowerCase().contains('ios')
value: 'remove', ? Icons.phone_iphone_outlined
child: Text( : displayname.toLowerCase().contains('web')
L10n.of(context).removeDevice, ? Icons.web_outlined
style: TextStyle(color: Colors.red), : displayname.toLowerCase().contains('desktop')
? Icons.desktop_mac_outlined
: Icons.device_unknown_outlined),
),
title: Row(
children: <Widget>[
Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
), Spacer(),
], Text(userDevice.lastSeenTs.localizedTimeShort(context)),
child: ListTile( ],
contentPadding: EdgeInsets.all(16.0), ),
title: Row( subtitle: Row(
children: <Widget>[ children: <Widget>[
Expanded( Text(userDevice.deviceId),
child: Text( Spacer(),
(userDevice.displayName?.isNotEmpty ?? false) if (keys != null)
? userDevice.displayName Text(
: L10n.of(context).unknownDevice, keys.blocked
maxLines: 1, ? L10n.of(context).blocked
overflow: TextOverflow.ellipsis, : keys.verified
? L10n.of(context).verified
: L10n.of(context).unknownDevice,
style: TextStyle(
color: keys.blocked
? Colors.red
: keys.verified
? Colors.green
: Colors.orange,
), ),
), ),
Text(userDevice.lastSeenTs.localizedTimeShort(context)), ],
],
),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text('${L10n.of(context).id}: ${userDevice.deviceId}'),
Text('${L10n.of(context).lastSeenIp}: ${userDevice.lastSeenIp}'),
],
),
), ),
); );
} }