From fcc172f73364fd21ec63dc6b9fd8e50f09ea9b7b Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnumohandas@gmail.com>
Date: Wed, 14 Oct 2020 01:12:39 +0530
Subject: [PATCH] Pull the util method to serialize and deserialize a
 collection type into the Collection class

---
 lib/db/collections_db.dart |  4 ++--
 lib/models/collection.dart | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/db/collections_db.dart b/lib/db/collections_db.dart
index b9cf8c632..3dbaa4f76 100644
--- a/lib/db/collections_db.dart
+++ b/lib/db/collections_db.dart
@@ -98,7 +98,7 @@ class CollectionsDB {
     row[columnEncryptedKey] = collection.encryptedKey;
     row[columnKeyDecryptionNonce] = collection.keyDecryptionNonce;
     row[columnName] = collection.name;
-    row[columnType] = typeToString(collection.type);
+    row[columnType] = Collection.typeToString(collection.type);
     row[columnEncryptedPath] = collection.encryptedPath;
     row[columnPathDecryptionNonce] = collection.pathDecryptionNonce;
     row[columnCreationTime] = collection.creationTime;
@@ -112,7 +112,7 @@ class CollectionsDB {
       row[columnEncryptedKey],
       row[columnKeyDecryptionNonce],
       row[columnName],
-      typeFromString(row[columnType]),
+      Collection.typeFromString(row[columnType]),
       row[columnEncryptedPath],
       row[columnPathDecryptionNonce],
       int.parse(row[columnCreationTime]),
diff --git a/lib/models/collection.dart b/lib/models/collection.dart
index f05384f40..e73e69b9f 100644
--- a/lib/models/collection.dart
+++ b/lib/models/collection.dart
@@ -116,26 +116,26 @@ class Collection {
         pathDecryptionNonce.hashCode ^
         creationTime.hashCode;
   }
-}
 
-CollectionType typeFromString(String type) {
-  switch (type) {
-    case "folder":
-      return CollectionType.folder;
-    case "favorites":
-      return CollectionType.favorites;
+  static CollectionType typeFromString(String type) {
+    switch (type) {
+      case "folder":
+        return CollectionType.folder;
+      case "favorites":
+        return CollectionType.favorites;
+    }
+    return CollectionType.album;
   }
-  return CollectionType.album;
-}
 
-String typeToString(CollectionType type) {
-  switch (type) {
-    case CollectionType.folder:
-      return "folder";
-    case CollectionType.favorites:
-      return "favorites";
-    default:
-      return "album";
+  static String typeToString(CollectionType type) {
+    switch (type) {
+      case CollectionType.folder:
+        return "folder";
+      case CollectionType.favorites:
+        return "favorites";
+      default:
+        return "album";
+    }
   }
 }