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.

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

fix: lint issues and depreciated methods bugs fixed in relevant at_widgets's packages #872

Merged
merged 21 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
155ce45
fix: Lint warnings in "backupkey_service.dart" file
sitaram-kalluri Jun 19, 2024
b9ec7a3
chore: dependency overrides for at_client_mobile added.
CurtlyCritchlow Jun 26, 2024
32e396f
fix: Lint issues in the following packages:
sitaram-kalluri Jun 26, 2024
49afd02
Merge remote-tracking branch 'origin/trunk' into fix_lint_issues_in_b…
sitaram-kalluri Jul 10, 2024
27c6267
fix: Lint issues in at_chat_flutter
sitaram-kalluri Jul 10, 2024
7d810e6
chore: at_client_mobile dependency override removed and update to 3.2…
CurtlyCritchlow Jul 8, 2024
6ea7df0
chore: at_client_mobile dependency override removed and update to 3.2…
CurtlyCritchlow Jul 9, 2024
1f627fc
fix: AtClientService replaced with AtAuthService.
CurtlyCritchlow Jul 9, 2024
e6df65a
fix: replaced the depreciated KeychainUtil.getPrivateKey method with …
CurtlyCritchlow Jul 11, 2024
99888b8
chore: at_client_mobile dependency overrides removed from at_sync_ui_…
CurtlyCritchlow Jul 11, 2024
909ceb9
chore: chore: at_client_mobile dependency override removed and update…
CurtlyCritchlow Jul 11, 2024
2eecd6b
chore: at_client_mobile dependency override removed and update to 3.2…
CurtlyCritchlow Jul 11, 2024
32b3670
chore: at_client_mobile updated to 3.2.17 and its dependency override…
CurtlyCritchlow Jul 12, 2024
bc38dd7
chore: at_client_mobile updated to 3.2.17 and its dependency override…
CurtlyCritchlow Jul 12, 2024
943b424
chore: at_client_mobile updated to 3.2.17 and its dependency override…
CurtlyCritchlow Jul 12, 2024
f36f8c6
chore: at_client_mobile updated to 3.2.17 and its dependency override…
CurtlyCritchlow Jul 12, 2024
4d5b671
fix: AtClientService method replaced with AtAuthService method due to…
CurtlyCritchlow Jul 17, 2024
9cf6387
chore: at_client_mobile updated to 3.2.17 and its dependency override…
CurtlyCritchlow Jul 18, 2024
f3ec641
Merge branch 'trunk' into fix_lint_issues_in_backupkey_flutter
CurtlyCritchlow Jul 22, 2024
26fb970
chore: at_client_mobile_updated and its dependency override removed f…
CurtlyCritchlow Jul 22, 2024
d1f207a
fix: removed duplicate imports in at_chat_flutter.
CurtlyCritchlow Jul 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
E0E6C3A2BDF8A27F96D32131 /* [CP] Embed Pods Frameworks */,
5EDF71D4EE6B353E3C50EE34 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -156,7 +157,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -236,6 +237,23 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
5EDF71D4EE6B353E3C50EE34 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -343,7 +361,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand All @@ -365,7 +383,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand Down Expand Up @@ -425,7 +446,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -474,7 +495,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand All @@ -497,7 +518,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand All @@ -524,7 +548,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 2 additions & 1 deletion packages/at_backupkey_flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ environment:

dependencies:
at_app_flutter: ^5.2.0
at_client_mobile: ^3.2.15
at_client_mobile: ^3.2.17
at_onboarding_flutter: ^6.1.7
cupertino_icons: ^1.0.6
flutter:
sdk: flutter
path: ^1.8.3
path_provider: ^2.1.1


dependency_overrides:
at_backupkey_flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ class BackUpKeyService {
}

static Future<String?> _getAESKey(String atsign) async {
return await KeychainUtil.getAESKey(atsign);
return (await KeyChainManager.getInstance().readAtsign(name: atsign))
?.selfEncryptionKey;
}

static Future<Map<String, String>> getEncryptedKeys(String atsign) async {
Map<String, String> result;
try {
result = await KeychainUtil.getEncryptedKeys(atsign);
result = await KeyChainManager.getInstance().getEncryptedKeys(atsign);
result[atsign] = await _getAESKey(atsign) ?? '';
} catch (e) {
result = {};
Expand Down
2 changes: 1 addition & 1 deletion packages/at_backupkey_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
path_provider: ^2.1.1
at_file_saver: ^0.1.2
at_utils: ^3.0.15
at_client_mobile: ^3.2.12
at_client_mobile: ^3.2.17
showcaseview: ^3.0.0
device_info_plus: ^9.0.3
# desktop - dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion packages/at_chat_flutter/example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
22 changes: 11 additions & 11 deletions packages/at_chat_flutter/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.1.1):
- permission_handler_apple (9.3.0):
- Flutter
- qr_code_scanner (0.2.0):
- Flutter
Expand Down Expand Up @@ -151,21 +151,21 @@ SPEC CHECKSUMS:
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36

PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
A9760EAD0EB1F2BE37080135 /* [CP] Embed Pods Frameworks */,
713DB8B103FF226EB054178B /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -155,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -235,6 +236,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
713DB8B103FF226EB054178B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -342,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -423,7 +441,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -472,7 +490,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
18 changes: 7 additions & 11 deletions packages/at_chat_flutter/example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import 'dart:async';

import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv;
import 'package:at_chat_flutter_example/second_screen.dart';
import 'package:flutter/material.dart';
import 'package:at_onboarding_flutter/at_onboarding_flutter.dart';
import 'package:at_utils/at_logger.dart' show AtSignLogger;
import 'package:path_provider/path_provider.dart'
show getApplicationSupportDirectory;
import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv;
import 'package:flutter/material.dart';
import 'package:flutter_keychain/flutter_keychain.dart';
import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory;

Future<void> main() async {
await AtEnv.load();
Expand Down Expand Up @@ -35,7 +34,7 @@ class _MyAppState extends State<MyApp> {
// * load the AtClientPreference in the background
Future<AtClientPreference> futurePreference = loadAtClientPreference();
AtClientPreference? atClientPreference;
AtClientService? atClientService;
AtAuthService? atAuthService;

final AtSignLogger _logger = AtSignLogger(AtEnv.appNamespace);

Expand Down Expand Up @@ -92,8 +91,7 @@ class _MyAppState extends State<MyApp> {
}
break;
case AtOnboardingResultStatus.error:
_logger.severe(
'Onboarding throws ${result.errorCode} error');
_logger.severe('Onboarding throws ${result.errorCode} error');
if (mounted) {
await showDialog(
context: context,
Expand Down Expand Up @@ -126,14 +124,12 @@ class _MyAppState extends State<MyApp> {
Center(
child: TextButton(
style: ButtonStyle(
backgroundColor:
WidgetStateProperty.all<Color>(Colors.black12),
backgroundColor: WidgetStateProperty.all<Color>(Colors.black12),
),
onPressed: () {
FlutterKeychain.remove(key: '@atsign');
},
child: const Text('Clear paired atsigns',
style: TextStyle(color: Colors.black)))),
child: const Text('Clear paired atsigns', style: TextStyle(color: Colors.black)))),
],
),
)),
Expand Down
Loading