Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-23 09:56:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check capacity if state is not null

Browse Source
This commit is contained in:
Dennis Fokin 2023-08-16 13:42:15 +02:00
parent c82119d726
commit 96639b970c
No known key found for this signature in database
GPG Key ID: 870B88256690D8BC
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/app/views/main_page.dart
View File

@ -22,14 +22,11 @@ import '../../android/state.dart';
import '../../exception/cancellation_exception.dart';
import '../../core/state.dart';
import '../../fido/views/fido_screen.dart';
import '../../oath/models.dart';
import '../../oath/state.dart';
import '../../oath/views/add_account_page.dart';
import '../../oath/views/oath_screen.dart';
import '../../oath/views/utils.dart';
import '../../piv/views/piv_screen.dart';
import '../../widgets/custom_icons.dart';
import '../message.dart';
import '../models.dart';
import '../state.dart';
import 'device_error_screen.dart';
@ -101,7 +98,6 @@ class MainPage extends ConsumerWidget {
icon: const Icon(Icons.person_add_alt_1),
tooltip: l10n.s_add_account,
onPressed: () async {
CredentialData? otpauth;
final scanner = ref.read(qrScannerProvider);
if (scanner != null) {
try {
@ -115,20 +111,6 @@ class MainPage extends ConsumerWidget {
return;
}
}
await ref.read(withContextProvider)((context) => showBlurDialog(
context: context,
routeSettings:
const RouteSettings(name: 'oath_add_account'),
builder: (context) {
return OathAddAccountPage(
null,
null,
credentials: null,
credentialData: otpauth,
);
},
));
},
),
);

10
lib/oath/views/add_multi_account_page.dart
View File

@ -205,9 +205,13 @@ class _OathAddMultiAccountPageState
bool isValid() {
final credsToAdd = _credStates.values.where((element) => element.$1).length;
int? capacity = widget.state!.version.isAtLeast(4) ? 32 : null;
return (credsToAdd > 0) &&
(capacity == null || (_numCreds! + credsToAdd <= capacity));
if (widget.state != null) {
int? capacity = widget.state!.version.isAtLeast(4) ? 32 : null;
return (credsToAdd > 0) &&
(capacity == null || (_numCreds! + credsToAdd <= capacity));
} else {
return true;
}
}
void submit() async {