From 1f4c2a16aa52358398db3936c6918b9a6fa1bfd5 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Sun, 6 Sep 2020 15:39:02 +0200 Subject: [PATCH] chore: Update SDK, re-enable transactions on mobile --- lib/utils/database/mobile.dart | 14 +-------- pubspec.lock | 56 +++++++++++++++++----------------- pubspec.yaml | 2 +- 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/lib/utils/database/mobile.dart b/lib/utils/database/mobile.dart index 7995de7..8108659 100644 --- a/lib/utils/database/mobile.dart +++ b/lib/utils/database/mobile.dart @@ -8,18 +8,6 @@ import 'package:moor/moor.dart'; import 'package:moor/isolate.dart'; import 'cipher_db.dart' as cipher; -class DatabaseNoTransactions extends Database { - DatabaseNoTransactions.connect(DatabaseConnection connection) - : super.connect(connection); - - // moor transactions are sometimes rather weird and freeze. Until there is a - // proper fix in moor we override that there aren't actually using transactions - @override - Future transaction(Future Function() action) async { - return action(); - } -} - bool _inited = false; // see https://moor.simonbinder.eu/docs/advanced-features/isolates/ @@ -69,7 +57,7 @@ Future constructDb( receivePort.sendPort, targetPath, password, logStatements), ); final isolate = (await receivePort.first as MoorIsolate); - return DatabaseNoTransactions.connect(await isolate.connect()); + return Database.connect(await isolate.connect()); } Future getLocalstorage(String key) async { diff --git a/pubspec.lock b/pubspec.lock index 54674c8..8b36763 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -49,7 +49,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.5.0-nullsafety" base58check: dependency: transitive description: @@ -63,7 +63,7 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety" bot_toast: dependency: "direct main" description: @@ -91,14 +91,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0-nullsafety.2" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0-nullsafety" cli_util: dependency: transitive description: @@ -112,14 +112,14 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0-nullsafety" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0-nullsafety.2" convert: dependency: transitive description: @@ -175,13 +175,13 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.0-nullsafety" famedlysdk: dependency: "direct main" description: path: "." - ref: "09ffa0940484862139c3fe431d4c3ef3392f2232" - resolved-ref: "09ffa0940484862139c3fe431d4c3ef3392f2232" + ref: "5863c8e168d796bcda3556409c46e27b71986862" + resolved-ref: "5863c8e168d796bcda3556409c46e27b71986862" url: "https://gitlab.com/famedly/famedlysdk.git" source: git version: "0.0.1" @@ -425,7 +425,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.2" + version: "0.6.3-nullsafety" link_text: dependency: "direct main" description: @@ -460,7 +460,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10-nullsafety" matrix_file_e2ee: dependency: transitive description: @@ -481,7 +481,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0-nullsafety.2" mime: dependency: transitive description: @@ -558,7 +558,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety" path_drawing: dependency: transitive description: @@ -607,7 +607,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.10.0-nullsafety" petitparser: dependency: transitive description: @@ -656,7 +656,7 @@ packages: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.5.0-nullsafety" process: dependency: transitive description: @@ -731,21 +731,21 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.9" + version: "0.10.10-nullsafety" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety" sqflite: dependency: "direct main" description: @@ -773,21 +773,21 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0-nullsafety" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety" synchronized: dependency: transitive description: @@ -801,35 +801,35 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety" test: dependency: transitive description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.15.2" + version: "1.16.0-nullsafety.2" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.2.19-nullsafety" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.10" + version: "0.3.12-nullsafety.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0-nullsafety.2" universal_html: dependency: "direct main" description: @@ -892,7 +892,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.2" vm_service: dependency: transitive description: @@ -957,5 +957,5 @@ packages: source: hosted version: "0.1.2" sdks: - dart: ">=2.9.0-14.0.dev <3.0.0" + dart: ">=2.10.0-0.0.dev <2.10.0" flutter: ">=1.18.0-6.0.pre <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 122df3c..82097db 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,7 +27,7 @@ dependencies: famedlysdk: git: url: https://gitlab.com/famedly/famedlysdk.git - ref: 09ffa0940484862139c3fe431d4c3ef3392f2232 + ref: 5863c8e168d796bcda3556409c46e27b71986862 localstorage: ^3.0.1+4 bubble: ^1.1.9+1