[ver1.3.1] bug fix.

Author: samu1oto

lib/models/backup_data_model.dart

@@ -7,6 +7,7 @@ class BackupData {
   final List<Credential> credentials;
   final List<ConnectionInfo> recentConnections;
   final AppSettings settings;
+  final List<ArchiveGroup> archiveGroups;
   final DateTime backupTime;
   final String version;
 
@@ -15,6 +16,7 @@ class BackupData {
     required this.credentials,
     required this.recentConnections,
     required this.settings,
+    required this.archiveGroups,
     required this.backupTime,
     required this.version,
   });
@@ -26,7 +28,8 @@ class BackupData {
       'connections': connections.map((c) => c.toJson()).toList(),
       'credentials': credentials.map((c) => c.toJson()).toList(),
       'recentConnections': recentConnections.map((c) => c.toJson()).toList(),
-      'settings': settings.toMap(), // 改为使用 toMap()
+      'settings': settings.toMap(),
+      'archiveGroups': archiveGroups.map((g) => g.toJson()).toList(),
     };
   }
 
@@ -43,7 +46,11 @@ class BackupData {
       recentConnections: (json['recentConnections'] as List)
           .map((c) => ConnectionInfo.fromJson(c))
           .toList(),
-      settings: AppSettings.fromMap(json['settings']), // 改为使用 fromMap()
+      settings: AppSettings.fromMap(json['settings']),
+      archiveGroups: (json['archiveGroups'] as List?)
+              ?.map((g) => ArchiveGroup.fromJson(g))
+              .toList() ??
+          [],
     );
   }
 }

lib/pages/manage_connections.dart

@@ -489,78 +489,78 @@ class _ManageConnectionsPageState extends State<ManageConnectionsPage> {
       margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
       child: Column(
         children: [
-          Container(
-            height: 56,
-            decoration: BoxDecoration(
-              color: Colors.transparent,
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: Row(
-                children: [
-                  Container(
-                    width: 40,
-                    height: 40,
-                    decoration: BoxDecoration(
-                      color: Colors.grey.withOpacity(0.1),
-                      shape: BoxShape.circle,
-                    ),
-                    child: IconButton(
-                      icon: Icon(
+          GestureDetector(
+            onTap: () => _toggleGroupExpanded(group),
+            child: Container(
+              height: 56,
+              decoration: BoxDecoration(
+                color: Colors.transparent,
+                borderRadius: BorderRadius.circular(12),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16),
+                child: Row(
+                  children: [
+                    Container(
+                      width: 40,
+                      height: 40,
+                      decoration: BoxDecoration(
+                        color: Colors.grey.withOpacity(0.1),
+                        shape: BoxShape.circle,
+                      ),
+                      child: Icon(
                         group.isExpanded
                             ? Icons.expand_less
                             : Icons.expand_more,
                         size: 20,
                         color: Theme.of(context).colorScheme.primary,
                       ),
-                      onPressed: () => _toggleGroupExpanded(group),
-                      padding: EdgeInsets.zero,
                     ),
-                  ),
-                  const SizedBox(width: 16),
-                  Expanded(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            group.name,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 16,
+                            ),
+                          ),
+                          Text(
+                            '${connections.length} 个连接',
+                            style: TextStyle(
+                              color: Colors.grey[600],
+                              fontSize: 12,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Row(
+                      mainAxisSize: MainAxisSize.min,
                       children: [
-                        Text(
-                          group.name,
-                          style: const TextStyle(
-                            fontWeight: FontWeight.bold,
-                            fontSize: 16,
+                        GestureDetector(
+                          onTap: () => _editArchiveGroup(group),
+                          child: Container(
+                            padding: const EdgeInsets.all(8),
+                            child: const Icon(Icons.edit, size: 20),
                           ),
                         ),
-                        Text(
-                          '${connections.length} 个连接',
-                          style: TextStyle(
-                            color: Colors.grey[600],
-                            fontSize: 12,
+                        const SizedBox(width: 8),
+                        GestureDetector(
+                          onTap: () => _deleteArchiveGroup(group),
+                          child: Container(
+                            padding: const EdgeInsets.all(8),
+                            child: const Icon(Icons.delete, size: 20),
                           ),
                         ),
                       ],
                     ),
-                  ),
-                  Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      IconButton(
-                        icon: const Icon(Icons.edit, size: 20),
-                        onPressed: () => _editArchiveGroup(group),
-                        padding: const EdgeInsets.all(4),
-                        constraints: const BoxConstraints(),
-                        tooltip: '编辑分组',
-                      ),
-                      IconButton(
-                        icon: const Icon(Icons.delete, size: 20),
-                        onPressed: () => _deleteArchiveGroup(group),
-                        padding: const EdgeInsets.all(4),
-                        constraints: const BoxConstraints(),
-                        tooltip: '删除分组',
-                      ),
-                    ],
-                  ),
-                ],
+                  ],
+                ),
               ),
             ),
           ),

lib/services/backup_service.dart

@@ -21,13 +21,11 @@ class BackupService {
   })  : _storageService = storageService,
         _settingsService = settingsService;
 
-  // 生成加密密钥
   encrypt_package.Key _generateKey(String password) {
     final hash = crypto.sha256.convert(utf8.encode(password));
     return encrypt_package.Key(Uint8List.fromList(hash.bytes));
   }
 
-  // 生成固定IV
   encrypt_package.IV _generateIV(String password) {
     final hash = crypto.sha1.convert(utf8.encode(password));
     return encrypt_package.IV(Uint8List.fromList(hash.bytes.sublist(0, 16)));
@@ -38,14 +36,16 @@ class BackupService {
     final credentials = await _storageService.getCredentials();
     final recentConnections = await _storageService.getRecentConnections();
     final settings = await _settingsService.getSettings();
+    final archiveGroups = await _storageService.getArchiveGroups();
 
     return BackupData(
       connections: connections,
       credentials: credentials,
       recentConnections: recentConnections,
       settings: settings,
+      archiveGroups: archiveGroups,
       backupTime: DateTime.now(),
-      version: '1.3.0',
+      version: '1.3.1',
     );
   }
 
@@ -261,18 +261,20 @@ class BackupService {
       await prefs.remove('saved_connections');
       await prefs.remove('saved_credentials');
       await prefs.remove('recent_connections');
+      await prefs.remove('archive_groups'); // 清空现有分组
+
+      for (final group in backupData.archiveGroups) {
+        await _storageService.saveArchiveGroup(group);
+      }
 
-      // 恢复连接
       for (final connection in backupData.connections) {
         await _storageService.saveConnection(connection);
       }
 
-      // 恢复凭证
       for (final credential in backupData.credentials) {
         await _storageService.saveCredential(credential);
       }
 
-      // 恢复最近连接
       final recentConnectionsJson = json.encode(
         backupData.recentConnections.map((c) => c.toJson()).toList(),
       );