Update .gitlab-ci.yml

Deleted assets/js/package/olm.js
This commit is contained in:
Christian Pauly 2020-05-20 07:10:13 +00:00
commit 52c3766321
7 changed files with 35 additions and 32 deletions

View file

@ -11,25 +11,29 @@ import './database/shared.dart';
import 'package:olm/olm.dart' as olm; // needed for migration
import 'package:random_string/random_string.dart';
Future<Database> getDatabase(Client client, Store store) async {
Future<Database> getDatabase(Client client) async {
if (_db != null) return _db;
final store = Store();
var password = await store.getItem('database-password');
var needMigration = false;
if (password == null || password.isEmpty) {
needMigration = true;
password = randomString(255);
}
final db = constructDb(
_db = constructDb(
logStatements: false,
filename: 'moor.sqlite',
password: password,
);
if (needMigration) {
await migrate(client.clientName, db, store);
await migrate(client.clientName, _db, store);
await store.setItem('database-password', password);
}
return db;
return _db;
}
Database _db;
Future<void> migrate(String clientName, Database db, Store store) async {
debugPrint('[Store] attempting old migration to moor...');
final oldKeys = await store.getAllItems();
@ -147,7 +151,13 @@ Future<void> migrate(String clientName, Database db, Store store) async {
devices = List<String>.from(json.decode(devicesString));
}
await db.storeOutboundGroupSession(
clientId, roomId, pickle, json.encode(devices));
clientId,
roomId,
pickle,
json.encode(devices),
DateTime.now(),
0,
);
}
// session_keys
final sessionKeysMatch =

View file

@ -151,8 +151,7 @@ abstract class FirebaseController {
final platform = kIsWeb ? 'Web' : Platform.operatingSystem;
final clientName = 'FluffyChat $platform';
client = Client(clientName, debug: false);
final store = Store();
client.database = await getDatabase(client, store);
client.database = await getDatabase(client);
client.connect();
await client.onLoginStateChanged.stream
.firstWhere((l) => l == LoginState.logged)