From 5639c0e5d951e96cab5b82f6966ba3f8dc1d8d46 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Wed, 7 Aug 2024 09:48:10 -0400 Subject: [PATCH 1/5] chore: at_client_mobile undated to 3.2.18 and its dependency override was removed, kotlin version updated, stacktrace added to debugPrint. --- packages/at_onboarding_flutter/CHANGELOG.md | 48 +++++++++++++++++++ .../android/build.gradle | 2 +- .../example/android/build.gradle | 2 +- .../example/ios/Podfile.lock | 16 +++---- .../example/lib/main.dart | 2 +- .../example/pubspec.yaml | 1 - .../screen/at_onboarding_start_screen.dart | 18 +++---- packages/at_onboarding_flutter/pubspec.yaml | 17 ++----- 8 files changed, 71 insertions(+), 35 deletions(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index e220b5212..76ef4be5a 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,146 +1,194 @@ +## 6.1.8 + +- **CHORE**: Updated dependencies +- **CHORE**: Updated kotlin version + ## 6.1.7 + - **CHORE**: Bumped all dependency versions - Major version increase of at_commons from ^3.0.55 to ^4.0.1 ## 6.1.6 + - **FIX**: Fixed file_selector issue on Windows ## 6.1.5 + - **CHORE**: Updated tutorial_coach_mark from 1.2.9 to 1.2.11 ## 6.1.4 + - **CHORE**: Bumped all dependency versions - Major version increase of permission_handler from ^10.4.3 to ^11.0.0 - Major version increase of file_selector from >=0.8.4+3 <=1.0.0 to ^1.1.0 ## 6.1.3 + - **CHORE**: Updated at_client_mobile package to fix onboarding issue on Windows ## 6.1.2 + - **CHORE**: Update to support Dart 3 ## 6.1.1 + - **FIX**: Updated error messages ## 6.1.0 + - **FEAT**: Internationalization support added for French - **FIX**: Issue fixed in UI theme ## 6.0.3 + - **CHORE**: Upgrade dependencies for at_chops uptake ## 6.0.2 + - **FIX**: Added assets path in yaml ## 6.0.1 + - **FIX**: Fixed issue in atSign activation process - **CHORE**: Exported at_client_mobile dependency ## 6.0.0 + - **CHORE**: Updated file_picker and webview_flutter dependency ## 5.0.5 + - **FIX**: Fixed atSign activation issue ## 5.0.4 + - **CHORE**: Updated dependencies and readme ## 5.0.3 + - **CHORE**: Updated dependencies,readme and gradle version. - **FIX**: Resolved android build issue. ## 5.0.2 + - **CHORE**: Updated dependencies ## 5.0.1 + - **FIX**: Windows onboarding issue resolved ## 5.0.0 + - **FEAT**: Updated UI flow - **FEAT**: Updated Keychain data structure dependency ## 4.0.4 + - **FIX**: Bug fixes in atSign activation process ## 4.0.3 + - **FIX**: Lint Fixes according to flutter 3.0 ## 4.0.2 + - **FIX**: Added missing fontWeight ## 4.0.1 + - **CHORE**: Updated dependencies - **FEAT**: Added ability to select files without extension. ## 4.0.0 + - **CHORE**: Updated dependencies - **BREAKING CHANGE**: at_backupkey_flutter exposed in this package has breaking change - removed redundant, required parameter `atClientService`. ## 3.1.4 + - **DOCS**: Updated documentation - **CHORE**: Updated dependencies ## 3.1.3 + - **FIX**: Fixed [sending OTP inconsistency](https://github.com/atsign-foundation/at_widgets/issues/236) bug. ## 3.1.2 + - **FIX**: Fixed at_client dependency issue - **FIX**: Fixed lint errors ## 3.1.1 + - **CHORE**: Update a dependency to the latest release. ## 3.1.0 + - **FEAT**: Added support for macos, windows and linux platforms ## 3.0.4 + - **FEAT**: Added hide qr scan to hide qr scan in custom dialog ## 3.0.3 + - **FIX**: Resolved Qr scanning issue in ios ## 3.0.2 + - **FEAT**: Added hide references to hide webpage references in custom dialog ## 3.0.1 + - **FIX**: bug fixes ## 3.0.0 + - **FEAT**: Resilient SDK changes uptake for monitor, notification, and sync improvements. - **CHORE**: Removed the domain parameter from the `Onboarding` widget. - **FEAT**: Added `rootEnvironment` parameter to the `Onboarding` widget. - **FEAT**: Made API Key mandatory for production environment. ## 2.1.3 + - **FEAT**: added QR code screen ## 2.1.2 + - **DOCS**: updated README ## 2.1.1 + - **CHORE**: updated packages - **FIX**: authentication bug fix ## 2.1.0 + - **CHORE**: changes to get apiKey from app ## 2.0.0 + - **FEAT**: supports .zip/.atKeys files of @signs - **FEAT**: can generate free @signs - **CHORE**: null-safety migration ## 1.0.0+4 + - **CHORE**: upgraded some packages to resolve dependency issues ## 1.0.0+3 + - **FIX**: Scan QRcode on app start fix ## 1.0.0+2 + - **CHORE**: pubspec dependency upgrade ## 1.0.0+1 + - **FIX**: Scanning QRcode fix - **CHORE**: pubspec dependency upgrade ## 1.0.0 + - Initial version diff --git a/packages/at_onboarding_flutter/android/build.gradle b/packages/at_onboarding_flutter/android/build.gradle index 04541add2..6cf243646 100644 --- a/packages/at_onboarding_flutter/android/build.gradle +++ b/packages/at_onboarding_flutter/android/build.gradle @@ -2,7 +2,7 @@ group 'com.atsign.at_onboarding_flutter' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.20' repositories { google() jcenter() diff --git a/packages/at_onboarding_flutter/example/android/build.gradle b/packages/at_onboarding_flutter/example/android/build.gradle index 713d7f6e6..23eb4f6ed 100644 --- a/packages/at_onboarding_flutter/example/android/build.gradle +++ b/packages/at_onboarding_flutter/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.20' repositories { google() mavenCentral() diff --git a/packages/at_onboarding_flutter/example/ios/Podfile.lock b/packages/at_onboarding_flutter/example/ios/Podfile.lock index 54aee351a..a9f64f78d 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile.lock +++ b/packages/at_onboarding_flutter/example/ios/Podfile.lock @@ -141,24 +141,24 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - file_selector_ios: b6a6c6667913d571590169ef946afbafe3b52688 + file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 + file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 + webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart index 2da782d8a..74cfc0774 100644 --- a/packages/at_onboarding_flutter/example/lib/main.dart +++ b/packages/at_onboarding_flutter/example/lib/main.dart @@ -104,7 +104,7 @@ class MyAppState extends State { result = await AtOnboarding.onboard( context: context, config: AtOnboardingConfig( - atClientPreference: atClientPreference!, + atClientPreference: preference, domain: AtEnv.rootDomain, rootEnvironment: AtEnv.rootEnvironment, appAPIKey: AtEnv.appApiKey, diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 6a1f8719b..ab3c22e55 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -47,7 +47,6 @@ dependency_overrides: intl: ^0.17.0 at_onboarding_flutter: path: ../ - # at_onboarding_flutter: ^6.1.5 # For information on the generic Dart part of this file, see the diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart index bc2d68111..2a920f17d 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart @@ -25,8 +25,7 @@ class AtOnboardingStartScreen extends StatefulWidget { }) : super(key: key); @override - State createState() => - _AtOnboardingStartScreenState(); + State createState() => _AtOnboardingStartScreenState(); } class _AtOnboardingStartScreenState extends State { @@ -40,8 +39,7 @@ class _AtOnboardingStartScreenState extends State { void _init() async { // This feature will reopen in future - final isUsingSharedStorage = - await _onboardingService.isUsingSharedStorage(); + final isUsingSharedStorage = await _onboardingService.isUsingSharedStorage(); final showPopupShareStorage = widget.config.showPopupSharedStorage; if (isUsingSharedStorage == null && @@ -51,8 +49,7 @@ class _AtOnboardingStartScreenState extends State { final result = await askUserUseSharedStorage(); await _onboardingService.initialSetup(usingSharedStorage: result); } else { - await _onboardingService.initialSetup( - usingSharedStorage: isUsingSharedStorage ?? false); + await _onboardingService.initialSetup(usingSharedStorage: isUsingSharedStorage ?? false); } _onboardingService.setAtClientPreference = widget.config.atClientPreference; try { @@ -66,10 +63,10 @@ class _AtOnboardingStartScreenState extends State { atsign: _onboardingService.currentAtsign!, ), ); - } catch (e) { + } catch (e, stacktrace) { debugPrint("AtOnboardingInitScreen: error - $e"); - if (e == OnboardingStatus.ATSIGN_NOT_FOUND || - e == OnboardingStatus.PRIVATE_KEY_NOT_FOUND) { + debugPrint(stacktrace.toString()); + if (e == OnboardingStatus.ATSIGN_NOT_FOUND || e == OnboardingStatus.PRIVATE_KEY_NOT_FOUND) { if (!mounted) return; final result = await Navigator.push( context, @@ -125,8 +122,7 @@ class _AtOnboardingStartScreenState extends State { padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), decoration: BoxDecoration( color: theme.scaffoldBackgroundColor, - borderRadius: - BorderRadius.circular(AtOnboardingDimens.dialogBorderRadius), + borderRadius: BorderRadius.circular(AtOnboardingDimens.dialogBorderRadius), ), child: Row( mainAxisSize: MainAxisSize.min, diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 596fdc5b1..c2e728a99 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: at_onboarding_flutter description: A Flutter plugin project for onboarding any atSign in atPlatform apps with ease. Provides a QRscanner option and an upload key file option to authenticate. -version: 6.1.7 +version: 6.1.8 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_onboarding_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues @@ -16,12 +16,12 @@ dependencies: archive: ^3.4.10 at_backupkey_flutter: ^4.0.12 at_client: ^3.0.72 - at_client_mobile: ^3.2.15 + at_client_mobile: ^3.2.18 at_commons: ^4.0.1 at_server_status: ^1.0.4 at_sync_ui_flutter: ^1.0.10 at_utils: ^3.0.16 - file_picker: ^6.1.1 + file_picker: ^8.0.6 at_auth: ^2.0.4 # desktop - dependencies @@ -45,18 +45,11 @@ dependencies: webview_flutter: ^4.5.0 zxing2: ^0.2.1 -dependency_overrides: - at_client_mobile: - git: - url: https://github.com/atsign-foundation/at_client_sdk.git - path: packages/at_client_mobile - ref: trunk - dev_dependencies: - flutter_lints: ^2.0.3 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter - mocktail: ^0.3.0 + mocktail: ^1.0.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From bd62cc36ebec3e7bbd676a9fe6e1bcfd01cdc652 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 8 Aug 2024 09:43:50 -0400 Subject: [PATCH 2/5] chore: at_invitation_flutter updated to 2.0.4 --- packages/at_invitation_flutter/CHANGELOG.md | 12 +++++++++++- .../android/app/src/debug/AndroidManifest.xml | 11 +++++++++-- .../example/android/build.gradle | 6 +++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../at_invitation_flutter/example/ios/Podfile.lock | 4 ++-- packages/at_invitation_flutter/example/pubspec.yaml | 2 +- packages/at_invitation_flutter/pubspec.yaml | 2 +- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/packages/at_invitation_flutter/CHANGELOG.md b/packages/at_invitation_flutter/CHANGELOG.md index 4361ccea6..6c076645c 100644 --- a/packages/at_invitation_flutter/CHANGELOG.md +++ b/packages/at_invitation_flutter/CHANGELOG.md @@ -1,5 +1,15 @@ +## 2.0.4: + +- **CHORE**: Kotlin version increase to 1.8.20 +- **CHORE**: Major version increase of flutter_lints from ^2.0.3 to ^4.0.1 +- **CHORE**: Updated dependencies +- **CHORE**: AndroidManifest updated +- **CHORE**: gradle updated +- **FIX**: Lint issues fixed + ## 2.0.3: -- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.0 ## 2.0.2 diff --git a/packages/at_invitation_flutter/example/android/app/src/debug/AndroidManifest.xml b/packages/at_invitation_flutter/example/android/app/src/debug/AndroidManifest.xml index fb309701a..61d6256f7 100644 --- a/packages/at_invitation_flutter/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/at_invitation_flutter/example/android/app/src/debug/AndroidManifest.xml @@ -1,7 +1,14 @@ - + + + + + + + + + diff --git a/packages/at_invitation_flutter/example/android/build.gradle b/packages/at_invitation_flutter/example/android/build.gradle index 7b5131a33..318cf4c6f 100644 --- a/packages/at_invitation_flutter/example/android/build.gradle +++ b/packages/at_invitation_flutter/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.8.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/at_invitation_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/at_invitation_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afd..cfe88f690 100644 --- a/packages/at_invitation_flutter/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/at_invitation_flutter/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/packages/at_invitation_flutter/example/ios/Podfile.lock b/packages/at_invitation_flutter/example/ios/Podfile.lock index 2e2a2b8cb..76745d6ca 100644 --- a/packages/at_invitation_flutter/example/ios/Podfile.lock +++ b/packages/at_invitation_flutter/example/ios/Podfile.lock @@ -152,7 +152,7 @@ SPEC CHECKSUMS: at_invitation_flutter: 96015bc9cd2c14148bfea6e6b73151120d701234 at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de @@ -165,7 +165,7 @@ SPEC CHECKSUMS: permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f uni_links: d97da20c7701486ba192624d99bffaaffcfc298a diff --git a/packages/at_invitation_flutter/example/pubspec.yaml b/packages/at_invitation_flutter/example/pubspec.yaml index a440bd5fb..6824a52a8 100644 --- a/packages/at_invitation_flutter/example/pubspec.yaml +++ b/packages/at_invitation_flutter/example/pubspec.yaml @@ -55,7 +55,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.3 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index 882617b0a..913e70685 100644 --- a/packages/at_invitation_flutter/pubspec.yaml +++ b/packages/at_invitation_flutter/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: uuid: ^3.0.7 dev_dependencies: - flutter_lints: ^2.0.3 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter From 995f9b39aeb6f5663efee7b9fa68634ec91066a3 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 8 Aug 2024 09:49:25 -0400 Subject: [PATCH 3/5] fix: Dangling library doc comment info message resolved. --- .../lib/services/invitation_service.dart | 49 +++++-------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/packages/at_invitation_flutter/lib/services/invitation_service.dart b/packages/at_invitation_flutter/lib/services/invitation_service.dart index 843930ccb..f66f00c61 100644 --- a/packages/at_invitation_flutter/lib/services/invitation_service.dart +++ b/packages/at_invitation_flutter/lib/services/invitation_service.dart @@ -1,5 +1,3 @@ -/// A service to handle invitation needs - import 'dart:async'; import 'dart:convert'; import 'dart:math'; @@ -12,6 +10,7 @@ import 'package:at_utils/at_logger.dart'; import 'package:flutter/material.dart'; import 'package:uuid/uuid.dart'; +/// A service to handle invitation needs class InvitationService { InvitationService._(); @@ -33,10 +32,7 @@ class InvitationService { GlobalKey get navigatorKey => navkey ?? GlobalKey(); /// initialize the invitation service - void initInvitationService( - GlobalKey? navkeyFromApp, - String? webPageFromApp, - String rootDomainFromApp, + void initInvitationService(GlobalKey? navkeyFromApp, String? webPageFromApp, String rootDomainFromApp, int rootPortFromApp) async { navkey = navkeyFromApp; webPage = webPageFromApp; @@ -50,11 +46,7 @@ class InvitationService { // called again if outbound connection is dropped Future startMonitor() async { if (!hasMonitorStarted) { - AtClientManager.getInstance() - .atClient - .notificationService - .subscribe(shouldDecrypt: true) - .listen((notification) { + AtClientManager.getInstance().atClient.notificationService.subscribe(shouldDecrypt: true).listen((notification) { _notificationCallback(notification); }); hasMonitorStarted = true; @@ -91,26 +83,21 @@ class InvitationService { void _processInviteAcknowledgement(String? data, String? fromAtsign) async { if (data != null && fromAtsign != null) { - MessageShareModel receivedInformation = - MessageShareModel.fromJson(jsonDecode(data)); + MessageShareModel receivedInformation = MessageShareModel.fromJson(jsonDecode(data)); // build and fetch self key AtKey atKey = AtKey()..metadata = Metadata(); atKey.key = '$invitationKey.${receivedInformation.identifier ?? ''}'; atKey.metadata.ttr = -1; var result = await AtClientManager.getInstance().atClient.get(atKey); - MessageShareModel sentInformation = - MessageShareModel.fromJson(jsonDecode(result.value)); + MessageShareModel sentInformation = MessageShareModel.fromJson(jsonDecode(result.value)); var receivedPasscode = receivedInformation.passcode; var sentPasscode = sentInformation.passcode; if (sentPasscode == receivedPasscode) { atKey.sharedWith = fromAtsign; - await AtClientManager.getInstance() - .atClient - .put(atKey, jsonEncode(sentInformation.message)) - .catchError((e) { + await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(sentInformation.message)).catchError((e) { _logger.severe('Error in sharing saved message => $e'); throw e; }); @@ -125,16 +112,12 @@ class InvitationService { int code = Random().nextInt(9999); String passcode = code.toString().padLeft(4, '0'); - MessageShareModel messageContent = MessageShareModel( - passcode: passcode, identifier: keyID, message: jsonData); + MessageShareModel messageContent = MessageShareModel(passcode: passcode, identifier: keyID, message: jsonData); AtKey atKey = AtKey()..metadata = Metadata(); atKey.key = '$invitationKey.$keyID'; atKey.metadata.ttr = -1; - var result = await AtClientManager.getInstance() - .atClient - .put(atKey, jsonEncode(messageContent)) - .catchError((e) { + var result = await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(messageContent)).catchError((e) { _logger.severe('Error in saving shared data => $e'); throw e; }); @@ -145,16 +128,13 @@ class InvitationService { uniqueID: keyID, passcode: passcode, webPageLink: webPage, - currentAtsign: - AtClientManager.getInstance().atClient.getCurrentAtSign() ?? - ''), + currentAtsign: AtClientManager.getInstance().atClient.getCurrentAtSign() ?? ''), ); } } /// show the OTP dialog and fetch the invite data - Future fetchInviteData( - BuildContext context, String data, String atsign) async { + Future fetchInviteData(BuildContext context, String data, String atsign) async { String otp = await showDialog( context: context, builder: (context) => const OTPDialog(), @@ -163,12 +143,9 @@ class InvitationService { atKey.key = '$invitationAckKey.$data'; atKey.sharedWith = atsign; atKey.metadata.ttr = -1; - MessageShareModel messageContent = MessageShareModel( - passcode: otp, identifier: data, message: 'invite acknowledgement'); - await AtClientManager.getInstance() - .atClient - .put(atKey, jsonEncode(messageContent)) - .catchError((e) { + MessageShareModel messageContent = + MessageShareModel(passcode: otp, identifier: data, message: 'invite acknowledgement'); + await AtClientManager.getInstance().atClient.put(atKey, jsonEncode(messageContent)).catchError((e) { _logger.severe('Error in saving acknowledge message => $e'); throw e; }); From 19c7638e2d44dbe236314f6eaf8ecfbf83fad253 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 8 Aug 2024 10:42:25 -0400 Subject: [PATCH 4/5] chore: file_picker temporarily downgrade for compatibility with at_chat_flutter. --- packages/at_onboarding_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index c2e728a99..f31cd0747 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: at_server_status: ^1.0.4 at_sync_ui_flutter: ^1.0.10 at_utils: ^3.0.16 - file_picker: ^8.0.6 + file_picker: ^6.1.1 at_auth: ^2.0.4 # desktop - dependencies From b83147d11e7b89772be1f4bd0347db16023e84fe Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 8 Aug 2024 10:51:07 -0400 Subject: [PATCH 5/5] fix: The referenced identifier is a wildcard info message fixed in at_onboarding_flutter. --- .../screen/at_onboarding_accounts_screen.dart | 37 ++++++------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart index 0391ac66b..62a4d92b4 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart @@ -27,12 +27,10 @@ class AtOnboardingAccountsScreen extends StatefulWidget { }) : super(key: key); @override - State createState() => - _AtOnboardingAccountsScreenState(); + State createState() => _AtOnboardingAccountsScreenState(); } -class _AtOnboardingAccountsScreenState - extends State { +class _AtOnboardingAccountsScreenState extends State { List pairedAtsignsList = []; Object? lastSelectedIndex; late int greyStartIndex; @@ -72,9 +70,7 @@ class _AtOnboardingAccountsScreenState ? Center( child: Column( children: [ - CircularProgressIndicator( - valueColor: AlwaysStoppedAnimation( - theme.primaryColor)), + CircularProgressIndicator(valueColor: AlwaysStoppedAnimation(theme.primaryColor)), Text( AtOnboardingLocalizations.current.loading_atSigns, style: const TextStyle( @@ -88,8 +84,7 @@ class _AtOnboardingAccountsScreenState : Column( children: [ Text( - widget.message ?? - AtOnboardingLocalizations.current.title_select_atSign, + widget.message ?? AtOnboardingLocalizations.current.title_select_atSign, style: const TextStyle( fontWeight: FontWeight.bold, fontSize: AtOnboardingDimens.fontNormal, @@ -109,9 +104,7 @@ class _AtOnboardingAccountsScreenState }, value: 'new', activeColor: theme.primaryColor, - title: Text('@${widget.newAtsign}', - style: - const TextStyle(fontWeight: FontWeight.bold)), + title: Text('@${widget.newAtsign}', style: const TextStyle(fontWeight: FontWeight.bold)), ) ], const Divider(thickness: 0.8), @@ -120,8 +113,7 @@ class _AtOnboardingAccountsScreenState itemCount: widget.atsigns.length, itemBuilder: (BuildContext context, int index) { String currentItem = '@${widget.atsigns[index]}'; - bool isExist = - pairedAtsignsList.contains(currentItem); + bool isExist = pairedAtsignsList.contains(currentItem); return Padding( padding: const EdgeInsets.symmetric(vertical: 2.0), child: RadioListTile( @@ -134,8 +126,7 @@ class _AtOnboardingAccountsScreenState lastSelectedIndex = value; }); _showAlert( - widget.atsigns[int.parse( - lastSelectedIndex.toString())], + widget.atsigns[int.parse(lastSelectedIndex.toString())], context, ); }, @@ -172,15 +163,11 @@ class _AtOnboardingAccountsScreenState style: theme.textTheme.bodyLarge, children: [ TextSpan( - text: - AtOnboardingLocalizations.current.title_pair_atSign_prev, + text: AtOnboardingLocalizations.current.title_pair_atSign_prev, ), + TextSpan(text: ' $atsign ', style: const TextStyle(fontWeight: FontWeight.bold)), TextSpan( - text: ' $atsign ', - style: const TextStyle(fontWeight: FontWeight.bold)), - TextSpan( - text: - AtOnboardingLocalizations.current.title_pair_atSign_next, + text: AtOnboardingLocalizations.current.title_pair_atSign_next, ) ], ), @@ -189,7 +176,7 @@ class _AtOnboardingAccountsScreenState AtOnboardingSecondaryButton( height: 40, borderRadius: 20, - onPressed: () => Navigator.pop(_), + onPressed: () => Navigator.pop(context), child: Text( AtOnboardingLocalizations.current.btn_cancel, ), @@ -198,7 +185,7 @@ class _AtOnboardingAccountsScreenState height: 40, borderRadius: 20, onPressed: () { - Navigator.pop(_); + Navigator.pop(context); Navigator.pop(context, atsign); }, child: Text(