Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only-nv21-camera-format-for-qr-scans #379

Merged
merged 5 commits into from
Apr 17, 2024
Merged

Only-nv21-camera-format-for-qr-scans #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1044fd2
improved nv21 converting
frankmer Apr 15, 2024
95d9f08
update buildnumber
frankmer Apr 15, 2024
4147c37
fixed typos
frankmer Apr 16, 2024
6906e55
fixed tests
frankmer Apr 17, 2024
ed55fbc
fixed token notifier test
frankmer Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,18 @@
"--release"
]
},
{
"name": "privacyIDEA Authenticator - internal debug",
"type": "dart",
"request": "launch",
"program": "lib/mains/main_netknights.dart",
"args": [
"--flavor",
"netknights_debug",
"--target",
"lib/mains/main_netknights.dart",
"--debug"
]
},
]
}
36 changes: 36 additions & 0 deletions android/app/src/debug/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,42 @@
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:838329625695:android:b2c30ebc37698bc3243fea",
"android_client_info": {
"package_name": "it.netknights.piauthenticator.debug.debug"
}
},
"oauth_client": [
{
"client_id": "838329625695-sb84hi21ds91m1afd7hta7rq5arr7ck9.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCU_OYNBRAHPsgR4X7jlikxIozw6EwibH4"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "838329625695-sb84hi21ds91m1afd7hta7rq5arr7ck9.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "838329625695-2atauche4u5p406p0pklghk2fu25jago.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "privacyidea.authenticator"
}
}
]
}
}
}
],
"configuration_version": "1"
Expand Down
2 changes: 1 addition & 1 deletion integration_test/add_tokens_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void main() {
settingsProvider.overrideWith((ref) => SettingsNotifier(repository: mockSettingsRepository)),
tokenProvider.overrideWith((ref) => TokenNotifier(repository: mockTokenRepository)),
tokenFolderProvider.overrideWith((ref) => TokenFolderNotifier(repository: mockTokenFolderRepository)),
introductionProvider.overrideWith((ref) => InrtroductionNotifier(repository: mockIntroductionRepository)),
introductionProvider.overrideWith((ref) => IntroductionNotifier(repository: mockIntroductionRepository)),
],
child: PrivacyIDEAAuthenticator(customization: ApplicationCustomization.defaultCustomization),
));
Expand Down
3 changes: 3 additions & 0 deletions integration_test/rename_and_delete_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:privacyidea_authenticator/model/enums/introduction.dart';
import 'package:privacyidea_authenticator/model/states/introduction_state.dart';
import 'package:privacyidea_authenticator/model/states/settings_state.dart';
import 'package:privacyidea_authenticator/model/tokens/hotp_token.dart';
import 'package:privacyidea_authenticator/state_notifiers/completed_introduction_notifier.dart';
import 'package:privacyidea_authenticator/state_notifiers/settings_notifier.dart';
import 'package:privacyidea_authenticator/state_notifiers/token_folder_notifier.dart';
import 'package:privacyidea_authenticator/state_notifiers/token_notifier.dart';
Expand Down Expand Up @@ -52,6 +53,7 @@ void main() {
settingsProvider.overrideWith((ref) => SettingsNotifier(repository: mockSettingsRepository)),
tokenProvider.overrideWith((ref) => TokenNotifier(repository: mockTokenRepository)),
tokenFolderProvider.overrideWith((ref) => TokenFolderNotifier(repository: mockTokenFolderRepository)),
introductionProvider.overrideWith((ref) => IntroductionNotifier(repository: mockIntroductionRepository)),
],
child: PrivacyIDEAAuthenticator(customization: ApplicationCustomization.defaultCustomization),
));
Expand All @@ -75,6 +77,7 @@ Future<void> _renameToken(WidgetTester tester, String newName) async {
expect(find.byType(TextFormField), findsNWidgets(3));
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextFormField).first, '');
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextFormField).first, newName);
await pumpUntilFindNWidgets(tester, find.widgetWithText(TextFormField, newName), 1, const Duration(seconds: 2));
await tester.tap(find.text(AppLocalizationsEn().save));
Expand Down
4 changes: 2 additions & 2 deletions lib/state_notifiers/completed_introduction_notifier.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import '../model/enums/introduction.dart';
import '../model/states/introduction_state.dart';
import '../utils/logger.dart';

class InrtroductionNotifier extends StateNotifier<IntroductionState> {
class IntroductionNotifier extends StateNotifier<IntroductionState> {
late Future<IntroductionState> loadingRepo;

final IntroductionRepository _repo;
InrtroductionNotifier({required IntroductionRepository repository})
IntroductionNotifier({required IntroductionRepository repository})
: _repo = repository,
super(const IntroductionState()) {
_init();
Expand Down
Loading
Loading