From 703cc1109fd03b24ff2bc2f531e9ca8963b32001 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 28 Aug 2022 08:03:53 +0200
Subject: [PATCH] chore: Revert hive collections changes

---
 .../flutter_hive_collections_database.dart                      | 2 +-
 pubspec.lock                                                    | 2 +-
 pubspec.yaml                                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart
index 043e4f3b..f8d41dd6 100644
--- a/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart
+++ b/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart
@@ -62,7 +62,7 @@ class FlutterHiveCollectionsDatabase extends HiveCollectionsDatabase {
     }
 
     final db = FlutterHiveCollectionsDatabase(
-      'hive_${client.clientName.replaceAll(' ', '_').toLowerCase()}',
+      'hive_collections_${client.clientName.replaceAll(' ', '_').toLowerCase()}',
       await _findDatabasePath(client),
       key: hiverCipher,
     );
diff --git a/pubspec.lock b/pubspec.lock
index f063036a..2bf2fcf5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -839,7 +839,7 @@ packages:
       name: hive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.1"
   hive_flutter:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 95db366a..51c9ad50 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -52,7 +52,7 @@ dependencies:
   future_loading_dialog: ^0.2.3
   geolocator: ^7.6.2
   handy_window: ^0.1.6
-  hive: ^2.2.3
+  hive: 2.2.1 # Newer version will break migration from hive collections
   hive_flutter: ^1.1.0
   http: ^0.13.4
   image: ^3.1.1