Merge pull request #866 from nextcloud/fix/neon/cache_init

Fix/neon/cache init

packages/neon/neon/lib/src/platform/platform.dart

@@ -17,6 +17,10 @@ abstract interface class NeonPlatform {
   ///
   /// Required to be called before accessing [NeonPlatform.instance].
   static Future<void> setup() async {
+    if (_platform != null) {
+      return;
+    }
+
     if (Platform.isAndroid) {
       _platform = const AndroidNeonPlatform();
     } else if (Platform.isLinux) {

packages/neon/neon/lib/src/utils/request_manager.dart

@@ -32,8 +32,10 @@ class RequestManager {
   static RequestManager get instance => _requestManager ??= RequestManager();
 
   Future<void> initCache() async {
-    _cache = Cache();
+    final cache = Cache();
-    await _cache!.init();
+    await cache.init();
+
+    _cache = cache;
   }
 
   Cache? _cache;
@@ -239,13 +241,24 @@ class Cache {
     );
   }
 
+  Database get _requireDatabase {
+    final database = _database;
+    if (database == null) {
+      throw StateError(
+        'Cache has not been set up yet. Please make sure Cache.init() has been called before and completed.',
+      );
+    }
+
+    return database;
+  }
+
   Future<bool> has(final String key) async =>
-      Sqflite.firstIntValue(await _database!.rawQuery('SELECT COUNT(*) FROM cache WHERE key = ?', [key])) == 1;
+      Sqflite.firstIntValue(await _requireDatabase.rawQuery('SELECT COUNT(*) FROM cache WHERE key = ?', [key])) == 1;
 
   Future<String?> get(final String key) async =>
-      (await _database!.rawQuery('SELECT value FROM cache WHERE key = ?', [key]))[0]['value'] as String?;
+      (await _requireDatabase.rawQuery('SELECT value FROM cache WHERE key = ?', [key]))[0]['value'] as String?;
 
-  Future<void> set(final String key, final String value) async => _database!.rawQuery(
+  Future<void> set(final String key, final String value) async => _requireDatabase.rawQuery(
         'INSERT INTO cache (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value',
         [key, value],
       );