Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various #1052

Merged
merged 12 commits into from
Dec 13, 2024
Merged

Various #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
71609c3
feat: allow setting the restore/refresh height in xmr/wow wallets
julian-CStack Dec 10, 2024
2873595
chore: use libsecret mirror due to instability of gitlab.gnome.org
julian-CStack Dec 11, 2024
4af7243
feat: xmrrpc (and wowrpc) uri parsing + tests
julian-CStack Dec 11, 2024
cdf2dd8
feat: xmrrpc (and wowrpc) node uri scanning ui for adding new nodes
julian-CStack Dec 11, 2024
e749c62
chore: satisfy linter
julian-CStack Dec 11, 2024
3adddc2
fix: possible race condition when processing desktop qr data by retur…
julian-CStack Dec 11, 2024
1209521
fix: Linux qr scan would previously load the last scanned data if it …
julian-CStack Dec 12, 2024
9c64ed6
chore: update deps
julian-CStack Dec 12, 2024
c56038c
fix: Prevent failed keys fetch from disabling display of mnemonic
julian-CStack Dec 12, 2024
2e0ac0b
chore: extra logging
julian-CStack Dec 12, 2024
eeb595e
fix: Update device-locale dep version to handle linux crashes with ce…
julian-CStack Dec 12, 2024
e9aa2d6
fix: force override of a dep we don't even use so that sqlite doesn't…
julian-CStack Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,26 +228,24 @@ class _RestoreFrostMsWalletViewState
});
} else {
// Platform.isLinux, Platform.isWindows, or Platform.isMacOS.
await showDialog(
final qrResult = await showDialog<String>(
context: context,
builder: (context) {
return QrCodeScannerDialog(
onQrCodeDetected: (qrCodeData) {
try {
// TODO [prio=low]: Validate QR code data.
configFieldController.text = qrCodeData;

setState(() {
_configEmpty = configFieldController.text.isEmpty;
});
} catch (e, s) {
Logging.instance.log("Error processing QR code data: $e\n$s",
level: LogLevel.Error);
}
},
);
},
builder: (context) => const QrCodeScannerDialog(),
);

if (qrResult == null) {
Logging.instance.log(
"Qr scanning cancelled",
level: LogLevel.Info,
);
} else {
// TODO [prio=low]: Validate QR code data.
configFieldController.text = qrResult;

setState(() {
_configEmpty = configFieldController.text.isEmpty;
});
}
}
} on PlatformException catch (e, s) {
Logging.instance.log(
Expand Down
188 changes: 170 additions & 18 deletions lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import 'dart:async';

import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand All @@ -26,6 +27,8 @@ import '../../../../utilities/assets.dart';
import '../../../../utilities/constants.dart';
import '../../../../utilities/enums/sync_type_enum.dart';
import '../../../../utilities/flutter_secure_storage_interface.dart';
import '../../../../utilities/logger.dart';
import '../../../../utilities/node_uri_util.dart';
import '../../../../utilities/test_node_connection.dart';
import '../../../../utilities/text_styles.dart';
import '../../../../utilities/tor_plain_net_option_enum.dart';
Expand All @@ -38,7 +41,9 @@ import '../../../../widgets/conditional_parent.dart';
import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../../widgets/desktop/desktop_dialog.dart';
import '../../../../widgets/desktop/primary_button.dart';
import '../../../../widgets/desktop/qr_code_scanner_dialog.dart';
import '../../../../widgets/desktop/secondary_button.dart';
import '../../../../widgets/icon_widgets/qrcode_icon.dart';
import '../../../../widgets/icon_widgets/x_icon.dart';
import '../../../../widgets/stack_dialog.dart';
import '../../../../widgets/stack_text_field.dart';
Expand Down Expand Up @@ -73,6 +78,8 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
late final String? nodeId;
late final bool isDesktop;

(NodeModel, String)? _scannedResult;

late bool saveEnabled;
late bool testConnectionEnabled;

Expand Down Expand Up @@ -330,6 +337,88 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
}
}

bool _scanLock = false;

void _scanQr() async {
if (_scanLock) return;
_scanLock = true;
try {
if (Util.isDesktop) {
try {
final qrResult = await showDialog<String>(
context: context,
builder: (context) => const QrCodeScannerDialog(),
);

if (qrResult == null) {
Logging.instance.log(
"Qr scanning cancelled",
level: LogLevel.Info,
);
} else {
try {
await _processQrData(qrResult);
} catch (e, s) {
Logging.instance.log(
"Error processing QR code data: $e\n$s",
level: LogLevel.Error,
);
}
}
} catch (e, s) {
Logging.instance.log(
"Error opening QR code scanner dialog: $e\n$s",
level: LogLevel.Error,
);
}
} else {
try {
final result = await BarcodeScanner.scan();
await _processQrData(result.rawContent);
} catch (e, s) {
Logging.instance.log(
"$e\n$s",
level: LogLevel.Warning,
);
}
}
} finally {
_scanLock = false;
}
}

