e3team
/
trifid_mobile
forked from core/mobile_nebula
3
0
Fork 0
Code Pull Requests Activity

Ran flutter format -l 120 --suppress-analytics lib (#38)

This commit is contained in:
Nate Brown 2021-05-03 16:58:04 -05:00 committed by GitHub
parent 3a37802f4d
commit 9934f226e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 329 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/components/FormPage.dart
View File

@ -8,7 +8,13 @@ import 'package:mobile_nebula/services/utils.dart';
/// SimplePage with a form and built in validation and confirmation to discard changes if any are made /// SimplePage with a form and built in validation and confirmation to discard changes if any are made
class FormPage extends StatefulWidget { class FormPage extends StatefulWidget {
const FormPage( const FormPage(
{Key key, this.title, @required this.child, @required this.onSave, @required this.changed, this.hideSave = false, this.scrollController}) {Key key,
this.title,
@required this.child,
@required this.onSave,
@required this.changed,
this.hideSave = false,
this.scrollController})
: super(key: key); : super(key: key);
final String title; final String title;

25
lib/components/IPField.dart
View File

@ -48,9 +48,7 @@ class IPField extends StatelessWidget {
onChanged: onChanged, onChanged: onChanged,
maxLength: ipOnly ? 15 : null, maxLength: ipOnly ? 15 : null,
maxLengthEnforced: ipOnly ? true : false, maxLengthEnforced: ipOnly ? true : false,
inputFormatters: ipOnly inputFormatters: ipOnly ? [IPTextInputFormatter()] : [FilteringTextInputFormatter.allow(RegExp(r'[^\s]+'))],
? [IPTextInputFormatter()]
: [FilteringTextInputFormatter.allow(RegExp(r'[^\s]+'))],
textInputAction: this.textInputAction, textInputAction: this.textInputAction,
placeholder: help, placeholder: help,
)); ));
@ -68,7 +66,8 @@ class IPTextInputFormatter extends TextInputFormatter {
return whitelistedPattern return whitelistedPattern
.allMatches(substring) .allMatches(substring)
.map<String>((Match match) => match.group(0)) .map<String>((Match match) => match.group(0))
.join().replaceAll(RegExp(r','), '.'); .join()
.replaceAll(RegExp(r','), '.');
}, },
); );
} }
@ -77,7 +76,7 @@ class IPTextInputFormatter extends TextInputFormatter {
TextEditingValue _selectionAwareTextManipulation( TextEditingValue _selectionAwareTextManipulation(
TextEditingValue value, TextEditingValue value,
String substringManipulation(String substring), String substringManipulation(String substring),
) { ) {
final int selectionStartIndex = value.selection.start; final int selectionStartIndex = value.selection.start;
final int selectionEndIndex = value.selection.end; final int selectionEndIndex = value.selection.end;
String manipulatedText; String manipulatedText;
@ -85,15 +84,9 @@ TextEditingValue _selectionAwareTextManipulation(
if (selectionStartIndex < 0 || selectionEndIndex < 0) { if (selectionStartIndex < 0 || selectionEndIndex < 0) {
manipulatedText = substringManipulation(value.text); manipulatedText = substringManipulation(value.text);
} else { } else {
final String beforeSelection = substringManipulation( final String beforeSelection = substringManipulation(value.text.substring(0, selectionStartIndex));
value.text.substring(0, selectionStartIndex) final String inSelection = substringManipulation(value.text.substring(selectionStartIndex, selectionEndIndex));
); final String afterSelection = substringManipulation(value.text.substring(selectionEndIndex));
final String inSelection = substringManipulation(
value.text.substring(selectionStartIndex, selectionEndIndex)
);
final String afterSelection = substringManipulation(
value.text.substring(selectionEndIndex)
);
manipulatedText = beforeSelection + inSelection + afterSelection; manipulatedText = beforeSelection + inSelection + afterSelection;
if (value.selection.baseOffset > value.selection.extentOffset) { if (value.selection.baseOffset > value.selection.extentOffset) {
manipulatedSelection = value.selection.copyWith( manipulatedSelection = value.selection.copyWith(
@ -110,8 +103,6 @@ TextEditingValue _selectionAwareTextManipulation(
return TextEditingValue( return TextEditingValue(
text: manipulatedText, text: manipulatedText,
selection: manipulatedSelection ?? const TextSelection.collapsed(offset: -1), selection: manipulatedSelection ?? const TextSelection.collapsed(offset: -1),
composing: manipulatedText == value.text composing: manipulatedText == value.text ? value.composing : TextRange.empty,
? value.composing
: TextRange.empty,
); );
} }

6
lib/components/SimplePage.dart
View File

@ -45,14 +45,16 @@ class SimplePage extends StatelessWidget {
final VoidCallback onLoading; final VoidCallback onLoading;
final RefreshController refreshController; final RefreshController refreshController;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Widget realChild = child; Widget realChild = child;
var addScrollbar = this.scrollbar; var addScrollbar = this.scrollbar;
if (scrollable == SimpleScrollable.vertical || scrollable == SimpleScrollable.both) { if (scrollable == SimpleScrollable.vertical || scrollable == SimpleScrollable.both) {
realChild = SingleChildScrollView(scrollDirection: Axis.vertical, child: realChild, controller: refreshController == null ? scrollController : null); realChild = SingleChildScrollView(
scrollDirection: Axis.vertical,
child: realChild,
controller: refreshController == null ? scrollController : null);
addScrollbar = true; addScrollbar = true;
} }

6
lib/components/SpecialButton.dart
View File

@ -5,7 +5,8 @@ import 'package:flutter/material.dart';
// This is a button that pushes the bare minimum onto you, it doesn't even respect button themes - unless you tell it to // This is a button that pushes the bare minimum onto you, it doesn't even respect button themes - unless you tell it to
class SpecialButton extends StatefulWidget { class SpecialButton extends StatefulWidget {
const SpecialButton({Key key, this.child, this.color, this.onPressed, this.useButtonTheme = false, this.decoration}) : super(key: key); const SpecialButton({Key key, this.child, this.color, this.onPressed, this.useButtonTheme = false, this.decoration})
: super(key: key);
final Widget child; final Widget child;
final Color color; final Color color;
@ -62,8 +63,7 @@ class _SpecialButtonState extends State<SpecialButton> with SingleTickerProvider
child: DefaultTextStyle(style: textStyle, child: Container(child: widget.child, color: widget.color)), child: DefaultTextStyle(style: textStyle, child: Container(child: widget.child, color: widget.color)),
), ),
), ),
) ));
);
} }
// Eyeballed values. Feel free to tweak. // Eyeballed values. Feel free to tweak.

51
lib/components/SpecialSelectableText.dart
View File

@ -23,15 +23,15 @@ import 'package:flutter/gestures.dart';
const int iOSHorizontalOffset = -2; const int iOSHorizontalOffset = -2;
class _TextSpanEditingController extends TextEditingController { class _TextSpanEditingController extends TextEditingController {
_TextSpanEditingController({@required TextSpan textSpan}): _TextSpanEditingController({@required TextSpan textSpan})
assert(textSpan != null), : assert(textSpan != null),
_textSpan = textSpan, _textSpan = textSpan,
super(text: textSpan.toPlainText()); super(text: textSpan.toPlainText());
final TextSpan _textSpan; final TextSpan _textSpan;
@override @override
TextSpan buildTextSpan({TextStyle style ,bool withComposing}) { TextSpan buildTextSpan({TextStyle style, bool withComposing}) {
// This does not care about composing. // This does not care about composing.
return TextSpan( return TextSpan(
style: style, style: style,
@ -109,8 +109,7 @@ class _SpecialSelectableTextSelectionGestureDetectorBuilder extends TextSelectio
break; break;
} }
} }
if (_state.widget.onTap != null) if (_state.widget.onTap != null) _state.widget.onTap();
_state.widget.onTap();
} }
@override @override
@ -434,13 +433,17 @@ class SpecialSelectableText extends StatefulWidget {
properties.add(DoubleProperty('cursorWidth', cursorWidth, defaultValue: 2.0)); properties.add(DoubleProperty('cursorWidth', cursorWidth, defaultValue: 2.0));
properties.add(DiagnosticsProperty<Radius>('cursorRadius', cursorRadius, defaultValue: null)); properties.add(DiagnosticsProperty<Radius>('cursorRadius', cursorRadius, defaultValue: null));
properties.add(DiagnosticsProperty<Color>('cursorColor', cursorColor, defaultValue: null)); properties.add(DiagnosticsProperty<Color>('cursorColor', cursorColor, defaultValue: null));
properties.add(FlagProperty('selectionEnabled', value: selectionEnabled, defaultValue: true, ifFalse: 'selection disabled')); properties.add(
FlagProperty('selectionEnabled', value: selectionEnabled, defaultValue: true, ifFalse: 'selection disabled'));
properties.add(DiagnosticsProperty<ScrollPhysics>('scrollPhysics', scrollPhysics, defaultValue: null)); properties.add(DiagnosticsProperty<ScrollPhysics>('scrollPhysics', scrollPhysics, defaultValue: null));
properties.add(DiagnosticsProperty<TextHeightBehavior>('textHeightBehavior', textHeightBehavior, defaultValue: null)); properties
.add(DiagnosticsProperty<TextHeightBehavior>('textHeightBehavior', textHeightBehavior, defaultValue: null));
} }
} }
class _SpecialSelectableTextState extends State<SpecialSelectableText> with AutomaticKeepAliveClientMixin implements TextSelectionGestureDetectorBuilderDelegate { class _SpecialSelectableTextState extends State<SpecialSelectableText>
with AutomaticKeepAliveClientMixin
implements TextSelectionGestureDetectorBuilderDelegate {
EditableTextState get _editableText => editableTextKey.currentState; EditableTextState get _editableText => editableTextKey.currentState;
_TextSpanEditingController _controller; _TextSpanEditingController _controller;
@ -468,18 +471,14 @@ class _SpecialSelectableTextState extends State<SpecialSelectableText> with Auto
void initState() { void initState() {
super.initState(); super.initState();
_selectionGestureDetectorBuilder = _SpecialSelectableTextSelectionGestureDetectorBuilder(state: this); _selectionGestureDetectorBuilder = _SpecialSelectableTextSelectionGestureDetectorBuilder(state: this);
_controller = _TextSpanEditingController( _controller = _TextSpanEditingController(textSpan: widget.textSpan ?? TextSpan(text: widget.data));
textSpan: widget.textSpan ?? TextSpan(text: widget.data)
);
} }
@override @override
void didUpdateWidget(SpecialSelectableText oldWidget) { void didUpdateWidget(SpecialSelectableText oldWidget) {
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
if (widget.data != oldWidget.data || widget.textSpan != oldWidget.textSpan) { if (widget.data != oldWidget.data || widget.textSpan != oldWidget.textSpan) {
_controller = _TextSpanEditingController( _controller = _TextSpanEditingController(textSpan: widget.textSpan ?? TextSpan(text: widget.data));
textSpan: widget.textSpan ?? TextSpan(text: widget.data)
);
} }
if (_effectiveFocusNode.hasFocus && _controller.selection.isCollapsed) { if (_effectiveFocusNode.hasFocus && _controller.selection.isCollapsed) {
_showSelectionHandles = false; _showSelectionHandles = false;
@ -525,20 +524,15 @@ class _SpecialSelectableTextState extends State<SpecialSelectableText> with Auto
bool _shouldShowSelectionHandles(SelectionChangedCause cause) { bool _shouldShowSelectionHandles(SelectionChangedCause cause) {
// When the text field is activated by something that doesn't trigger the // When the text field is activated by something that doesn't trigger the
// selection overlay, we shouldn't show the handles either. // selection overlay, we shouldn't show the handles either.
if (!_selectionGestureDetectorBuilder.shouldShowSelectionToolbar) if (!_selectionGestureDetectorBuilder.shouldShowSelectionToolbar) return false;
return false;
if (_controller.selection.isCollapsed) if (_controller.selection.isCollapsed) return false;
return false;
if (cause == SelectionChangedCause.keyboard) if (cause == SelectionChangedCause.keyboard) return false;
return false;
if (cause == SelectionChangedCause.longPress) if (cause == SelectionChangedCause.longPress) return true;
return true;
if (_controller.text.isNotEmpty) if (_controller.text.isNotEmpty) return true;
return true;
return false; return false;
} }
@ -555,7 +549,8 @@ class _SpecialSelectableTextState extends State<SpecialSelectableText> with Auto
assert(debugCheckHasMediaQuery(context)); assert(debugCheckHasMediaQuery(context));
assert(debugCheckHasDirectionality(context)); assert(debugCheckHasDirectionality(context));
assert( assert(
!(widget.style != null && widget.style.inherit == false && !(widget.style != null &&
widget.style.inherit == false &&
(widget.style.fontSize == null || widget.style.textBaseline == null)), (widget.style.fontSize == null || widget.style.textBaseline == null)),
'inherit false style must supply fontSize and textBaseline', 'inherit false style must supply fontSize and textBaseline',
); );
@ -596,8 +591,7 @@ class _SpecialSelectableTextState extends State<SpecialSelectableText> with Auto
final DefaultTextStyle defaultTextStyle = DefaultTextStyle.of(context); final DefaultTextStyle defaultTextStyle = DefaultTextStyle.of(context);
TextStyle effectiveTextStyle = widget.style; TextStyle effectiveTextStyle = widget.style;
if (widget.style == null || widget.style.inherit) if (widget.style == null || widget.style.inherit) effectiveTextStyle = defaultTextStyle.style.merge(widget.style);
effectiveTextStyle = defaultTextStyle.style.merge(widget.style);
if (MediaQuery.boldTextOverride(context)) if (MediaQuery.boldTextOverride(context))
effectiveTextStyle = effectiveTextStyle.merge(const TextStyle(fontWeight: FontWeight.bold)); effectiveTextStyle = effectiveTextStyle.merge(const TextStyle(fontWeight: FontWeight.bold));
final Widget child = RepaintBoundary( final Widget child = RepaintBoundary(
@ -653,8 +647,7 @@ class _SpecialSelectableTextState extends State<SpecialSelectableText> with Auto
focusNode: _keyFocusNode, focusNode: _keyFocusNode,
onKey: _onKey, onKey: _onKey,
child: child, child: child,
) )),
),
); );
} }

