NimaBoscarino
/
cwtch-ui
forked from cwtch.im/cwtch-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing as per PR

This commit is contained in:
Dan Ballard 2021-11-02 14:48:52 -07:00
parent b65d16aa8a
commit e9407ae426
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cwtch/cwtch.dart
View File

@ -1,5 +1,7 @@
import 'package:flutter/src/services/text_input.dart'; import 'package:flutter/src/services/text_input.dart';
// To handle profiles that are "unencrypted" (i.e don't require a password to open) we currently create a profile with a defacto, hardcoded password.
// Details: https://docs.openprivacy.ca/cwtch-security-handbook/profile_encryption_and_storage.html
const DefaultPassword = "be gay do crime"; const DefaultPassword = "be gay do crime";
abstract class Cwtch { abstract class Cwtch {

4
lib/views/addeditprofileview.dart
View File

@ -296,12 +296,12 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
// Profile Editing // Profile Editing
if (ctrlrPass.value.text.isEmpty) { if (ctrlrPass.value.text.isEmpty) {
// Don't update password, only update name // Don't update password, only update name
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "public.name", ctrlrNick.value.text); Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "profile.name", ctrlrNick.value.text);
Navigator.of(context).pop(); Navigator.of(context).pop();
} else { } else {
// At this points passwords have been validated to be the same and not empty // At this points passwords have been validated to be the same and not empty
// Update both password and name, even if name hasn't been changed... // Update both password and name, even if name hasn't been changed...
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "public.name", ctrlrNick.value.text); Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "profile.name", ctrlrNick.value.text);
final updatePasswordEvent = { final updatePasswordEvent = {
"EventType": "ChangePassword", "EventType": "ChangePassword",
"Data": {"Password": ctrlrOldPass.text, "NewPassword": ctrlrPass.text} "Data": {"Password": ctrlrOldPass.text, "NewPassword": ctrlrPass.text}

6
lib/views/addeditservers.dart
View File

@ -138,7 +138,6 @@ class _AddEditServerViewState extends State<AddEditServerView> {
} else { } else {
Provider.of<FlwtchState>(context, listen: false).cwtch.StopServer(serverInfoState.onion); Provider.of<FlwtchState>(context, listen: false).cwtch.StopServer(serverInfoState.onion);
} }
// ?? serverInfoState.enabled = value; + notify?
}, },
activeTrackColor: settings.theme.defaultButtonActiveColor(), activeTrackColor: settings.theme.defaultButtonActiveColor(),
inactiveTrackColor: settings.theme.defaultButtonDisabledColor(), inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
@ -195,7 +194,8 @@ class _AddEditServerViewState extends State<AddEditServerView> {
height: 20, height: 20,
), ),
Visibility( Visibility(
visible: usePassword, // Currently we don't support password change for servers so also gate this on Add server, when ready to support changing password remove the onion.isEmpty check
visible: serverInfoState.onion.isEmpty && usePassword,
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[ child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Visibility( Visibility(
visible: serverInfoState.onion.isNotEmpty && serverInfoState.isEncrypted, visible: serverInfoState.onion.isNotEmpty && serverInfoState.isEncrypted,
@ -323,7 +323,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
// TODO change password // TODO support change password
} }
Navigator.of(context).pop(); Navigator.of(context).pop();
} }

1
lib/views/serversview.dart
View File

@ -144,7 +144,6 @@ class _ServersView extends State<ServersView> {
providers: [ChangeNotifierProvider<ServerInfoState>( providers: [ChangeNotifierProvider<ServerInfoState>(
create: (_) => ServerInfoState(onion: "", serverBundle: "", description: "", autoStart: true, running: false, isEncrypted: true), create: (_) => ServerInfoState(onion: "", serverBundle: "", description: "", autoStart: true, running: false, isEncrypted: true),
)], )],
//ChangeNotifierProvider.value(value: Provider.of<ServerInfoState>(context))],
child: AddEditServerView(), child: AddEditServerView(),
); );
}, },

1
lib/widgets/serverrow.dart
View File

@ -86,7 +86,6 @@ class _ServerRowState extends State<ServerRow> {
providers: [ChangeNotifierProvider<ServerInfoState>( providers: [ChangeNotifierProvider<ServerInfoState>(
create: (_) => server, create: (_) => server,
)], )],
//ChangeNotifierProvider.value(value: Provider.of<ServerInfoState>(context))],
child: AddEditServerView(), child: AddEditServerView(),
); );
}, },