Skip to content

Commit 34698f2

Browse files
Remove configs from backup
1 parent be22a65 commit 34698f2

File tree

2 files changed

+10
-33
lines changed

2 files changed

+10
-33
lines changed

lib/TokenUtils/Backup/backup.dart

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,36 @@
11
import 'dart:convert';
22

3-
import 'package:cloudotp/Models/cloud_service_config.dart';
4-
5-
import '../../Models/token_category.dart';
6-
import '../../Models/config.dart';
73
import '../../Models/opt_token.dart';
4+
import '../../Models/token_category.dart';
85

96
class Backup {
107
final List<OtpToken> tokens;
118
final List<TokenCategory> categories;
12-
final Config config;
13-
final List<CloudServiceConfig> cloudServiceConfigs;
149

1510
String get json => jsonEncode(toJson());
1611

1712
Backup({
1813
required this.tokens,
1914
required this.categories,
20-
required this.cloudServiceConfigs,
21-
required this.config,
2215
});
2316

2417
Map<String, dynamic> toJson() {
2518
return {
2619
'tokens': tokens.map((e) => e.toJson()).toList(),
2720
'categories': categories.map((e) => e.toJson()).toList(),
28-
'cloudServiceConfigs':
29-
cloudServiceConfigs.map((e) => e.toJson()).toList(),
30-
'config': config.toJson(),
3121
};
3222
}
3323

3424
static Backup fromJson(Map<String, dynamic> json) {
3525
return Backup(
36-
tokens: json['tokens'] != null
37-
? (json['tokens'] as List).map((e) => OtpToken.fromJson(e)).toList()
38-
: [],
39-
categories: json['categories'] != null
40-
? (json['categories'] as List)
41-
.map((e) => TokenCategory.fromJson(e))
42-
.toList()
43-
: [],
44-
cloudServiceConfigs: json['cloudServiceConfigs'] != null
45-
? (json['cloudServiceConfigs'] as List)
46-
.map((e) => CloudServiceConfig.fromJson(e))
47-
.toList()
48-
: [],
49-
config: json['config'] != null
50-
? Config.fromJson(json['config'])
51-
: Config());
26+
tokens: json['tokens'] != null
27+
? (json['tokens'] as List).map((e) => OtpToken.fromJson(e)).toList()
28+
: [],
29+
categories: json['categories'] != null
30+
? (json['categories'] as List)
31+
.map((e) => TokenCategory.fromJson(e))
32+
.toList()
33+
: [],
34+
);
5235
}
53-
5436
}

lib/TokenUtils/export_token_util.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,10 @@ class ExportTokenUtil {
100100
String tmpPassword = password ?? await ConfigDao.getBackupPassword();
101101
List<OtpToken> tokens = await TokenDao.listTokens();
102102
List<TokenCategory> categories = await CategoryDao.listCategories();
103-
Config config = await ConfigDao.getConfig();
104-
List<CloudServiceConfig> cloudServiceConfigs =
105-
await CloudServiceConfigDao.getConfigs();
106103
return await compute((_) async {
107104
Backup backup = Backup(
108105
tokens: tokens,
109106
categories: categories,
110-
config: config,
111-
cloudServiceConfigs: cloudServiceConfigs,
112107
);
113108
BackupEncryptionV1 backupEncryption = BackupEncryptionV1();
114109
Uint8List encryptedData =

0 commit comments

Comments
 (0)