[PB-6089,PB-6090] feature/Initial gallery scan

assets/lang/strings.ts

@@ -182,6 +182,7 @@ const translations = {
           storageFull: 'Storage is full',
           backupCompleted: 'Backup completed',
           gettingPhotos: 'Getting photos from the cloud',
+          scanningGallery: 'Scanning gallery',
         },
         photosLocked: {
           title: 'Photos is locked',
@@ -1100,6 +1101,7 @@ const translations = {
           storageFull: 'Almacenamiento lleno',
           backupCompleted: 'Backup completado',
           gettingPhotos: 'Obteniendo fotos de la nube',
+          scanningGallery: 'Escaneando galería',
         },
         photosLocked: {
           title: 'Photos está bloqueado',

src/navigation/TabExplorerNavigator.tsx

@@ -7,7 +7,7 @@ import { AppState, AppStateStatus, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import SecurityModal from 'src/components/modals/SecurityModal';
 import { authThunks } from 'src/store/slices/auth';
-import { checkPermissionRevocationThunk } from 'src/store/slices/photos';
+import { runBackupCycleThunk } from 'src/store/slices/photos';
 import { storageThunks } from 'src/store/slices/storage';
 import { useTailwind } from 'tailwind-rn';
 import BottomTabNavigator from '../components/BottomTabNavigator';
@@ -56,7 +56,7 @@ export default function TabExplorerNavigator(props: RootStackScreenProps<'TabExp
 
   async function handleOnAppStateChange(state: AppStateStatus) {
     if (state === 'active') {
-      dispatch(checkPermissionRevocationThunk());
+      dispatch(runBackupCycleThunk());
       try {
         await dispatch(storageThunks.loadLimitThunk()).unwrap();
       } catch {

src/screens/HomeScreen/useDiscoverPhotosSheet.spec.tsx

@@ -26,7 +26,7 @@ const makeWrapper = (photosState?: Partial<PhotosState>) => {
   const store = configureStore({
     reducer: { photos: photosReducer },
     preloadedState: {
-      photos: { enabled: false, networkCondition: 'wifi-only', permissionStatus: 'undetermined', ...photosState },
+      photos: { enabled: false, networkCondition: 'wifi-only', permissionStatus: 'undetermined', syncStatus: 'idle', pendingCount: 0, totalScannedCount: 0, deviceId: null, ...photosState },
     },
   });
   return ({ children }: { children: React.ReactNode }) => <Provider store={store}>{children}</Provider>;

src/screens/PhotosScreen/components/GroupHeader/GroupHeaderStatus.tsx

@@ -1,9 +1,20 @@
-import { CloudArrowDownIcon, CheckCircleIcon, PauseCircleIcon, PlayCircleIcon, WarningCircleIcon } from 'phosphor-react-native';
+import {
+  CheckCircleIcon,
+  CloudArrowDownIcon,
+  DeviceMobileIcon,
+  PauseCircleIcon,
+  PlayCircleIcon,
+  WarningCircleIcon,
+} from 'phosphor-react-native';
 import { ActivityIndicator } from 'react-native';
 import AppText from 'src/components/AppText';
 import { useTailwind } from 'tailwind-rn';
 import strings from '../../../../../assets/lang/strings';
 
+interface ColorProps {
+  color: string;
+}
+
 interface CountProps {
   count: number;
   color: string;
@@ -18,11 +29,20 @@ export const GroupHeaderCount = ({ count, color }: CountProps): JSX.Element => {
   );
 };
 
-interface FetchingProps {
-  color: string;
-}
+export const GroupHeaderScanning = ({ color }: ColorProps): JSX.Element => {
+  const tailwind = useTailwind();
+  return (
+    <>
+      <ActivityIndicator size="small" color={color} />
+      <AppText medium style={[tailwind('text-base'), { color }]}>
+        {strings.screens.photos.groupHeader.scanningGallery}
+      </AppText>
+      <DeviceMobileIcon size={24} color={color} weight="regular" />
+    </>
+  );
+};
 
-export const GroupHeaderFetching = ({ color }: FetchingProps): JSX.Element => {
+export const GroupHeaderFetching = ({ color }: ColorProps): JSX.Element => {
   const tailwind = useTailwind();
   return (
     <>
@@ -100,11 +120,7 @@ export const GroupHeaderPausedStorageFull = ({ dangerColor }: PausedStorageFullP
   );
 };
 
-interface CompletedProps {
-  color: string;
-}
-
-export const GroupHeaderCompleted = ({ color }: CompletedProps): JSX.Element => {
+export const GroupHeaderCompleted = ({ color }: ColorProps): JSX.Element => {
   const tailwind = useTailwind();
   return (
     <>

src/screens/PhotosScreen/components/GroupHeader/PhotosGroupHeader.tsx

@@ -10,11 +10,13 @@ import {
   GroupHeaderFetching,
   GroupHeaderPaused,
   GroupHeaderPausedStorageFull,
+  GroupHeaderScanning,
   GroupHeaderUploading,
 } from './GroupHeaderStatus';
 
 export type GroupSyncStatus =
   | { type: 'count'; count: number }
+  | { type: 'scanning' }
   | { type: 'fetching' }
   | { type: 'uploading'; count?: number; backupProgress?: number }
   | { type: 'paused'; count: number }
@@ -74,6 +76,7 @@ const PhotosGroupHeader = memo(
 
           <View style={[tailwind('flex-row items-center overflow-hidden'), { maxWidth: 226, gap: 8 }]}>
             {syncStatus.type === 'count' && <GroupHeaderCount count={syncStatus.count} color={statusColor} />}
+            {syncStatus.type === 'scanning' && <GroupHeaderScanning color={statusColor} />}
             {syncStatus.type === 'fetching' && <GroupHeaderFetching color={statusColor} />}
             {syncStatus.type === 'uploading' && (
               <GroupHeaderUploading

src/screens/PhotosScreen/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { View } from 'react-native';
 import AppScreen from 'src/components/AppScreen';
 import { useAppDispatch, useAppSelector } from 'src/store/hooks';
-import { photosActions } from 'src/store/slices/photos';
+import { photosActions, PhotoSyncStatus } from 'src/store/slices/photos';
 import { useTailwind } from 'tailwind-rn';
 import { photoPermissionService } from '../../services/photos/photoPermissionService';
 import BackupDisabledBanner from './components/BackupDisabledBanner';
@@ -15,6 +15,7 @@ import { MOCK_GROUP, MOCK_GROUP_BACKING_UP, MOCK_MULTI_DATE_GROUPS } from './moc
 import { PhotosAccessState, PhotosSyncStatus } from './types';
 
 type ScreenVariant =
+  | 'scanning'
   | 'fetching'
   | 'uploading'
   | 'paused'
@@ -38,6 +39,12 @@ const multiDateGroups = ({ first }: { first: GroupSyncStatus }): TimelineDateGro
 
 const getScreenConfig = (variant: ScreenVariant): ScreenConfig => {
   switch (variant) {
+    case 'scanning':
+      return {
+        syncStatus: { type: 'fetching' },
+        accessState: { type: 'available' },
+        groups: [{ group: MOCK_GROUP, syncStatus: { type: 'scanning' } }],
+      };
     case 'fetching':
       return {
         syncStatus: { type: 'fetching' },
@@ -89,10 +96,17 @@ const getScreenConfig = (variant: ScreenVariant): ScreenConfig => {
   }
 };
 
+const variantFromSyncStatus: Record<PhotoSyncStatus, ScreenVariant> = {
+  scanning: 'scanning',
+  idle: 'synced',
+  synced: 'synced',
+  error: 'synced',
+};
+
 const PhotosScreen = (): JSX.Element => {
   const tailwind = useTailwind();
   const dispatch = useAppDispatch();
-  const { enabled, permissionStatus } = useAppSelector((state) => state.photos);
+  const { enabled, permissionStatus, syncStatus } = useAppSelector((state) => state.photos);
   const [isSheetOpen, setIsSheetOpen] = useState(false);
 
   useEffect(() => {
@@ -106,7 +120,7 @@ const PhotosScreen = (): JSX.Element => {
     checkPermissionStatus();
   }, [permissionStatus]);
 
-  const variant: ScreenVariant = enabled ? 'synced' : 'backup-off';
+  const variant: ScreenVariant = enabled ? variantFromSyncStatus[syncStatus] : 'backup-off';
   const { accessState, groups } = useMemo(() => getScreenConfig(variant), [variant]);
 
   const handleEnableBackup = useCallback(() => setIsSheetOpen(true), []);

src/services/photos/PhotoAssetScanner.ts

@@ -0,0 +1,23 @@
+import * as MediaLibrary from 'expo-media-library';
+import { logger } from 'src/services/common';
+
+export const PhotoAssetScanner = {
+  async scanAll(): Promise<MediaLibrary.Asset[]> {
+    const results: MediaLibrary.Asset[] = [];
+    let cursor: string | undefined;
+
+    do {
+      const batch = await MediaLibrary.getAssetsAsync({
+        first: 200,
+        after: cursor,
+        mediaType: [MediaLibrary.MediaType.photo, MediaLibrary.MediaType.video],
+        sortBy: MediaLibrary.SortBy.modificationTime,
+      });
+      results.push(...batch.assets);
+      cursor = batch.hasNextPage ? batch.endCursor : undefined;
+    } while (cursor);
+
+    logger.info(`[PhotoAssetScanner] Scan complete — ${results.length} assets`);
+    return results;
+  },
+};

src/services/photos/PhotoDeduplicator.spec.ts

@@ -0,0 +1,47 @@
+import { PhotoDeduplicator } from './PhotoDeduplicator';
+import { photosLocalDB } from './database/photosLocalDB';
+
+jest.mock('./database/photosLocalDB', () => ({
+  photosLocalDB: { getSyncedIds: jest.fn() },
+}));
+
+const mockDB = photosLocalDB as jest.Mocked<typeof photosLocalDB>;
+
+const makeAssets = (ids: string[]) => ids.map((id) => ({ id })) as never;
+
+describe('PhotoDeduplicator', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('when DB is empty, then all assets are returned as pending', async () => {
+    mockDB.getSyncedIds.mockResolvedValueOnce(new Set());
+
+    const result = await PhotoDeduplicator.filter(makeAssets(['a', 'b', 'c']));
+
+    expect(result.map((a) => a.id)).toEqual(['a', 'b', 'c']);
+  });
+
+  test('when all assets are synced, then empty array is returned', async () => {
+    mockDB.getSyncedIds.mockResolvedValueOnce(new Set(['a', 'b', 'c']));
+
+    const result = await PhotoDeduplicator.filter(makeAssets(['a', 'b', 'c']));
+
+    expect(result).toHaveLength(0);
+  });
+
+  test('when some assets are synced, then only pending ones are returned', async () => {
+    mockDB.getSyncedIds.mockResolvedValueOnce(new Set(['b']));
+
+    const result = await PhotoDeduplicator.filter(makeAssets(['a', 'b', 'c']));
+
+    expect(result.map((a) => a.id)).toEqual(['a', 'c']);
+  });
+
+  test('when input is empty, then no DB call is made and empty array is returned', async () => {
+    const result = await PhotoDeduplicator.filter([]);
+
+    expect(mockDB.getSyncedIds).not.toHaveBeenCalled();
+    expect(result).toHaveLength(0);
+  });
+});

src/services/photos/PhotoDeduplicator.ts

@@ -0,0 +1,10 @@
+import * as MediaLibrary from 'expo-media-library';
+import { photosLocalDB } from './database/photosLocalDB';
+
+export const PhotoDeduplicator = {
+  async filter(assets: MediaLibrary.Asset[]): Promise<MediaLibrary.Asset[]> {
+    if (assets.length === 0) return [];
+    const syncedIds = await photosLocalDB.getSyncedIds(assets.map((asset) => asset.id));
+    return assets.filter((asset) => !syncedIds.has(asset.id));
+  },
+};

src/services/photos/PhotoDeviceId.ts

@@ -0,0 +1,14 @@
+import uuid from 'react-native-uuid';
+import asyncStorageService from 'src/services/AsyncStorageService';
+import { AsyncStorageKey } from 'src/types';
+
+export const PhotoDeviceId = {
+  async getOrCreate(): Promise<string> {
+    const existing = await asyncStorageService.getItem(AsyncStorageKey.PhotosDeviceId);
+    if (existing) return existing;
+
+    const id = uuid.v4() as string;
+    await asyncStorageService.saveItem(AsyncStorageKey.PhotosDeviceId, id);
+    return id;
+  },
+};