Future<void> _processQrData(String data) async {
try {
final nodeQrData = NodeQrUtil.decodeUri(data);
if (mounted) {
setState(() {
_scannedResult = (
NodeModel(
host: nodeQrData.host,
port: nodeQrData.port,
name: nodeQrData.label ?? "",
id: const Uuid().v1(),
useSSL: nodeQrData.scheme == "https",
enabled: true,
coinName: coin.identifier,
isFailover: true,
isDown: false,
torEnabled: true,
clearnetEnabled: !nodeQrData.host.endsWith(".onion"),
loginName: (nodeQrData as LibMoneroNodeQrData?)?.user,
),
(nodeQrData as LibMoneroNodeQrData?)?.password ?? ""
);
});
}
} catch (e, s) {
Logging.instance.log(
"$e\n$s",
level: LogLevel.Warning,
);
}
}

@override
void initState() {
isDesktop = Util.isDesktop;
Expand Down Expand Up @@ -390,6 +479,35 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
style: STextStyles.navBarTitle(context),
),
actions: [
if (viewType == AddEditNodeViewType.add &&
coin
is CryptonoteCurrency) // TODO: [prio=low] do something other than `coin is CryptonoteCurrency` in the future
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 10,
right: 10,
),
child: AspectRatio(
aspectRatio: 1,
child: AppBarIconButton(
key: const Key("qrNodeAppBarButtonKey"),
size: 36,
shadows: const [],
color: Theme.of(context)
.extension<StackColors>()!
.background,
icon: QrCodeIcon(
width: 20,
height: 20,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
),
onPressed: _scanQr,
),
),
),
if (viewType == AddEditNodeViewType.edit &&
ref
.watch(
Expand Down Expand Up @@ -473,19 +591,47 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(
height: 8,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const SizedBox(
width: 8,
),
const AppBarBackButton(
iconSize: 24,
size: 40,
),
Text(
"Add new node",
style: STextStyles.desktopH3(context),
Row(
children: [
const SizedBox(
width: 8,
),
const AppBarBackButton(
iconSize: 24,
size: 40,
),
Text(
"Add new node",
style: STextStyles.desktopH3(context),
),
],
),
if (coin
is CryptonoteCurrency) // TODO: [prio=low] do something other than `coin is CryptonoteCurrency` in the future
Padding(
padding: const EdgeInsets.only(right: 32),
child: AppBarIconButton(
size: 40,
color: isDesktop
? Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG
: Theme.of(context)
.extension<StackColors>()!
.background,
icon: const QrCodeIcon(
width: 21,
height: 21,
),
onPressed: _scanQr,
),
),
],
),
Padding(
Expand All @@ -504,7 +650,9 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
NodeForm(
node: node,
key: Key((node ?? _scannedResult?.$1)?.id ?? "none"),
node: node ?? _scannedResult?.$1,
scannedPw: _scannedResult?.$2,
secureStore: ref.read(secureStoreProvider),
readOnly: false,
coin: widget.coin,
Expand Down Expand Up @@ -629,13 +777,15 @@ class NodeForm extends ConsumerStatefulWidget {
const NodeForm({
super.key,
this.node,
this.scannedPw,
required this.secureStore,
required this.readOnly,
required this.coin,
this.onChanged,
});

final NodeModel? node;
final String? scannedPw;
final SecureStorageInterface secureStore;
final bool readOnly;
final CryptoCurrency coin;
Expand Down Expand Up @@ -738,13 +888,15 @@ class _NodeFormState extends ConsumerState<NodeForm> {
if (widget.node != null) {
final node = widget.node!;
if (enableAuthFields) {
node.getPassword(widget.secureStore).then((value) {
if (value is String) {
_passwordController.text = value;
}
});

_usernameController.text = node.loginName ?? "";
if (widget.scannedPw == null) {
node.getPassword(widget.secureStore).then((value) {
if (value is String) {
_passwordController.text = value;
}
});
} else {
_passwordController.text = widget.scannedPw!;
}
}

_nameController.text = node.name;
Expand Down
12 changes: 7 additions & 5 deletions lib/pages/settings_views/wallet_settings_view/wallet_backup_views/cn_wallet_keys.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,13 @@ class _CNWalletKeysState extends State<CNWalletKeys> {
SizedBox(
height: Util.isDesktop ? 12 : 16,
),
QR(
data: _current(_currentDropDownValue),
size:
Util.isDesktop ? 256 : MediaQuery.of(context).size.width / 1.5,
),
if (_current(_currentDropDownValue) != "ERROR")
QR(
data: _current(_currentDropDownValue),
size: Util.isDesktop
? 256
: MediaQuery.of(context).size.width / 1.5,
),
SizedBox(
height: Util.isDesktop ? 12 : 16,
),
Expand Down
Loading
Loading