luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-14 14:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed encryption settings

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-24 01:58:38 +01:00
parent 1c858c0491
commit eb866e1ebe
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/screens/settings/encryption/encryption.dart
View file

@ -72,7 +72,7 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
String? validDataError; String? validDataError;
int certKeyValidApi = 0; int certKeyValidApi = 0;
Map<String, dynamic>? certKeyValid; EncyptionValidation? certKeyValid;
bool formEdited = false; bool formEdited = false;
@ -150,7 +150,7 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
certKeyValidApi = 1; certKeyValidApi = 1;
validDataError = null; validDataError = null;
} }
certKeyValid = result.content; certKeyValid = data;
}); });
} }
else { else {
@ -475,40 +475,40 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
), ),
if (certKeyValid != null && (certificateContentController.text != '' || certificatePathController.text != '')) ...[ if (certKeyValid != null && (certificateContentController.text != '' || certificatePathController.text != '')) ...[
const SizedBox(height: 20), const SizedBox(height: 20),
if (certKeyValid!['valid_chain'] != null) ...[ if (certKeyValid!.validChain != null) ...[
Status( Status(
valid: certKeyValid!['valid_chain'], valid: certKeyValid!.validChain ?? false,
label: certKeyValid!['valid_chain'] == true label: certKeyValid!.validChain == true
? AppLocalizations.of(context)!.validCertificateChain ? AppLocalizations.of(context)!.validCertificateChain
: AppLocalizations.of(context)!.invalidCertificateChain, : AppLocalizations.of(context)!.invalidCertificateChain,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
if (certKeyValid!['subject'] != null) ...[ if (certKeyValid!.subject != null) ...[
Status( Status(
valid: true, valid: true,
label: "${AppLocalizations.of(context)!.subject}: ${certKeyValid!['subject']}" label: "${AppLocalizations.of(context)!.subject}: ${certKeyValid?.subject}"
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
if (certKeyValid!['issuer'] != null) ...[ if (certKeyValid!.issuer != null) ...[
Status( Status(
valid: true, valid: true,
label: "${AppLocalizations.of(context)!.issuer}: ${certKeyValid!['issuer']}" label: "${AppLocalizations.of(context)!.issuer}: ${certKeyValid?.issuer}"
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
if (certKeyValid!['not_after'] != null) ...[ if (certKeyValid!.notAfter != null) ...[
Status( Status(
valid: true, valid: true,
label: "${AppLocalizations.of(context)!.expirationDate}: ${certKeyValid!['not_after']}" label: "${AppLocalizations.of(context)!.expirationDate}: ${certKeyValid?.notAfter}"
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
if (certKeyValid!['dns_names'] != null) ...[ if (certKeyValid!.dnsNames != null) ...[
Status( Status(
valid: true, valid: true,
label: "${AppLocalizations.of(context)!.hostNames}: ${certKeyValid!['dns_names'].join(', ')}" label: "${AppLocalizations.of(context)!.hostNames}: ${certKeyValid?.dnsNames?.join(', ')}"
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
@ -586,26 +586,26 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
if (certKeyValid != null && (privateKeyPathController.text != '' || pastePrivateKeyController.text != '' || usePreviouslySavedKey == true)) ...[ if (certKeyValid != null && (privateKeyPathController.text != '' || pastePrivateKeyController.text != '' || usePreviouslySavedKey == true)) ...[
if (certKeyValid!['valid_key'] != null) ...[ if (certKeyValid!.validKey != null) ...[
Status( Status(
valid: certKeyValid!['valid_key'], valid: certKeyValid!.validKey ?? false,
label: certKeyValid!['valid_key'] == true label: certKeyValid!.validKey == true
? AppLocalizations.of(context)!.validPrivateKey ? AppLocalizations.of(context)!.validPrivateKey
: AppLocalizations.of(context)!.invalidPrivateKey, : AppLocalizations.of(context)!.invalidPrivateKey,
), ),
const SizedBox(height: 10) const SizedBox(height: 10)
], ],
if (certKeyValid!['valid_pair'] != null && certKeyValid!['valid_pair'] == false) ...[ if (certKeyValid!.validPair != null && certKeyValid!.validPair == false) ...[
Status( Status(
valid: false, valid: false,
label: AppLocalizations.of(context)!.keysNotMatch, label: AppLocalizations.of(context)!.keysNotMatch,
), ),
const SizedBox(height: 10) const SizedBox(height: 10)
], ],
if (certKeyValid!['key_type'] != null) ...[ if (certKeyValid!.keyType != null) ...[
Status( Status(
valid: true, valid: true,
label: "${AppLocalizations.of(context)!.keyType}: ${certKeyValid!['key_type']}" label: "${AppLocalizations.of(context)!.keyType}: ${certKeyValid!.keyType}"
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],