fix: change to mmkv and fix downloads with VLC

utils/atoms/filters.ts

@@ -1,6 +1,6 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import { atom } from "jotai";
-import { atomWithStorage, createJSONStorage } from "jotai/utils";
+import { atomWithStorage } from "jotai/utils";
+import { storage } from "../mmkv";
 
 export enum SortByOption {
   Default = "Default",
@@ -68,9 +68,6 @@ export const sortOrderAtom = atom<SortOrderOption[]>([
   SortOrderOption.Ascending,
 ]);
 
-/**
- * Sort preferences with persistence
- */
 export interface SortPreference {
   [libraryId: string]: SortByOption;
 }
@@ -86,15 +83,15 @@ export const sortByPreferenceAtom = atomWithStorage<SortPreference>(
   "sortByPreference",
   defaultSortPreference,
   {
-    getItem: async (key) => {
-      const value = await AsyncStorage.getItem(key);
+    getItem: (key) => {
+      const value = storage.getString(key);
       return value ? JSON.parse(value) : null;
     },
-    setItem: async (key, value) => {
-      await AsyncStorage.setItem(key, JSON.stringify(value));
+    setItem: (key, value) => {
+      storage.set(key, JSON.stringify(value));
     },
-    removeItem: async (key) => {
-      await AsyncStorage.removeItem(key);
+    removeItem: (key) => {
+      storage.delete(key);
     },
   }
 );
@@ -103,20 +100,19 @@ export const sortOrderPreferenceAtom = atomWithStorage<SortOrderPreference>(
   "sortOrderPreference",
   defaultSortOrderPreference,
   {
-    getItem: async (key) => {
-      const value = await AsyncStorage.getItem(key);
+    getItem: (key) => {
+      const value = storage.getString(key);
       return value ? JSON.parse(value) : null;
     },
-    setItem: async (key, value) => {
-      await AsyncStorage.setItem(key, JSON.stringify(value));
+    setItem: (key, value) => {
+      storage.set(key, JSON.stringify(value));
     },
-    removeItem: async (key) => {
-      await AsyncStorage.removeItem(key);
+    removeItem: (key) => {
+      storage.delete(key);
     },
   }
 );
 
-// Helper functions to get and set sort preferences
 export const getSortByPreference = (
   libraryId: string,
   preferences: SortPreference
@@ -130,4 +126,3 @@ export const getSortOrderPreference = (
 ) => {
   return preferences?.[libraryId] || null;
 };
-

utils/atoms/queue.ts

@@ -1,7 +1,5 @@
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import { atom, useAtom } from "jotai";
-import { atomWithStorage } from "jotai/utils";
 import { useEffect } from "react";
 
 export interface Job {

utils/atoms/settings.ts

@@ -1,7 +1,7 @@
 import { atom, useAtom } from "jotai";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useEffect } from "react";
 import * as ScreenOrientation from "expo-screen-orientation";
+import { storage } from "../mmkv";
 
 export type DownloadQuality = "original" | "high" | "low";
 
@@ -75,15 +75,8 @@ export type Settings = {
   downloadMethod: "optimized" | "remux";
   autoDownload: boolean;
 };
-/**
- *
- * The settings atom is a Jotai atom that stores the user's settings.
- * It is initialized with a default value of null, which indicates that the settings have not been loaded yet.
- * The settings are loaded from AsyncStorage when the atom is read for the first time.
- *
- */
 
-const loadSettings = async (): Promise<Settings> => {
+const loadSettings = (): Settings => {
   const defaultValues: Settings = {
     autoRotate: true,
     forceLandscapeInVideoPlayer: false,
@@ -113,7 +106,7 @@ const loadSettings = async (): Promise<Settings> => {
   };
 
   try {
-    const jsonValue = await AsyncStorage.getItem("settings");
+    const jsonValue = storage.getString("settings");
     const loadedValues: Partial<Settings> =
       jsonValue != null ? JSON.parse(jsonValue) : {};
 
@@ -124,30 +117,28 @@ const loadSettings = async (): Promise<Settings> => {
   }
 };
 
-// Utility function to save settings to AsyncStorage
-const saveSettings = async (settings: Settings) => {
+const saveSettings = (settings: Settings) => {
   const jsonValue = JSON.stringify(settings);
-  await AsyncStorage.setItem("settings", jsonValue);
+  storage.set("settings", jsonValue);
 };
 
-// Create an atom to store the settings in memory
 export const settingsAtom = atom<Settings | null>(null);
 
-// A hook to manage settings, loading them on initial mount and providing a way to update them
 export const useSettings = () => {
   const [settings, setSettings] = useAtom(settingsAtom);
 
   useEffect(() => {
     if (settings === null) {
-      loadSettings().then(setSettings);
+      const loadedSettings = loadSettings();
+      setSettings(loadedSettings);
     }
   }, [settings, setSettings]);
 
-  const updateSettings = async (update: Partial<Settings>) => {
+  const updateSettings = (update: Partial<Settings>) => {
     if (settings) {
       const newSettings = { ...settings, ...update };
       setSettings(newSettings);
-      await saveSettings(newSettings);
+      saveSettings(newSettings);
     }
   };
 

utils/device.ts

@@ -1,19 +1,19 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import uuid from "react-native-uuid";
+import { storage } from "./mmkv";
 
-export const getOrSetDeviceId = async () => {
-  let deviceId = await AsyncStorage.getItem("deviceId");
+export const getOrSetDeviceId = () => {
+  let deviceId = storage.getString("deviceId");
 
   if (!deviceId) {
     deviceId = uuid.v4() as string;
-    await AsyncStorage.setItem("deviceId", deviceId);
+    storage.set("deviceId", deviceId);
   }
 
   return deviceId;
 };
 
-export const getDeviceId = async () => {
-  let deviceId = await AsyncStorage.getItem("deviceId");
+export const getDeviceId = () => {
+  let deviceId = storage.getString("deviceId");
 
   return deviceId || null;
 };

utils/log.ts

@@ -1,5 +1,5 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import { atomWithStorage, createJSONStorage } from "jotai/utils";
+import { storage } from "./mmkv";
 
 type LogLevel = "INFO" | "WARN" | "ERROR";
 
@@ -10,14 +10,14 @@ interface LogEntry {
   data?: any;
 }
 
-const asyncStorage = createJSONStorage(() => AsyncStorage);
-const logsAtom = atomWithStorage("logs", [], asyncStorage);
+const mmkvStorage = createJSONStorage(() => ({
+  getItem: (key: string) => storage.getString(key) || null,
+  setItem: (key: string, value: string) => storage.set(key, value),
+  removeItem: (key: string) => storage.delete(key),
+}));
+const logsAtom = atomWithStorage("logs", [], mmkvStorage);
 
-export const writeToLog = async (
-  level: LogLevel,
-  message: string,
-  data?: any
-) => {
+export const writeToLog = (level: LogLevel, message: string, data?: any) => {
   const newEntry: LogEntry = {
     timestamp: new Date().toISOString(),
     level: level,
@@ -25,23 +25,23 @@ export const writeToLog = async (
     data: data,
   };
 
-  const currentLogs = await AsyncStorage.getItem("logs");
+  const currentLogs = storage.getString("logs");
   const logs: LogEntry[] = currentLogs ? JSON.parse(currentLogs) : [];
   logs.push(newEntry);
 
   const maxLogs = 100;
   const recentLogs = logs.slice(Math.max(logs.length - maxLogs, 0));
 
-  await AsyncStorage.setItem("logs", JSON.stringify(recentLogs));
+  storage.set("logs", JSON.stringify(recentLogs));
 };
 
-export const readFromLog = async (): Promise<LogEntry[]> => {
-  const logs = await AsyncStorage.getItem("logs");
+export const readFromLog = (): LogEntry[] => {
+  const logs = storage.getString("logs");
   return logs ? JSON.parse(logs) : [];
 };
 
-export const clearLogs = async () => {
-  await AsyncStorage.removeItem("logs");
+export const clearLogs = () => {
+  storage.delete("logs");
 };
 
 export default logsAtom;