diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 03867cb6..6504ce66 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/provider/private_key.dart b/lib/data/provider/private_key.dart index e3ea1b86..5dceeac5 100644 --- a/lib/data/provider/private_key.dart +++ b/lib/data/provider/private_key.dart @@ -6,7 +6,7 @@ class PrivateKeyProvider extends ChangeNotifier { List get pkis => _pkis; late List _pkis; - void loadData() { + void load() { _pkis = Stores.key.fetch(); } diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index 65273848..4d4e37dc 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -35,7 +35,7 @@ class ServerProvider extends ChangeNotifier { Timer? _timer; - Future loadLocalData() async { + Future load() async { // Issue #147 // Clear all servers because of restarting app will cause duplicate servers _servers.clear(); diff --git a/lib/data/provider/snippet.dart b/lib/data/provider/snippet.dart index bb320dfb..e1fac275 100644 --- a/lib/data/provider/snippet.dart +++ b/lib/data/provider/snippet.dart @@ -13,7 +13,7 @@ class SnippetProvider extends ChangeNotifier { final _tags = []; List get tags => _tags; - void loadData() { + void load() { _snippets = Stores.snippet.fetch(); final order = Stores.setting.snippetOrder.fetch(); if (order.isNotEmpty) { diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 27c7fa27..aea18e3a 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 = 572; + static const int build = 574; static const String engine = "3.13.5"; - static const String buildAt = "2023-09-23 11:12:55"; - static const int modifications = 2; + static const String buildAt = "2023-09-24 15:49:22"; + static const int modifications = 12; static const int script = 18; } diff --git a/lib/data/res/provider.dart b/lib/data/res/provider.dart index b25df2ce..7f6e060d 100644 --- a/lib/data/res/provider.dart +++ b/lib/data/res/provider.dart @@ -17,4 +17,10 @@ class Providers { static final server = locator(); static final sftp = locator(); static final snippet = locator(); + + static void reload() { + key.load(); + server.load(); + snippet.load(); + } } diff --git a/lib/main.dart b/lib/main.dart index 78cbf2d8..0c217e0f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -92,8 +92,8 @@ Future initApp() async { } void _setupProviders() { - Providers.snippet.loadData(); - Providers.key.loadData(); + Providers.snippet.load(); + Providers.key.load(); } Future _initHive() async { diff --git a/lib/view/page/backup.dart b/lib/view/page/backup.dart index 2be994bd..98c44ead 100644 --- a/lib/view/page/backup.dart +++ b/lib/view/page/backup.dart @@ -12,6 +12,7 @@ import 'package:toolbox/core/utils/rebuild.dart'; import 'package:toolbox/data/model/app/backup.dart'; import 'package:toolbox/data/res/logger.dart'; import 'package:toolbox/data/res/path.dart'; +import 'package:toolbox/data/res/provider.dart'; import 'package:toolbox/data/res/store.dart'; import 'package:toolbox/view/widget/round_rect_card.dart'; @@ -157,6 +158,7 @@ class BackupPage extends StatelessWidget { backup.restore(); context.pop(); RebuildNodes.app.rebuild(); + Providers.reload(); }, child: Text(l10n.ok), ), diff --git a/lib/view/page/full_screen.dart b/lib/view/page/full_screen.dart index 25366154..f3f33b31 100644 --- a/lib/view/page/full_screen.dart +++ b/lib/view/page/full_screen.dart @@ -368,7 +368,7 @@ class _FullScreenPageState extends State with AfterLayoutMixin { doUpdate(context); } await GetIt.I.allReady(); - await Providers.server.loadLocalData(); + await Providers.server.load(); await Providers.server.refreshData(); if (!Analysis.enabled) { await Analysis.init(); diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index df59f393..9d994af3 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -343,7 +343,7 @@ class _HomePageState extends State } updateHomeWidget(); await GetIt.I.allReady(); - await Providers.server.loadLocalData(); + await Providers.server.load(); await Providers.server.refreshData(); if (!Analysis.enabled) { Analysis.init(); diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index a7671700..ca1fe7ab 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -456,7 +456,7 @@ class _ServerPageState extends State @override Future afterFirstLayout(BuildContext context) async { await GetIt.I.allReady(); - await Providers.server.loadLocalData(); + await Providers.server.load(); Providers.server.startAutoRefresh(); } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index db576d78..e5b4ab34 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -476,9 +476,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -491,9 +491,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -506,9 +506,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 572; + CURRENT_PROJECT_VERSION = 574; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.572; + MARKETING_VERSION = 1.0.574; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;