12
lib/models/Site.dart
View File

@ -216,7 +216,6 @@ class Site {
}); });
return hosts; return hosts;
} on PlatformException catch (err) { } on PlatformException catch (err) {
//TODO: fix this message //TODO: fix this message
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
@ -239,7 +238,6 @@ class Site {
}); });
return hosts; return hosts;
} on PlatformException catch (err) { } on PlatformException catch (err) {
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
} catch (err) { } catch (err) {
@ -251,7 +249,6 @@ class Site {
try { try {
var res = await Future.wait([this.listHostmap(), this.listPendingHostmap()]); var res = await Future.wait([this.listHostmap(), this.listPendingHostmap()]);
return {"active": res[0], "pending": res[1]}; return {"active": res[0], "pending": res[1]};
} on PlatformException catch (err) { } on PlatformException catch (err) {
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
} catch (err) { } catch (err) {
@ -265,14 +262,14 @@ class Site {
Future<HostInfo> getHostInfo(String vpnIp, bool pending) async { Future<HostInfo> getHostInfo(String vpnIp, bool pending) async {
try { try {
var ret = await platform.invokeMethod("active.getHostInfo", <String, dynamic>{"id": id, "vpnIp": vpnIp, "pending": pending}); var ret = await platform
.invokeMethod("active.getHostInfo", <String, dynamic>{"id": id, "vpnIp": vpnIp, "pending": pending});
final h = jsonDecode(ret); final h = jsonDecode(ret);
if (h == null) { if (h == null) {
return null; return null;
} }
return HostInfo.fromJson(h); return HostInfo.fromJson(h);
} on PlatformException catch (err) { } on PlatformException catch (err) {
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
} catch (err) { } catch (err) {
@ -282,14 +279,14 @@ class Site {
Future<HostInfo> setRemoteForTunnel(String vpnIp, String addr) async { Future<HostInfo> setRemoteForTunnel(String vpnIp, String addr) async {
try { try {
var ret = await platform.invokeMethod("active.setRemoteForTunnel", <String, dynamic>{"id": id, "vpnIp": vpnIp, "addr": addr}); var ret = await platform
.invokeMethod("active.setRemoteForTunnel", <String, dynamic>{"id": id, "vpnIp": vpnIp, "addr": addr});
final h = jsonDecode(ret); final h = jsonDecode(ret);
if (h == null) { if (h == null) {
return null; return null;
} }
return HostInfo.fromJson(h); return HostInfo.fromJson(h);
} on PlatformException catch (err) { } on PlatformException catch (err) {
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
} catch (err) { } catch (err) {
@ -300,7 +297,6 @@ class Site {
Future<bool> closeTunnel(String vpnIp) async { Future<bool> closeTunnel(String vpnIp) async {
try { try {
return await platform.invokeMethod("active.closeTunnel", <String, dynamic>{"id": id, "vpnIp": vpnIp}); return await platform.invokeMethod("active.closeTunnel", <String, dynamic>{"id": id, "vpnIp": vpnIp});
} on PlatformException catch (err) { } on PlatformException catch (err) {
throw err.details ?? err.message ?? err.toString(); throw err.details ?? err.message ?? err.toString();
} catch (err) { } catch (err) {

26
lib/screens/AboutScreen.dart
View File

@ -48,18 +48,32 @@ class _AboutScreenState extends State<AboutScreen> {
title: 'About', title: 'About',
child: Column(children: [ child: Column(children: [
ConfigSection(children: <Widget>[ ConfigSection(children: <Widget>[
ConfigItem(label: Text('App version'), labelWidth: 150, content: _buildText('${packageInfo.version}-${packageInfo.buildNumber} (sha: $gitSha)')), ConfigItem(
ConfigItem(label: Text('Nebula version'), labelWidth: 150, content: _buildText('$nebulaVersion ($goVersion)')), label: Text('App version'),
ConfigItem(label: Text('Flutter version'), labelWidth: 150, content: _buildText(flutterVersion['frameworkVersion'])), labelWidth: 150,
ConfigItem(label: Text('Dart version'), labelWidth: 150, content: _buildText(flutterVersion['dartSdkVersion'])), content: _buildText('${packageInfo.version}-${packageInfo.buildNumber} (sha: $gitSha)')),
ConfigItem(
label: Text('Nebula version'), labelWidth: 150, content: _buildText('$nebulaVersion ($goVersion)')),
ConfigItem(
label: Text('Flutter version'), labelWidth: 150, content: _buildText(flutterVersion['frameworkVersion'])),
ConfigItem(
label: Text('Dart version'), labelWidth: 150, content: _buildText(flutterVersion['dartSdkVersion'])),
]), ]),
ConfigSection(children: <Widget>[ ConfigSection(children: <Widget>[
//TODO: wire up these other pages //TODO: wire up these other pages
// ConfigPageItem(label: Text('Changelog'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/mobile/changelog', context)), // ConfigPageItem(label: Text('Changelog'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/mobile/changelog', context)),
ConfigPageItem(label: Text('Privacy policy'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/privacy-policy', context)), ConfigPageItem(
label: Text('Privacy policy'),
labelWidth: 300,
onPressed: () => Utils.launchUrl('https://defined.net/privacy-policy', context)),
// ConfigPageItem(label: Text('Licenses'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/mobile/license', context)), // ConfigPageItem(label: Text('Licenses'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/mobile/license', context)),
]), ]),
Padding(padding: EdgeInsets.only(top: 20), child: Text('Copyright © 2020 Defined Networking, Inc', textAlign: TextAlign.center,)), Padding(
padding: EdgeInsets.only(top: 20),
child: Text(
'Copyright © 2020 Defined Networking, Inc',
textAlign: TextAlign.center,
)),
]), ]),
); );
} }

18
lib/screens/MainScreen.dart
View File

@ -88,7 +88,8 @@ class _MainScreenState extends State<MainScreen> {
Widget _buildNoSites() { Widget _buildNoSites() {
return Padding( return Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Center(child: Column( child: Center(
child: Column(
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.fromLTRB(0, 8.0, 0, 8.0), padding: const EdgeInsets.fromLTRB(0, 8.0, 0, 8.0),
@ -146,10 +147,7 @@ class _MainScreenState extends State<MainScreen> {
} }
// The theme here is to remove the hardcoded canvas border reordering forces on us // The theme here is to remove the hardcoded canvas border reordering forces on us
return Theme( return Theme(data: Theme.of(context).copyWith(canvasColor: Colors.transparent), child: child);
data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
child: child
);
} }
Widget _debugSave() { Widget _debugSave() {
@ -176,12 +174,13 @@ mUOcsdFcCZiXrj7ryQIG1+WfqA46w71A/lV4nAc=
name: "DEBUG TEST", name: "DEBUG TEST",
id: uuid.v4(), id: uuid.v4(),
staticHostmap: { staticHostmap: {
"10.1.0.1": StaticHost(lighthouse: true, destinations: [IPAndPort(ip: '10.1.1.53', port: 4242), IPAndPort(ip: '1::1', port: 4242)]) "10.1.0.1": StaticHost(
lighthouse: true,
destinations: [IPAndPort(ip: '10.1.1.53', port: 4242), IPAndPort(ip: '1::1', port: 4242)])
}, },
ca: [CertificateInfo.debug(rawCert: ca)], ca: [CertificateInfo.debug(rawCert: ca)],
certInfo: CertificateInfo.debug(rawCert: cert), certInfo: CertificateInfo.debug(rawCert: cert),
unsafeRoutes: [UnsafeRoute(route: '10.3.3.3/32', via: '10.1.0.1')] unsafeRoutes: [UnsafeRoute(route: '10.3.3.3/32', via: '10.1.0.1')]);
);
s.key = '''-----BEGIN NEBULA X25519 PRIVATE KEY----- s.key = '''-----BEGIN NEBULA X25519 PRIVATE KEY-----
rmXnR1yvDZi1VPVmnNVY8NMsQpEpbbYlq7rul+ByQvg= rmXnR1yvDZi1VPVmnNVY8NMsQpEpbbYlq7rul+ByQvg=
@ -239,7 +238,8 @@ rmXnR1yvDZi1VPVmnNVY8NMsQpEpbbYlq7rul+ByQvg=
} }
if (hasErrors) { if (hasErrors) {
Utils.popError(context, "Site Error(s)", "1 or more sites have errors and need your attention, problem sites have a red border."); Utils.popError(context, "Site Error(s)",
"1 or more sites have errors and need your attention, problem sites have a red border.");
} }
sites.sort((a, b) { sites.sort((a, b) {

4
lib/screens/SiteDetailScreen.dart
View File

@ -62,7 +62,6 @@ class _SiteDetailScreenState extends State<SiteDetailScreen> {
} }
} }
setState(() {}); setState(() {});
}, onError: (err) { }, onError: (err) {
setState(() {}); setState(() {});
Utils.popError(context, "Error", err); Utils.popError(context, "Error", err);
@ -111,7 +110,8 @@ class _SiteDetailScreenState extends State<SiteDetailScreen> {
List<Widget> items = []; List<Widget> items = [];
site.errors.forEach((error) { site.errors.forEach((error) {
items.add(ConfigItem( items.add(ConfigItem(
labelWidth: 0, content: Padding(padding: EdgeInsets.symmetric(vertical: 10), child: SpecialSelectableText(error)))); labelWidth: 0,
content: Padding(padding: EdgeInsets.symmetric(vertical: 10), child: SpecialSelectableText(error))));
}); });
return ConfigSection( return ConfigSection(

13
lib/screens/SiteLogsScreen.dart
View File

@ -54,7 +54,10 @@ class _SiteLogsScreenState extends State<SiteLogsScreen> {
refreshController.loadComplete(); refreshController.loadComplete();
}, },
refreshController: refreshController, refreshController: refreshController,
child: Container(padding: EdgeInsets.all(5), constraints: logBoxConstraints(context), child: SpecialSelectableText(logs.trim(), style: TextStyle(fontFamily: 'RobotoMono', fontSize: 14))), child: Container(
padding: EdgeInsets.all(5),
constraints: logBoxConstraints(context),
child: SpecialSelectableText(logs.trim(), style: TextStyle(fontFamily: 'RobotoMono', fontSize: 14))),
bottomBar: _buildBottomBar(), bottomBar: _buildBottomBar(),
); );
} }
@ -78,7 +81,10 @@ class _SiteLogsScreenState extends State<SiteLogsScreen> {
padding: padding, padding: padding,
icon: Icon(context.platformIcons.share, size: 30), icon: Icon(context.platformIcons.share, size: 30),
onPressed: () { onPressed: () {
Share.shareFile(title: '${widget.site.name} logs', filePath: widget.site.logFile, filename: '${widget.site.name}.log'); Share.shareFile(
title: '${widget.site.name} logs',
filePath: widget.site.logFile,
filename: '${widget.site.name}.log');
}, },
)), )),
Expanded( Expanded(
@ -94,7 +100,8 @@ class _SiteLogsScreenState extends State<SiteLogsScreen> {
padding: padding, padding: padding,
icon: Icon(context.platformIcons.downArrow, size: 30), icon: Icon(context.platformIcons.downArrow, size: 30),
onPressed: () async { onPressed: () async {
controller.animateTo(controller.position.maxScrollExtent, duration: const Duration(milliseconds: 500), curve: Curves.linearToEaseOut); controller.animateTo(controller.position.maxScrollExtent,
duration: const Duration(milliseconds: 500), curve: Curves.linearToEaseOut);
}, },
)), )),
])); ]));

12
lib/screens/siteConfig/AddCertificateScreen.dart
View File

@ -72,9 +72,7 @@ class _AddCertificateScreenState extends State<AddCertificateScreen> {
items.addAll(_buildShare()); items.addAll(_buildShare());
items.addAll(_buildLoadCert()); items.addAll(_buildLoadCert());
return SimplePage( return SimplePage(title: 'Certificate', child: Column(children: items));
title: 'Certificate',
child: Column(children: items));
} }
_generateKeys() async { _generateKeys() async {
@ -215,8 +213,8 @@ class _AddCertificateScreenState extends State<AddCertificateScreen> {
if (certs.length > 0) { if (certs.length > 0) {
var tryCertInfo = CertificateInfo.fromJson(certs.first); var tryCertInfo = CertificateInfo.fromJson(certs.first);
if (tryCertInfo.cert.details.isCa) { if (tryCertInfo.cert.details.isCa) {
return Utils.popError(context, 'Error loading certificate content', 'A certificate authority is not appropriate for a client certificate.'); return Utils.popError(context, 'Error loading certificate content',
'A certificate authority is not appropriate for a client certificate.');
} else if (!tryCertInfo.validity.valid) { } else if (!tryCertInfo.validity.valid) {
return Utils.popError(context, 'Certificate was invalid', tryCertInfo.validity.reason); return Utils.popError(context, 'Certificate was invalid', tryCertInfo.validity.reason);
} }
@ -232,7 +230,9 @@ class _AddCertificateScreenState extends State<AddCertificateScreen> {
// We have a cert, pop the details screen where they can hit save // We have a cert, pop the details screen where they can hit save
Utils.openPage(context, (context) { Utils.openPage(context, (context) {
return CertificateDetailsScreen(certInfo: tryCertInfo, onSave: () { return CertificateDetailsScreen(
certInfo: tryCertInfo,
onSave: () {
Navigator.pop(context); Navigator.pop(context);
widget.onSave(CertificateResult(certInfo: tryCertInfo, key: privKey)); widget.onSave(CertificateResult(certInfo: tryCertInfo, key: privKey));
}); });

4
lib/screens/siteConfig/AdvancedScreen.dart
View File

@ -153,7 +153,9 @@ class _AdvancedScreenState extends State<AdvancedScreen> {
content: Text(Utils.itemCountFormat(settings.unsafeRoutes.length), textAlign: TextAlign.end), content: Text(Utils.itemCountFormat(settings.unsafeRoutes.length), textAlign: TextAlign.end),
onPressed: () { onPressed: () {
Utils.openPage(context, (context) { Utils.openPage(context, (context) {
return UnsafeRoutesScreen(unsafeRoutes: settings.unsafeRoutes, onSave: (routes) { return UnsafeRoutesScreen(
unsafeRoutes: settings.unsafeRoutes,
onSave: (routes) {
setState(() { setState(() {
settings.unsafeRoutes = routes; settings.unsafeRoutes = routes;
changed = true; changed = true;

1
lib/screens/siteConfig/CAListScreen.dart
View File

@ -201,7 +201,6 @@ class _CAListScreenState extends State<CAListScreen> {
setState(() {}); setState(() {});
} }
}); });
} catch (err) { } catch (err) {
return Utils.popError(context, 'Failed to load CA file', err.toString()); return Utils.popError(context, 'Failed to load CA file', err.toString());
} }

27
lib/screens/siteConfig/CertificateDetailsScreen.dart
View File

@ -12,7 +12,8 @@ import 'package:mobile_nebula/services/utils.dart';
/// Displays the details of a CertificateInfo object. Respects incomplete objects (missing validity or rawCert) /// Displays the details of a CertificateInfo object. Respects incomplete objects (missing validity or rawCert)
class CertificateDetailsScreen extends StatefulWidget { class CertificateDetailsScreen extends StatefulWidget {
const CertificateDetailsScreen({Key key, this.certInfo, this.onDelete, this.onSave, this.onReplace}) : super(key: key); const CertificateDetailsScreen({Key key, this.certInfo, this.onDelete, this.onSave, this.onReplace})
: super(key: key);
final CertificateInfo certInfo; final CertificateInfo certInfo;
@ -78,8 +79,7 @@ class _CertificateDetailsScreenState extends State<CertificateDetailsScreen> {
return ConfigSection(children: <Widget>[ return ConfigSection(children: <Widget>[
ConfigItem(label: Text('Name'), content: SpecialSelectableText(certInfo.cert.details.name)), ConfigItem(label: Text('Name'), content: SpecialSelectableText(certInfo.cert.details.name)),
ConfigItem( ConfigItem(
label: Text('Type'), label: Text('Type'), content: Text(certInfo.cert.details.isCa ? 'CA certificate' : 'Client certificate')),
content: Text(certInfo.cert.details.isCa ? 'CA certificate' : 'Client certificate')),
]); ]);
} }
@ -106,18 +106,17 @@ class _CertificateDetailsScreenState extends State<CertificateDetailsScreen> {
Widget _buildFilters() { Widget _buildFilters() {
List<Widget> items = []; List<Widget> items = [];
if (certInfo.cert.details.groups.length > 0) { if (certInfo.cert.details.groups.length > 0) {
items.add(ConfigItem( items.add(
label: Text('Groups'), content: SpecialSelectableText(certInfo.cert.details.groups.join(', ')))); ConfigItem(label: Text('Groups'), content: SpecialSelectableText(certInfo.cert.details.groups.join(', '))));
} }
if (certInfo.cert.details.ips.length > 0) { if (certInfo.cert.details.ips.length > 0) {
items items.add(ConfigItem(label: Text('IPs'), content: SpecialSelectableText(certInfo.cert.details.ips.join(', '))));
.add(ConfigItem(label: Text('IPs'), content: SpecialSelectableText(certInfo.cert.details.ips.join(', '))));
} }
if (certInfo.cert.details.subnets.length > 0) { if (certInfo.cert.details.subnets.length > 0) {
items.add(ConfigItem( items.add(
label: Text('Subnets'), content: SpecialSelectableText(certInfo.cert.details.subnets.join(', ')))); ConfigItem(label: Text('Subnets'), content: SpecialSelectableText(certInfo.cert.details.subnets.join(', '))));
} }
return items.length > 0 return items.length > 0
@ -141,8 +140,8 @@ class _CertificateDetailsScreenState extends State<CertificateDetailsScreen> {
certInfo.rawCert != null certInfo.rawCert != null
? ConfigItem( ? ConfigItem(
label: Text('PEM Format'), label: Text('PEM Format'),
content: SpecialSelectableText(certInfo.rawCert, content:
style: TextStyle(fontFamily: 'RobotoMono', fontSize: 14)), SpecialSelectableText(certInfo.rawCert, style: TextStyle(fontFamily: 'RobotoMono', fontSize: 14)),
crossAxisAlignment: CrossAxisAlignment.start) crossAxisAlignment: CrossAxisAlignment.start)
: Container(), : Container(),
], ],
@ -163,15 +162,15 @@ class _CertificateDetailsScreenState extends State<CertificateDetailsScreen> {
color: CupertinoColors.systemRed.resolveFrom(context), color: CupertinoColors.systemRed.resolveFrom(context),
onPressed: () { onPressed: () {
Utils.openPage(context, (context) { Utils.openPage(context, (context) {
return AddCertificateScreen( return AddCertificateScreen(onReplace: (result) {
onReplace: (result) {
setState(() { setState(() {
changed = true; changed = true;
certResult = result; certResult = result;
certInfo = certResult.certInfo; certInfo = certResult.certInfo;
}); });
// Slam the page back to the top // Slam the page back to the top
controller.animateTo(0, duration: const Duration(milliseconds: 10), curve: Curves.linearToEaseOut); controller.animateTo(0,
duration: const Duration(milliseconds: 10), curve: Curves.linearToEaseOut);
}); });
}); });
}))); })));

6
lib/screens/siteConfig/SiteConfigScreen.dart
View File

@ -147,12 +147,10 @@ class _SiteConfigScreenState extends State<SiteConfigScreen> {
site.certInfo = result.certInfo; site.certInfo = result.certInfo;
site.key = result.key; site.key = result.key;
}); });
} });
);
} }
return AddCertificateScreen( return AddCertificateScreen(onSave: (result) {
onSave: (result) {
setState(() { setState(() {
changed = true; changed = true;
site.certInfo = result.certInfo; site.certInfo = result.certInfo;

4
lib/screens/siteConfig/UnsafeRoutesScreen.dart
View File

@ -83,7 +83,9 @@ class _UnsafeRoutesScreenState extends State<UnsafeRoutesScreen> {
content: Text('Add a new route'), content: Text('Add a new route'),
onPressed: () { onPressed: () {
Utils.openPage(context, (context) { Utils.openPage(context, (context) {
return UnsafeRouteScreen(route: UnsafeRoute(), onSave: (route) { return UnsafeRouteScreen(
route: UnsafeRoute(),
onSave: (route) {
setState(() { setState(() {
changed = true; changed = true;
unsafeRoutes[UniqueKey()] = route; unsafeRoutes[UniqueKey()] = route;

3
lib/services/share.dart
View File

@ -44,8 +44,7 @@ class Share {
throw FlutterError('FilePath cannot be null'); throw FlutterError('FilePath cannot be null');
} }
final bool success = final bool success = await _channel.invokeMethod('shareFile', <String, dynamic>{
await _channel.invokeMethod('shareFile', <String, dynamic>{
'title': title, 'title': title,
'filePath': filePath, 'filePath': filePath,
'filename': filename, 'filename': filename,

8
lib/validators/ipValidator.dart
View File

@ -7,14 +7,18 @@ bool ipValidator(String str, bool enableIPV6) {
} }
switch (ia.type) { switch (ia.type) {
case InternetAddressType.IPv6: { case InternetAddressType.IPv6:
{
if (enableIPV6) { if (enableIPV6) {
return true; return true;
} }
} }
break; break;
case InternetAddressType.IPv4: { return true; } case InternetAddressType.IPv4:
{
return true;
}
break; break;
} }