Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Remember search query in mobile app when navigating to item and then back (#1752)

Leendert de Borst02d7c33e1a14
diff --git a/apps/mobile-app/app/(tabs)/items/index.tsx b/apps/mobile-app/app/(tabs)/items/index.tsx
index 9a46242d6..7feeeebb3 100644
--- a/apps/mobile-app/app/(tabs)/items/index.tsx
+++ b/apps/mobile-app/app/(tabs)/items/index.tsx
@@ -116,7 +116,9 @@ export default function ItemsScreen(): React.ReactNode {
const isAuthenticated = authContext.isLoggedIn;
const isDatabaseAvailable = dbContext.dbAvailable;
- // Handle deep link itemUrl parameter - populate search field
+ /*
+ * Handle deep link itemUrl parameter - populate search field.
+ */
useEffect(() => {
if (itemUrl) {
const decodedUrl = decodeURIComponent(itemUrl);
@@ -124,6 +126,34 @@ export default function ItemsScreen(): React.ReactNode {
}
}, [itemUrl]);
+ /*
+ * Save search query to local storage whenever it changes.
+ * This allows restoring it when navigating back from item details.
+ */
+ useEffect(() => {
+ LocalPreferencesService.setLastSearchQuery(searchQuery);
+ }, [searchQuery]);
+
+ /*
+ * Restore search query when screen gains focus (e.g., coming back from item details).
+ */
+ useEffect(() => {
+ const unsubscribeFocus = navigation.addListener('focus', async () => {
+ /*
+ * Only restore search query if we don't have a deep link.
+ * Deep links should take precedence.
+ */
+ if (!itemUrl) {
+ const savedQuery = await LocalPreferencesService.getLastSearchQuery();
+ if (savedQuery) {
+ setSearchQuery(savedQuery);
+ }
+ }
+ });
+
+ return unsubscribeFocus;
+ }, [navigation, itemUrl]);
+
// Load saved showFolderItems preference from LocalPreferencesService
useEffect(() => {
/**
diff --git a/apps/mobile-app/services/LocalPreferencesService.ts b/apps/mobile-app/services/LocalPreferencesService.ts
index 12bf2cd87..33d5d3a46 100644
--- a/apps/mobile-app/services/LocalPreferencesService.ts
+++ b/apps/mobile-app/services/LocalPreferencesService.ts
@@ -13,6 +13,7 @@ const KEYS = {
// UI preferences
SHOW_FOLDERS: 'items-show-folders',
+ LAST_SEARCH_QUERY: 'items-last-search-query',
} as const;
/**
@@ -72,6 +73,26 @@ export const LocalPreferencesService = {
await AsyncStorage.setItem(KEYS.SHOW_FOLDERS, showFolders.toString());
},
+ /**
+ * Get the last search query from the items list.
+ * @returns The last search query, or empty string if not set.
+ */
+ async getLastSearchQuery(): Promise<string> {
+ const value = await AsyncStorage.getItem(KEYS.LAST_SEARCH_QUERY);
+ return value || '';
+ },
+
+ /**
+ * Set the last search query from the items list.
+ */
+ async setLastSearchQuery(query: string): Promise<void> {
+ if (query) {
+ await AsyncStorage.setItem(KEYS.LAST_SEARCH_QUERY, query);
+ } else {
+ await AsyncStorage.removeItem(KEYS.LAST_SEARCH_QUERY);
+ }
+ },
+
/**
* Clear all UI preferences. Can be called on logout.
* Note: This only clears UI preferences, not security-related settings.