Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions lib/models/node_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ class NodeModel {
int? port,
String? name,
bool? useSSL,
String? loginName,
required String? loginName,
bool? enabled,
String? coinName,
bool? isFailover,
bool? isDown,
bool? trusted,
required bool? trusted,
bool? torEnabled,
bool? clearnetEnabled,
}) {
Expand All @@ -80,12 +80,12 @@ class NodeModel {
name: name ?? this.name,
id: id,
useSSL: useSSL ?? this.useSSL,
loginName: loginName ?? this.loginName,
loginName: loginName,
enabled: enabled ?? this.enabled,
coinName: coinName ?? this.coinName,
isFailover: isFailover ?? this.isFailover,
isDown: isDown ?? this.isDown,
trusted: trusted ?? this.trusted,
trusted: trusted,
torEnabled: torEnabled ?? this.torEnabled,
clearnetEnabled: clearnetEnabled ?? this.clearnetEnabled,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -860,13 +860,10 @@ class _NodeFormState extends ConsumerState<NodeForm> {
onChanged?.call(canSave, canTestConnection);
ref.read(nodeFormDataProvider).name = _nameController.text;
ref.read(nodeFormDataProvider).host = _hostController.text;

ref.read(nodeFormDataProvider).login =
_usernameController.text.isEmpty ? null : _usernameController.text;

ref.read(nodeFormDataProvider).password =
_passwordController.text.isEmpty ? null : _passwordController.text;

ref.read(nodeFormDataProvider).port = port;
ref.read(nodeFormDataProvider).useSSL = _useSSL;
ref.read(nodeFormDataProvider).isFailover = _isFailover;
Expand Down Expand Up @@ -1331,7 +1328,11 @@ class _NodeFormState extends ConsumerState<NodeForm> {
});
if (widget.readOnly) {
ref.read(nodeServiceChangeNotifierProvider).edit(
widget.node!.copyWith(isFailover: _isFailover),
widget.node!.copyWith(
isFailover: _isFailover,
loginName: widget.node!.loginName,
trusted: widget.node!.trusted,
),
null,
true,
);
Expand All @@ -1356,8 +1357,11 @@ class _NodeFormState extends ConsumerState<NodeForm> {
});
if (widget.readOnly) {
ref.read(nodeServiceChangeNotifierProvider).edit(
widget.node!
.copyWith(isFailover: _isFailover),
widget.node!.copyWith(
isFailover: _isFailover,
loginName: widget.node!.loginName,
trusted: widget.node!.trusted,
),
null,
true,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,7 @@ abstract class SWB {
loginName: nodeData['loginName'] as String?,
isFailover: nodeData['isFailover'] as bool,
isDown: nodeData['isDown'] as bool,
trusted: nodeData['trusted'] as bool?,
),
nodeData['password'] as String?,
true,
Expand Down
12 changes: 11 additions & 1 deletion lib/services/node_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class NodeService extends ChangeNotifier {
trusted: savedNode.trusted,
torEnabled: savedNode.torEnabled,
clearnetEnabled: savedNode.clearnetEnabled,
loginName: savedNode.loginName,
),
);
}
Expand All @@ -122,6 +123,7 @@ class NodeService extends ChangeNotifier {
trusted: primaryNode.trusted,
torEnabled: primaryNode.torEnabled,
clearnetEnabled: primaryNode.clearnetEnabled,
loginName: primaryNode.loginName,
),
);
}
Expand Down Expand Up @@ -213,6 +215,8 @@ class NodeService extends ChangeNotifier {
key: "${node.id}_nodePW",
value: password,
);
} else {
await secureStorageInterface.delete(key: "${node.id}_nodePW");
}
if (shouldNotifyListeners) {
notifyListeners();
Expand Down Expand Up @@ -240,7 +244,11 @@ class NodeService extends ChangeNotifier {
await DB.instance.put<NodeModel>(
boxName: DB.boxNameNodeModels,
key: model.id,
value: model.copyWith(enabled: enabled),
value: model.copyWith(
enabled: enabled,
loginName: model.loginName,
trusted: model.trusted,
),
);
if (shouldNotifyListeners) {
notifyListeners();
Expand Down Expand Up @@ -314,6 +322,8 @@ class NodeService extends ChangeNotifier {
useSSL: node.useSSL,
coinName: node.coinName,
isDown: node.isDown,
loginName: node.loginName,
trusted: node.trusted,
);
}
await add(node, null, false);
Expand Down
Loading