Merge branch 'main' into mob-1640-ios-share-extension-photos-are-copied-and-never-deleted

Author: jtklein

__mocks__/react-native-sensitive-info.ts

@@ -15,100 +15,77 @@ try {
   console.warn( "Could not import clearAuthCache, using no-op function", error );
 }
 
-class RNSInfo {
-  static stores = new Map();
+const stores = new Map();
 
-  static getServiceName( o = {} ) {
-    return o.sharedPreferencesName
-        || o.keychainService
+function getServiceName( o = {} ) {
+  return o.service
         || "default";
-  }
-
-  static validateString( s ) {
-    if ( typeof s !== "string" ) { throw new Error( "Invalid string:", s ); }
-  }
-
-  static clearAllStores = jest.fn( () => {
-    RNSInfo.stores.clear();
-    clearAuthCache();
-  } );
-
-  static clearAuthCache = jest.fn( () => {
-    clearAuthCache();
-  } );
-
-  static hasItem = jest.fn( async ( k, o ) => {
-    RNSInfo.validateString( k );
-
-    const serviceName = RNSInfo.getServiceName( o );
-    const service = RNSInfo.stores.get( serviceName );
-
-    if ( service ) { return service.has( k ); }
-    return false;
-  } );
-
-  static getItem = jest.fn( async ( k, o ) => {
-    RNSInfo.validateString( k );
+}
 
-    const serviceName = RNSInfo.getServiceName( o );
-    const service = RNSInfo.stores.get( serviceName );
+function validateString( s ) {
+  if ( typeof s !== "string" ) { throw new Error( "Invalid string:", s ); }
+}
 
-    if ( service ) { return service.get( k ) || null; }
-    return null;
-  } );
+const clearAuthCacheInternal = jest.fn( () => {
+  clearAuthCache();
+} );
 
-  static getAllItems = jest.fn( async o => {
-    const serviceName = RNSInfo.getServiceName( o );
-    const service = RNSInfo.stores.get( serviceName );
-    let mappedValues = [];
+const hasItem = jest.fn( async ( k, o ) => {
+  validateString( k );
 
-    if ( service?.size ) {
-      mappedValues = Array.from( service.entries() ).map(
-        ( [key, value] ) => ( { key, value, service: serviceName } ),
-      );
-    }
+  const serviceName = getServiceName( o );
+  const service = stores.get( serviceName );
 
-    return mappedValues;
-  } );
+  if ( service ) { return service.has( k ); }
+  return false;
+} );
 
-  static setItem = jest.fn( async ( k, v, o ) => {
-    RNSInfo.validateString( k );
-    RNSInfo.validateString( v );
+const getItem = jest.fn( async ( k, o ) => {
+  validateString( k );
 
-    const serviceName = RNSInfo.getServiceName( o );
-    let service = RNSInfo.stores.get( serviceName );
+  const serviceName = getServiceName( o );
+  const service = stores.get( serviceName );
 
-    if ( !service ) {
-      RNSInfo.stores.set( serviceName, new Map() );
-      service = RNSInfo.stores.get( serviceName );
-    }
+  if ( service ) { return { value: service.get( k ) || null }; }
+  return null;
+} );
 
-    service.set( k, v );
+const setItem = jest.fn( async ( k, v, o ) => {
+  validateString( k );
+  validateString( v );
 
-    clearAuthCache( );
+  const serviceName = getServiceName( o );
+  let service = stores.get( serviceName );
 
-    return null;
-  } );
+  if ( !service ) {
+    stores.set( serviceName, new Map() );
+    service = stores.get( serviceName );
+  }
 
-  static deleteItem = jest.fn( async ( k, o ) => {
-    RNSInfo.validateString( k );
+  service.set( k, v );
 
-    const serviceName = RNSInfo.getServiceName( o );
-    const service = RNSInfo.stores.get( serviceName );
+  clearAuthCacheInternal( );
 
-    if ( service ) { service.delete( k ); }
+  return null;
+} );
 
-    clearAuthCache( );
+const deleteItem = jest.fn( async ( k, o ) => {
+  validateString( k );
 
-    return null;
-  } );
+  const serviceName = getServiceName( o );
+  const service = stores.get( serviceName );
 
-  static hasEnrolledFingerprints = jest.fn( async () => true );
+  if ( service ) { service.delete( k ); }
 
-  static setInvalidatedByBiometricEnrollment = jest.fn();
+  clearAuthCacheInternal( );
 
-  // "Touch ID" | "Face ID" | false
-  static isSensorAvailable = jest.fn( async () => "Face ID" );
-}
+  return null;
+} );
 
