From c6e73d42723467419cbcd62add9d8af755913337 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 21 Oct 2022 13:30:23 +0700 Subject: [PATCH] TF-1098 Remove class not used --- .../data/local/config/database_config.dart | 5 - .../local/config/email_address_table.dart | 12 -- core/lib/data/local/database_client.dart | 109 ------------------ core/lib/data/local/database_manager.dart | 16 --- lib/main/bindings/local/local_bindings.dart | 6 - model/lib/email/email_address_cache.dart | 29 ----- .../extensions/email_address_extension.dart | 3 - model/lib/model.dart | 1 - 8 files changed, 181 deletions(-) delete mode 100644 core/lib/data/local/config/database_config.dart delete mode 100644 core/lib/data/local/config/email_address_table.dart delete mode 100644 core/lib/data/local/database_client.dart delete mode 100644 core/lib/data/local/database_manager.dart delete mode 100644 model/lib/email/email_address_cache.dart diff --git a/core/lib/data/local/config/database_config.dart b/core/lib/data/local/config/database_config.dart deleted file mode 100644 index 68e857ab2..000000000 --- a/core/lib/data/local/config/database_config.dart +++ /dev/null @@ -1,5 +0,0 @@ - -class DatabaseConfig { - static final String databaseName = 'TMailDatabase.db'; - static final int databaseVersion = 1; -} \ No newline at end of file diff --git a/core/lib/data/local/config/email_address_table.dart b/core/lib/data/local/config/email_address_table.dart deleted file mode 100644 index 84d13af90..000000000 --- a/core/lib/data/local/config/email_address_table.dart +++ /dev/null @@ -1,12 +0,0 @@ - -class EmailAddressTable { - static const String TABLE_NAME = 'EmailAddress'; - - static const String EMAIL = 'email'; - static const String NAME = 'name'; - - static const String CREATE = '''CREATE TABLE IF NOT EXISTS $TABLE_NAME ( - $EMAIL TEXT PRIMARY KEY, - $NAME TEXT - )'''; -} \ No newline at end of file diff --git a/core/lib/data/local/database_client.dart b/core/lib/data/local/database_client.dart deleted file mode 100644 index d640a9470..000000000 --- a/core/lib/data/local/database_client.dart +++ /dev/null @@ -1,109 +0,0 @@ -import 'dart:io'; - -import 'package:core/data/local/config/database_config.dart'; -import 'package:core/data/local/config/email_address_table.dart'; -import 'package:path/path.dart'; -import 'package:sqflite/sqflite.dart'; - -class DatabaseClient { - - Database? _database; - Batch? _batch; - - Future get database async { - return _database ?? await _initDatabase(); - } - - Future get batch async { - return _batch ?? (await database).batch(); - } - - Future _initDatabase() async { - final databasePath = await getDatabasesPath(); - final path = join(databasePath, DatabaseConfig.databaseName); - return await openDatabase( - path, - version: DatabaseConfig.databaseVersion, - onOpen: (db) {}, - onCreate: (db, version) async { - final batch = db.batch(); - batch.execute(EmailAddressTable.CREATE); - await batch.commit(); - }, - onUpgrade: (db, oldVersion, newVersion) async {}); - } - - Future closeDatabase() async { - final db = await database; - _database = null; - await db.close(); - } - - Future insertData(String tableName, Map mapObject) async { - final db = await database; - return await db.insert(tableName, mapObject); - } - - Future deleteData(String tableName, String key, String value) async { - final db = await database; - return await db.delete( - tableName, - where: '$key = ?', - whereArgs: [value]); - } - - Future updateData(String tableName, String key, String value, Map mapObject) async { - final db = await database; - return await db.update( - tableName, - mapObject, - where: '$key = ?', - whereArgs: [value]); - } - - Future>> getData(String tableName, String key, String value) async { - final db = await database; - return await db.query( - tableName, - where: '$key = ?', - whereArgs: [value]); - } - - Future>> getListData(String tableName, {int? limit, String? orderBy}) async { - final db = await database; - return await db.query(tableName, limit: limit, orderBy: orderBy); - } - - Future deleteLocalFile(String localPath) async { - final fileSaved = File(localPath); - final fileExist = await fileSaved.exists(); - if (fileExist) { - await fileSaved.delete(); - } - } - - Future>> getListDataWithCondition(String tableName, String condition, List values, {int? limit, String? orderBy}) async { - final db = await database; - return await db.query( - tableName, - where: condition, - whereArgs: values, - limit: limit, - orderBy: orderBy); - } - - Future>> getDataBySql(String sql) async { - final db = await database; - return await db.rawQuery(sql); - } - - Future> insertMultipleData(String tableName, List?> mapObjects) async { - final batchInsert = await batch; - mapObjects.forEach((element) { - if (element != null) { - batchInsert.insert(tableName, element); - } - }); - return await batchInsert.commit(noResult: false, continueOnError: true); - } -} \ No newline at end of file diff --git a/core/lib/data/local/database_manager.dart b/core/lib/data/local/database_manager.dart deleted file mode 100644 index 1c2e6c2f7..000000000 --- a/core/lib/data/local/database_manager.dart +++ /dev/null @@ -1,16 +0,0 @@ - -abstract class DatabaseManager { - Future insertData(T newObject); - - Future insertMultipleData(List listObject); - - Future deleteData(String key); - - Future updateData(T newObject); - - Future getData(String key); - - Future> getListData({String? word, int? limit, String? orderBy}); - - Future> getListDataWithCondition(String condition, {String? word, int? limit, String? orderBy}); -} \ No newline at end of file diff --git a/lib/main/bindings/local/local_bindings.dart b/lib/main/bindings/local/local_bindings.dart index 72d8ac62c..6d262007f 100644 --- a/lib/main/bindings/local/local_bindings.dart +++ b/lib/main/bindings/local/local_bindings.dart @@ -1,5 +1,4 @@ -import 'package:core/core.dart'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:tmail_ui_user/features/caching/account_cache_client.dart'; @@ -27,14 +26,9 @@ class LocalBindings extends Bindings { @override void dependencies() { - _bindingDatabase(); _bindingCaching(); } - void _bindingDatabase() { - Get.put(DatabaseClient()); - } - void _bindingCaching() { Get.put(MailboxCacheClient()); Get.put(StateCacheClient()); diff --git a/model/lib/email/email_address_cache.dart b/model/lib/email/email_address_cache.dart deleted file mode 100644 index a0c3ee265..000000000 --- a/model/lib/email/email_address_cache.dart +++ /dev/null @@ -1,29 +0,0 @@ - -import 'package:core/data/local/config/email_address_table.dart'; -import 'package:equatable/equatable.dart'; -import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; -import 'package:json_annotation/json_annotation.dart'; - -part 'email_address_cache.g.dart'; - -@JsonSerializable() -class EmailAddressCache with EquatableMixin { - - @JsonKey(name: EmailAddressTable.NAME) - final String name; - @JsonKey(name: EmailAddressTable.EMAIL) - final String email; - - EmailAddressCache(this.name, this.email); - - factory EmailAddressCache.fromJson(Map json) => _$EmailAddressCacheFromJson(json); - - Map toJson() => _$EmailAddressCacheToJson(this); - - @override - List get props => [name, email]; -} - -extension EmailAddressCacheExtension on EmailAddressCache { - EmailAddress toEmailAddress() => EmailAddress(name, email); -} \ No newline at end of file diff --git a/model/lib/extensions/email_address_extension.dart b/model/lib/extensions/email_address_extension.dart index bb1cde3b1..b81104223 100644 --- a/model/lib/extensions/email_address_extension.dart +++ b/model/lib/extensions/email_address_extension.dart @@ -1,7 +1,6 @@ import 'dart:ui'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; -import 'package:model/email/email_address_cache.dart'; import 'package:core/core.dart'; import 'package:collection/collection.dart'; @@ -32,8 +31,6 @@ extension EmailAddressExtension on EmailAddress { String get displayName => name ?? ''; - EmailAddressCache toEmailAddressCache() => EmailAddressCache(displayName, emailAddress); - List get avatarColors { return AppColor.mapGradientColor[_generateIndex()]; } diff --git a/model/lib/model.dart b/model/lib/model.dart index 996753a92..ba0e84a59 100644 --- a/model/lib/model.dart +++ b/model/lib/model.dart @@ -16,7 +16,6 @@ export 'contact/device_contact.dart'; export 'download/download_task_id.dart'; export 'email/attachment.dart'; export 'email/email_action_type.dart'; -export 'email/email_address_cache.dart'; export 'email/email_content.dart'; export 'email/email_content_type.dart'; export 'email/email_property.dart';