From ba7862f608c5c47d6d3fa85dac112f602fcf77d4 Mon Sep 17 00:00:00 2001
From: Jannis Baum <jannis.baum@gmail.com>
Date: Wed, 28 Sep 2022 12:36:41 +0200
Subject: [PATCH] fix(#445): reenable flutter_secure_storage

---
 app/lib/common/utilities/hive_utils.dart | 28 +++++++++++++-----------
 app/pubspec.yaml                         |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/lib/common/utilities/hive_utils.dart b/app/lib/common/utilities/hive_utils.dart
index fbb3433fc..9abc3a5f8 100644
--- a/app/lib/common/utilities/hive_utils.dart
+++ b/app/lib/common/utilities/hive_utils.dart
@@ -1,17 +1,19 @@
-// import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'dart:convert';
+
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:hive/hive.dart';
 
 Future<List<int>> retrieveExistingOrGenerateKey() async {
-  return List.filled(32, 0);
-  // const secureStorage = FlutterSecureStorage();
+  const secureStorage = FlutterSecureStorage();
   // if key not exists return null
-  // final encryprionKey = await secureStorage.read(key: 'key');
-  // if (encryprionKey == null) {
-  //   final key = Hive.generateSecureKey();
-  //   await secureStorage.write(
-  //     key: 'key',
-  //     value: base64UrlEncode(key),
-  //   );
-  // }
-  // final key = Hive.generateSecureKey();// await secureStorage.read(key: 'key');
-  // return key; // base64Url.decode(key);
+  final encryprionKey = await secureStorage.read(key: 'key');
+  if (encryprionKey == null) {
+    final key = Hive.generateSecureKey();
+    await secureStorage.write(
+      key: 'key',
+      value: base64UrlEncode(key),
+    );
+  }
+  final key = await secureStorage.read(key: 'key');
+  return base64Url.decode(key!);
 }
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 3745dba47..10a429803 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter_hooks: ^0.18.5+1
   flutter_localizations:
     sdk: flutter
-#  flutter_secure_storage: ^5.0.2
+  flutter_secure_storage: ^5.0.2
   flutter_share: ^2.0.0
   flutter_sliding_up_panel: ^2.0.1
   flutter_svg: ^1.1.1