-module.exports = RNSInfo;
+module.exports = {
+  deleteItem,
+  setItem,
+  getItem,
+  hasItem,
+  stores,
+};

ios/Podfile.lock

@@ -3919,17 +3919,19 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - SensitiveInfo (5.6.2):
+  - SensitiveInfo (6.1.5):
     - boost
     - DoubleConversion
     - fast_float
     - fmt
     - glog
     - hermes-engine
+    - NitroModules
     - RCT-Folly
     - RCT-Folly/Fabric
     - RCTRequired
     - RCTTypeSafety
+    - React-callinvoker
     - React-Core
     - React-debug
     - React-Fabric
@@ -4561,7 +4563,7 @@ SPEC CHECKSUMS:
   RNStoreReview: 8f6061907efb6474757db004ee8faac728fd2ada
   RNSVG: c7b9ee1f2352f984e79d6e3238645b81ced60516
   RNWorklets: a3184955a41f2be46898a937e2821469c8c8da42
-  SensitiveInfo: 09107b865dc23b4e9c0a61ec01385387bf3391a8
+  SensitiveInfo: ddf05bc892a97c058f167057582e6a2d05e99c54
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   VisionCamera: 0044a94f7489f19e19d5938e97dfc36f4784af3c
   VisionCameraPluginInatVision: 3b006a7a434ddfc23d789729b6d98e451f90c4e4

package-lock.json

@@ -138,7 +138,7 @@
     "react-native-restart": "^0.0.27",
     "react-native-safe-area-context": "^5.8.0",
     "react-native-screens": "4.15.4",
-    "react-native-sensitive-info": "^5.6.2",
+    "react-native-sensitive-info": "^6.1.5",
     "react-native-share-menu": "github:inaturalist/react-native-share-menu#892d4ffcad6e48607679c519be2448a3a878834a",
     "react-native-store-review": "^0.4.3",
     "react-native-svg": "^15.15.0",

package.json

@@ -63,17 +63,6 @@ export async function cleanupLogFiles() {
   await Promise.allSettled( olderLogs.map( ( { path } ) => unlink( path ) ) );
 }
 
-export async function deleteLegacyLogFile() {
-  try {
-    await unlink( legacyLogfilePath );
-  } catch ( deleteFileError ) {
-    if ( deleteFileError instanceof Error && deleteFileError.message.match( /no such file/ ) ) {
-      return;
-    }
-    throw deleteFileError;
-  }
-}
-
 const appVersion = getVersion();
 const buildVersion = getBuildNumber();
 const device = getSystemName();
@@ -129,10 +118,6 @@ async function emailLogFile( path: string ) {
   );
 }
 
-export async function getLegacyLogfileExists() {
-  return exists( legacyLogfilePath );
-}
-
 export const temporaryLogForSharingPath
 = `${TemporaryDirectoryPath}/${logFileNamePrefix}-recent.txt`;
 

src/components/Developer/logManagementHelpers.ts

@@ -19,8 +19,14 @@ import { Alert, Platform } from "react-native";
 import Config from "react-native-config";
 import * as RNLocalize from "react-native-localize";
 import RNRestart from "react-native-restart";
-import type { SensitiveInfoError } from "react-native-sensitive-info";
-import RNSInfo, { ErrorCode, isSensitiveInfoError } from "react-native-sensitive-info";
+import {
+  deleteItem,
+  ErrorCode,
+  getItem,
+  hasItem,
+  SensitiveInfoError,
+  setItem,
+} from "react-native-sensitive-info";
 import Realm, { UpdateMode } from "realm";
 import realmConfig from "realmModels/index";
 import changeLanguage from "sharedHelpers/changeLanguage";
