diff --git a/lib/screens/AboutScreen.dart b/lib/screens/AboutScreen.dart index 6880ea0..7741793 100644 --- a/lib/screens/AboutScreen.dart +++ b/lib/screens/AboutScreen.dart @@ -55,9 +55,10 @@ class _AboutScreenState extends State { ConfigItem(label: Text('Dart version'), labelWidth: 150, content: _buildText(flutterVersion['dartSdkVersion'])), ]), ConfigSection(children: [ - 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/mobile/privacy-policy', context)), - ConfigPageItem(label: Text('Licenses'), labelWidth: 300, onPressed: () => Utils.launchUrl('https://defined.net/mobile/license', context)), + //TODO: wire up these other pages +// 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('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,)), ]), diff --git a/lib/screens/siteConfig/CertificateScreen.dart b/lib/screens/siteConfig/CertificateScreen.dart index 8e2ebf5..9ef3403 100644 --- a/lib/screens/siteConfig/CertificateScreen.dart +++ b/lib/screens/siteConfig/CertificateScreen.dart @@ -276,6 +276,11 @@ class _CertificateScreenState extends State { _addCertEntry(String rawCert, ValueChanged callback) async { String error; + // Allow for app store review testing cert to override the generated key + if (rawCert.trim() == _testCert) { + privKey = _testKey; + } + try { var rawCerts = await platform.invokeMethod("nebula.parseCerts", {"certs": rawCert}); List certs = jsonDecode(rawCerts); @@ -291,3 +296,16 @@ class _CertificateScreenState extends State { } } } + +// This a cert that if presented will swap the key to assist the app review process +const _testCert = '''-----BEGIN NEBULA CERTIFICATE----- +CpMBChdBcHAgU3RvcmUgUmV2aWV3IERldmljZRIKgpSghQyA/v//DyIGcmV2aWV3 +IhRiNzJjZThiZWM5MDYwYTA3MmNmMSjvk7f5BTCPnYf0BzogYHa3YoNcFJxKX8bU +jK4pg0aIYxDkwk8aM7w1c+CQXSpKICx06NYtozgKaA2R9NO311D8T86iTXxLmjI4 +0wzAXCSmEkCi9ocqtyQhNp75eKphqVlZNl1RXBo4hdY9jBdc9+b9o0bU4zxFxIRT +uDneQqytYS+BUfgNnGX5wsMxOEst/kkC +-----END NEBULA CERTIFICATE-----'''; + +const _testKey = '''-----BEGIN NEBULA X25519 PRIVATE KEY----- +UlyDdFn/2mLFykeWjCEwWVRSDHtMF7nz3At3O77Faf4= +-----END NEBULA X25519 PRIVATE KEY-----'''; \ No newline at end of file