diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 914a78e3..9a9db0a5 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -362,7 +362,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -484,7 +484,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -508,7 +508,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/data/provider/apt.dart b/lib/data/provider/apt.dart index a7677516..15d8803e 100644 --- a/lib/data/provider/apt.dart +++ b/lib/data/provider/apt.dart @@ -66,9 +66,8 @@ class AptProvider extends BusyProvider { } final result = await _update(); - try { - getUpgradeableList(result); - } catch (e) { + getUpgradeableList(result); + try {} catch (e) { error = '[Server Raw]:\n$result\n[App Error]:\n$e'; } finally { notifyListeners(); @@ -91,9 +90,11 @@ class AptProvider extends BusyProvider { // such as: [Could not chdir to home directory /home/test: No such file or directory, , WARNING: apt does not have a stable CLI interface. Use with caution in scripts., , Listing...] final idx = list.indexWhere((element) => element.contains('[upgradable from:')); - if (idx != -1) { - list = list.sublist(idx); + if (idx == -1) { + upgradeable = []; + return; } + list = list.sublist(idx); list.removeWhere((element) => element.isEmpty); } upgradeable = list.map((e) => UpgradePkgInfo(e, dist!)).toList(); diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 03042b21..1f250ece 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 146; + static const int build = 148; static const String engine = - "Flutter 3.0.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision fb57da5f94 (4 days ago) • 2022-05-19 15:50:29 -0700\nEngine • revision caaafc5604\nTools • Dart 2.17.1 • DevTools 2.12.2\n"; - static const String buildAt = "2022-05-24 13:44:07.002192"; + "Flutter 3.0.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision fb57da5f94 (5 days ago) • 2022-05-19 15:50:29 -0700\nEngine • revision caaafc5604\nTools • Dart 2.17.1 • DevTools 2.12.2\n"; + static const String buildAt = "2022-05-25 13:19:00.526108"; static const int modifications = 0; } diff --git a/lib/view/page/apt.dart b/lib/view/page/apt.dart index 601dff84..d95f10f5 100644 --- a/lib/view/page/apt.dart +++ b/lib/view/page/apt.dart @@ -73,9 +73,6 @@ class _AptManagePageState extends State // ignore: prefer_function_declarations_over_variables PwdRequestFunc onPwdRequest = (triedTimes, user) async { if (!mounted) return ''; - if (triedTimes == 1) { - return widget.spi.pwd; - } await showRoundDialog( context, triedTimes == 3 ? s.lastTry : (user ?? s.unknown), diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index 595d7319..35bed828 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -282,8 +282,14 @@ class _MyHomePageState extends State UrlText( text: s.aboutThanks, ), - const UrlText(text: rainSunMeGithub, replace: 'RainSunMe',), - const UrlText(text: fectureGithub, replace: 'fecture',) + const UrlText( + text: rainSunMeGithub, + replace: 'RainSunMe', + ), + const UrlText( + text: fectureGithub, + replace: 'fecture', + ) ], child: Text(s.license), ) diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 77b23e8e..ab74168b 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -420,14 +420,14 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -550,14 +550,14 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -574,14 +574,14 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 146; + CURRENT_PROJECT_VERSION = 148; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.0.146; + MARKETING_VERSION = 1.0.148; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0;