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

Merge branch 'beta'

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-24 01:59:14 +01:00
commit 65885c9498
2 changed files with 20 additions and 20 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;
int certKeyValidApi = 0;
Map<String, dynamic>? certKeyValid;
EncyptionValidation? certKeyValid;
bool formEdited = false;
@ -150,7 +150,7 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
certKeyValidApi = 1;
validDataError = null;
}
certKeyValid = result.content;
certKeyValid = data;
});
}
else {
@ -475,40 +475,40 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
),
if (certKeyValid != null && (certificateContentController.text != '' || certificatePathController.text != '')) ...[
const SizedBox(height: 20),
if (certKeyValid!['valid_chain'] != null) ...[
if (certKeyValid!.validChain != null) ...[
Status(
valid: certKeyValid!['valid_chain'],
label: certKeyValid!['valid_chain'] == true
valid: certKeyValid!.validChain ?? false,
label: certKeyValid!.validChain == true
? AppLocalizations.of(context)!.validCertificateChain
: AppLocalizations.of(context)!.invalidCertificateChain,
),
const SizedBox(height: 10),
],
if (certKeyValid!['subject'] != null) ...[
if (certKeyValid!.subject != null) ...[
Status(
valid: true,
label: "${AppLocalizations.of(context)!.subject}: ${certKeyValid!['subject']}"
label: "${AppLocalizations.of(context)!.subject}: ${certKeyValid?.subject}"
),
const SizedBox(height: 10),
],
if (certKeyValid!['issuer'] != null) ...[
if (certKeyValid!.issuer != null) ...[
Status(
valid: true,
label: "${AppLocalizations.of(context)!.issuer}: ${certKeyValid!['issuer']}"
label: "${AppLocalizations.of(context)!.issuer}: ${certKeyValid?.issuer}"
),
const SizedBox(height: 10),
],
if (certKeyValid!['not_after'] != null) ...[
if (certKeyValid!.notAfter != null) ...[
Status(
valid: true,
label: "${AppLocalizations.of(context)!.expirationDate}: ${certKeyValid!['not_after']}"
label: "${AppLocalizations.of(context)!.expirationDate}: ${certKeyValid?.notAfter}"
),
const SizedBox(height: 10),
],
if (certKeyValid!['dns_names'] != null) ...[
if (certKeyValid!.dnsNames != null) ...[
Status(
valid: true,
label: "${AppLocalizations.of(context)!.hostNames}: ${certKeyValid!['dns_names'].join(', ')}"
label: "${AppLocalizations.of(context)!.hostNames}: ${certKeyValid?.dnsNames?.join(', ')}"
),
const SizedBox(height: 10),
],
@ -586,26 +586,26 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
),
const SizedBox(height: 20),
if (certKeyValid != null && (privateKeyPathController.text != '' || pastePrivateKeyController.text != '' || usePreviouslySavedKey == true)) ...[
if (certKeyValid!['valid_key'] != null) ...[
if (certKeyValid!.validKey != null) ...[
Status(
valid: certKeyValid!['valid_key'],
label: certKeyValid!['valid_key'] == true
valid: certKeyValid!.validKey ?? false,
label: certKeyValid!.validKey == true
? AppLocalizations.of(context)!.validPrivateKey
: AppLocalizations.of(context)!.invalidPrivateKey,
),
const SizedBox(height: 10)
],
if (certKeyValid!['valid_pair'] != null && certKeyValid!['valid_pair'] == false) ...[
if (certKeyValid!.validPair != null && certKeyValid!.validPair == false) ...[
Status(
valid: false,
label: AppLocalizations.of(context)!.keysNotMatch,
),
const SizedBox(height: 10)
],
if (certKeyValid!['key_type'] != null) ...[
if (certKeyValid!.keyType != null) ...[
Status(
valid: true,
label: "${AppLocalizations.of(context)!.keyType}: ${certKeyValid!['key_type']}"
label: "${AppLocalizations.of(context)!.keyType}: ${certKeyValid!.keyType}"
),
const SizedBox(height: 10),
],

2
pubspec.yaml
View file

@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 2.11.2+107
version: 2.11.3+108
environment:
sdk: '>=2.18.1 <3.0.0'