0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a model to encapsulate public keys

Browse source
This commit is contained in:
Vishnu Mohandas 2020-10-19 03:09:55 +05:30
parent ff6cc91f0d
commit 948814ea9c
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/db/public_keys_db.dart
View file

@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:io';
import 'package:path/path.dart';
import 'package:photos/models/public_key.dart';
import 'package:sqflite/sqflite.dart';
import 'package:path_provider/path_provider.dart';
@ -43,13 +44,13 @@ class PublicKeysDB {
''');
}
Future<int> setKey(String email, String publicKey) async {
Future<int> setKey(PublicKey key) async {
final db = await instance.database;
return db.insert(table, _getRow(email, publicKey),
return db.insert(table, _getRow(key),
conflictAlgorithm: ConflictAlgorithm.replace);
}
Future<Map<String, String>> searchByEmail(String email) async {
Future<List<PublicKey>> searchByEmail(String email) async {
final db = await instance.database;
return _convertRows(await db.query(
table,
@ -58,17 +59,17 @@ class PublicKeysDB {
));
}
Map<String, dynamic> _getRow(String email, String publicKey) {
Map<String, dynamic> _getRow(PublicKey key) {
var row = new Map<String, dynamic>();
row[columnEmail] = email;
row[columnPublicKey] = publicKey;
row[columnEmail] = key.email;
row[columnPublicKey] = key.publicKey;
return row;
}
Map<String, String> _convertRows(List<Map<String, dynamic>> rows) {
final keys = Map<String, String>();
List<PublicKey> _convertRows(List<Map<String, dynamic>> rows) {
final keys = List<PublicKey>();
for (final row in rows) {
keys[row[columnEmail]] = row[columnPublicKey];
keys.add(PublicKey(row[columnEmail], row[columnPublicKey]));
}
return keys;
}

6
lib/models/public_key.dart Normal file
View file

@ -0,0 +1,6 @@
class PublicKey {
final String email;
final String publicKey;
PublicKey(this.email, this.publicKey);
}

5
lib/services/user_service.dart
View file

@ -8,6 +8,7 @@ import 'package:photos/db/public_keys_db.dart';
import 'package:photos/events/user_authenticated_event.dart';
import 'package:photos/models/key_attributes.dart';
import 'package:photos/models/public_key.dart';
import 'package:photos/ui/ott_verification_page.dart';
import 'package:photos/ui/passphrase_entry_page.dart';
import 'package:photos/ui/passphrase_reentry_page.dart';
@ -59,8 +60,8 @@ class UserService {
},
),
);
final publicKey = response.data["publicKey"];
await PublicKeysDB.instance.setKey(email, publicKey);
final publicKey = response.data["publicKey"];
await PublicKeysDB.instance.setKey(PublicKey(email, publicKey));
return publicKey;
} on DioError catch (e) {
_logger.info(e);