@@ -58,7 +64,7 @@ interface AuthCache {
 }
 
 /**
- * Cache for isLoggedIn, to avoid making too many calls to RNSInfo.getItem
+ * Cache for isLoggedIn, to avoid making too many calls to getItem
  */
 const authCache: AuthCache = {
   isLoggedIn: null,
@@ -88,17 +94,16 @@ const clearAuthCache = ( ): void => {
 async function getSensitiveItem(
   key: string,
   options = {
-    keychainService: "app" as const,
+    service: "app" as const,
   },
 ) {
   let exists;
   try {
-    exists = await RNSInfo.hasItem( key, options );
+    exists = await hasItem( key, options );
   } catch ( e ) {
-    if ( isSensitiveInfoError( e ) ) {
-      const hasItemError = e as SensitiveInfoError;
+    if ( e instanceof SensitiveInfoError ) {
       localLogger.info(
-        `RNSInfo.hasItem error for ${key}: ${hasItemError.message}`,
+        `hasItem error for ${key}: ${e.message}`,
       );
     }
     throw e;
@@ -108,20 +113,18 @@ async function getSensitiveItem(
   }
 
   try {
-    return await RNSInfo.getItem( key, options );
+    const item = await getItem( key, options );
+    return item?.value ?? null;
   } catch ( e ) {
-    if ( isSensitiveInfoError( e ) ) {
-      const getItemError = e as SensitiveInfoError;
-      if ( isDebugModeSync() ) {
-        switch ( getItemError.code ) {
-          case ErrorCode.NOT_FOUND:
-            // Value doesn't exist
-            localLogger.info( `RNSInfo.getItem not available for ${key}` );
-            break;
-          default:
-            localLogger.info( `RNSInfo.getItem unknown error for ${key}: ${getItemError.message}` );
-            break;
-        }
+    if ( e instanceof SensitiveInfoError && isDebugModeSync() ) {
+      switch ( e.code ) {
+        case ErrorCode.NotFound:
+          // Value doesn't exist
+          localLogger.info( `getItem not available for ${key}` );
+          break;
+        default:
+          localLogger.info( `getItem unknown error for ${key}: ${e.message}` );
+          break;
       }
     }
     throw e;
@@ -132,22 +135,19 @@ async function setSensitiveItem( key: string, value: string, options = {} ) {
   const actualOptions = {
     // I put the key as overridable by actual options propped in,
     // in case someone wants to build a separate slice at one point.
-    keychainService: "app" as const,
+    service: "app" as const,
     ...options,
     accessControl: "none" as const,
   };
   try {
-    const result = await RNSInfo.setItem( key, value, actualOptions );
+    const result = await setItem( key, value, actualOptions );
     clearAuthCache( );
     return result;
   } catch ( e ) {
-    if ( isSensitiveInfoError( e ) ) {
-      const setItemError = e as SensitiveInfoError;
-      if ( isDebugModeSync( ) ) {
-        localLogger.info(
-          `RNSInfo.setItem error for ${key}, ${setItemError.code} ${setItemError.message}`,
-        );
-      }
+    if ( e instanceof SensitiveInfoError && isDebugModeSync( ) ) {
+      localLogger.info(
+        `setItem error for ${key}, ${e.code} ${e.message}`,
+      );
     }
     throw e;
   }
@@ -156,21 +156,18 @@ async function setSensitiveItem( key: string, value: string, options = {} ) {
 async function deleteSensitiveItem(
   key: string,
   options = {
-    keychainService: "app" as const,
+    service: "app" as const,
   },
 ) {
   try {
-    const result = await RNSInfo.deleteItem( key, options );
+    const result = await deleteItem( key, options );
     clearAuthCache( );
     return result;
   } catch ( e ) {
-    if ( isSensitiveInfoError( e ) ) {
-      const deleteItemError = e as SensitiveInfoError;
-      if ( isDebugModeSync() ) {
-        localLogger.info(
-          `RNSInfo.deleteItem error for ${key}, ${deleteItemError.code} ${deleteItemError.message}`,
-        );
-      }
+    if ( e instanceof SensitiveInfoError && isDebugModeSync() ) {
+      localLogger.info(
+        `deleteItem error for ${key}, ${e.code} ${e.message}`,
+      );
     }
     throw e;
   }