Merge remote-tracking branch 'origin/main' into autobackup

infra/experiments/logs-viewer/README.md

@@ -1,167 +0,0 @@
-# Ente Log Viewer
-
-A web-based log viewer for analyzing Ente application logs. This tool provides similar functionality to the mobile log viewer, allowing you to upload, filter, and analyze log files from customer support requests.
-
-## Features
-
-### 📁 File Upload
-- Drag and drop ZIP files containing log files
-- Automatic extraction and parsing of log files
-- Support for daily log files format (YYYY-M-D.log)
-
-### 🔍 Search and Filtering
-- **Text Search**: Search through log messages, logger names, and error content
-- **Logger Filtering**: Use `logger:ServiceName` syntax to filter by specific loggers
-- **Wildcard Support**: Use `logger:Auth*` to match all loggers starting with "Auth"
-- **Level Filtering**: Filter by log levels (SEVERE, WARNING, INFO, etc.)
-- **Process Filtering**: Filter by foreground/background processes
-- **Timeline Filtering**: Filter by date/time ranges
-
-### 📊 Analytics
-- Logger statistics showing most active components
-- Log level distribution charts
-- Click-to-filter from analytics charts
-
-### 🎨 UI Features
-- **Color-coded log levels**: Red for SEVERE, orange for WARNING, etc.
-- **Process indicators**: Visual distinction between foreground and background processes
-- **Active filter chips**: Visual indication of applied filters with easy removal
-- **Log detail view**: Click any log entry for detailed information
-- **Sort options**: Sort by newest first or oldest first
-- **Responsive design**: Works on desktop and mobile devices
-
-### 📤 Export
-- Export filtered logs as text files
-- Copy individual log entries to clipboard
-- Maintain original formatting and error details
-
-## Usage
-
-### Starting the Application
-
-1. **Local Development**:
-   ```bash
-   cd infra/experiments/logs-viewer
-   python3 -m http.server 8080
-   ```
-   Open http://localhost:8080 in your browser
-
-2. **Upload Log Files**:
-   - Drag and drop a ZIP file containing `.log` files
-   - Or click "Choose ZIP File" to browse for files
-
-### Log Format Support
-
-The viewer understands the Ente log format as generated by `super_logging.dart`:
-
-```
-[process] [loggerName] [LEVEL] [timestamp] message
-```
-
-**Examples**:
-- `[bg] [SyncService] [INFO] [2025-08-24 01:36:03.677678] Syncing started`
-- `[CollectionsService] [WARNING] [2025-08-24 01:36:04.123456] Connection failed`
-
-**Multi-line Error Support**:
-- Automatically parses `⤷` error detail lines
-- Extracts stack traces and error IDs
-- Handles inline error messages and exceptions
-
-### Filtering Examples
-
-- **Search by text**: `connection failed`
-- **Filter by logger**: `logger:SyncService`
-- **Multiple loggers**: `logger:Sync* logger:Collection*`
-- **Combined search**: `logger:Auth* login failed`
-
-### Keyboard Shortcuts
-
-- **Search**: Click search bar or start typing
-- **Clear search**: Click X button or clear the input
-- **Sort toggle**: Click sort arrow button
-- **Filter dialog**: Click filter button
-
-## Technical Details
-
-### Supported Log Levels
-- **SHOUT**: Purple - Highest priority
-- **SEVERE**: Red - Errors and exceptions
-- **WARNING**: Orange - Warning conditions
-- **INFO**: Blue - Informational messages
-- **CONFIG**: Green - Configuration messages
-- **FINE/FINER/FINEST**: Gray - Debug messages
-
-### Process Types
-- **Foreground**: Main app processes
-- **Background (bg)**: Background tasks
-- **Firebase Background (fbg)**: Firebase-related background processes
-
-### Performance
-- Lazy loading: Only renders visible log entries
-- Efficient filtering: Client-side filtering with optimized algorithms
-- Memory management: Handles large log files (tested with 100k+ entries)
-
-## Sample Log Files
-
-For testing, you can use any ZIP file containing `.log` files from Ente mobile app logs.
-
-## Development
-
-### File Structure
-```
-logs-viewer/
-├── index.html          # Main HTML structure
-├── styles.css          # CSS styling
-├── script.js           # JavaScript logic
-├── README.md           # This documentation
-└── references/         # UI reference screenshots
-```
-
-### Key JavaScript Classes
-- `LogViewer`: Main application class
-- Log parsing logic in `parseLogFile()` and `parseLogLine()`
-- Filter management in `applyCurrentFilter()`
-- UI rendering in `renderLogs()` and `createLogEntryHTML()`
-
-### Adding Features
-1. **New Filter Types**: Extend `currentFilter` object and `matchesFilter()` method
-2. **New Log Formats**: Update parsing patterns in `parseLogLine()`
-3. **UI Components**: Add HTML elements and CSS classes, wire up in `initializeEventListeners()`
-
-## Troubleshooting
-
-### Common Issues
-
-1. **ZIP file not loading**:
-   - Ensure ZIP contains `.log` files
-   - Check browser console for errors
-   - Try a smaller file first
-
-2. **Logs not parsing correctly**:
-   - Check log format matches expected pattern
-   - Look for console warnings about parsing failures
-   - Verify timestamp format is correct
-
-3. **Performance issues with large files**:
-   - The viewer handles pagination (100 logs at a time)
-   - Use filters to reduce the dataset
-   - Close other browser tabs to free memory
-
-4. **Search not working**:
-   - Check for typos in logger names
-   - Use wildcard syntax: `logger:Service*`
-   - Search is case-insensitive for message content
-
-### Browser Compatibility
-- **Recommended**: Chrome 80+, Firefox 75+, Safari 13+
-- **Required**: ES6 support, Fetch API, File API
-- **Dependencies**: JSZip library for ZIP file handling
-
-## Future Enhancements
-
-- Real-time log streaming
-- Advanced regex search
-- Log correlation and grouping
-- Performance metrics dashboard
-- Dark theme support
-- Export to JSON/CSV formats

infra/experiments/logs-viewer/ente-theme.css

@@ -1,110 +0,0 @@
-/* Ente Theme Variables based on web/packages/base/components/utils/theme.ts */
-:root {
-    /* Light theme colors */
-    --ente-color-accent-photos: #1db954;
-    --ente-color-accent-auth: #9610d6;
-    --ente-color-accent-locker: #5ba8ff;
-    
-    /* Background colors */
-    --ente-background-default: #fff;
-    --ente-background-paper: #fff;
-    --ente-background-paper2: #fbfbfb;
-    --ente-background-search: #f3f3f3;
-    
-    /* Text colors */
-    --ente-text-base: #000;
-    --ente-text-muted: rgba(0, 0, 0, 0.60);
-    --ente-text-faint: rgba(0, 0, 0, 0.50);
-    
-    /* Fill colors */
-    --ente-fill-base: #000;
-    --ente-fill-muted: rgba(0, 0, 0, 0.12);
-    --ente-fill-faint: rgba(0, 0, 0, 0.04);
-    --ente-fill-faint-hover: rgba(0, 0, 0, 0.08);
-    --ente-fill-fainter: rgba(0, 0, 0, 0.02);
-    
-    /* Stroke colors */
-    --ente-stroke-base: #000;
-    --ente-stroke-muted: rgba(0, 0, 0, 0.24);
-    --ente-stroke-faint: rgba(0, 0, 0, 0.12);
-    --ente-stroke-fainter: rgba(0, 0, 0, 0.06);
-    
-    /* Shadow */
-    --ente-shadow-paper: 0px 0px 10px rgba(0, 0, 0, 0.25);
-    --ente-shadow-menu: 0px 0px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.12);
-    --ente-shadow-button: 0px 4px 4px rgba(0, 0, 0, 0.25);
-    
-    /* Fixed colors */
-    --ente-success: #1db954;
-    --ente-warning: #ffc107;
-    --ente-danger: #ea3f3f;
-    --ente-danger-dark: #f53434;
-    --ente-danger-light: #ff6565;
-    
-    /* Secondary colors */
-    --ente-secondary-main: #f5f5f5;
-    --ente-secondary-hover: #e9e9e9;
-    
-    /* Action colors */
-    --ente-action-hover: rgba(0, 0, 0, 0.08);
-    --ente-action-disabled: rgba(0, 0, 0, 0.50);
-    
-    /* Typography */
-    --ente-font-family: "Inter Variable", sans-serif;
-    --ente-font-weight-regular: 500;
-    --ente-font-weight-medium: 600;
-    --ente-font-weight-bold: 700;
-    
-    /* Border radius */
-    --ente-border-radius: 8px;
-    --ente-border-radius-small: 4px;
-    
-    /* Spacing */
-    --ente-spacing-xs: 4px;
-    --ente-spacing-sm: 8px;
-    --ente-spacing-md: 12px;
-    --ente-spacing-lg: 16px;
-    --ente-spacing-xl: 24px;
-}
-
-/* Dark theme */
-@media (prefers-color-scheme: dark) {
-    :root {
-        /* Background colors */
-        --ente-background-default: #000;
-        --ente-background-paper: #1b1b1b;
-        --ente-background-paper2: #252525;
-        --ente-background-search: #1b1b1b;
-        
-        /* Text colors */
-        --ente-text-base: #fff;
-        --ente-text-muted: rgba(255, 255, 255, 0.70);
-        --ente-text-faint: rgba(255, 255, 255, 0.50);
-        
-        /* Fill colors */
-        --ente-fill-base: #fff;
-        --ente-fill-muted: rgba(255, 255, 255, 0.16);
-        --ente-fill-faint: rgba(255, 255, 255, 0.12);
-        --ente-fill-faint-hover: rgba(255, 255, 255, 0.16);
-        --ente-fill-fainter: rgba(255, 255, 255, 0.05);
-        
-        /* Stroke colors */
-        --ente-stroke-base: #fff;
-        --ente-stroke-muted: rgba(255, 255, 255, 0.24);
-        --ente-stroke-faint: rgba(255, 255, 255, 0.16);
-        --ente-stroke-fainter: rgba(255, 255, 255, 0.12);
-        
-        /* Shadow */
-        --ente-shadow-paper: 0px 2px 12px rgba(0, 0, 0, 0.75);
-        --ente-shadow-menu: 0px 0px 6px rgba(0, 0, 0, 0.50), 0px 3px 6px rgba(0, 0, 0, 0.25);
-        --ente-shadow-button: 0px 4px 4px rgba(0, 0, 0, 0.75);
-        
-        /* Secondary colors */
-        --ente-secondary-main: #2b2b2b;
-        --ente-secondary-hover: #373737;
-        
-        /* Action colors */
-        --ente-action-hover: rgba(255, 255, 255, 0.16);
-        --ente-action-disabled: rgba(255, 255, 255, 0.50);
-    }
-}

infra/experiments/logs-viewer/index.html

@@ -1,218 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Ente Log Viewer</title>
-    
-    <!-- Material-UI CSS -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mui/material@latest/dist/index.css" />
-    
-    <!-- Ente theme -->
-    <link rel="stylesheet" href="ente-theme.css">
-    
-    <!-- Custom styles -->
-    <link rel="stylesheet" href="styles.css">
-</head>
-<body>
-    <div class="app">
-        <!-- Header -->
-        <header class="header">
-            <div class="header-content">
-                <h1>📋 Ente Log Viewer</h1>
-                <div class="header-actions">
-                    <button id="filter-btn" class="mui-icon-btn" title="Filter logs">
-                        <span class="material-icons">filter_list</span>
-                        <span class="filter-count" id="filter-count" style="display: none;"></span>
-                    </button>
-                    <button id="sort-btn" class="mui-icon-btn" title="Sort order">
-                        <span class="material-icons">arrow_downward</span>
-                    </button>
-                    <div class="dropdown">
-                        <button class="mui-icon-btn dropdown-toggle" title="More actions">
-                            <span class="material-icons">more_vert</span>
-                        </button>
-                        <div class="dropdown-menu mui-menu">
-                            <button id="analytics-btn" class="dropdown-item mui-menu-item">
-                                <span class="material-icons">analytics</span>
-                                <span>Analytics</span>
-                            </button>
-                            <button id="export-btn" class="dropdown-item mui-menu-item">
-                                <span class="material-icons">download</span>
-                                <span>Export Logs</span>
-                            </button>
-                            <button id="clear-btn" class="dropdown-item mui-menu-item danger">
-                                <span class="material-icons">delete</span>
-                                <span>Clear Logs</span>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </header>
-
-        <!-- Upload Section -->
-        <div class="upload-section" id="upload-section">
-            <div class="upload-area" id="upload-area">
-                <div class="upload-content">
-                    <div class="upload-icon">📁</div>
-                    <h2>Upload Log Files</h2>
-                    <p>Drag and drop a zip file containing log files, or click to browse</p>
-                    <input type="file" id="file-input" accept=".zip" hidden>
-                    <button id="browse-btn" class="primary-btn">Choose ZIP File</button>
-                </div>
-            </div>
-        </div>
-
-        <!-- Main Content -->
-        <div class="main-content" id="main-content" style="display: none;">
-            <!-- Search Bar -->
-            <div class="search-section">
-                <div class="search-bar mui-search-container">
-                    <div class="mui-textfield">
-                        <input type="text" id="search-input" placeholder="Search logs... (try 'logger:SyncService' or text search)" class="mui-input" />
-                        <span class="mui-search-icon material-icons">search</span>
-                        <button id="clear-search" class="mui-clear-btn" style="display: none;">
-                            <span class="material-icons">clear</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Timeline Filter -->
-            <div class="timeline-section" id="timeline-section" style="display: none;">
-                <div class="timeline-header">
-                    <span class="material-icons">timeline</span>
-                    <span>Timeline Filter</span>
-                    <button id="timeline-toggle" class="mui-icon-btn timeline-btn">
-                        <span class="material-icons">timeline</span>
-                    </button>
-                </div>
-                <div class="timeline-controls" id="timeline-controls" style="display: none;">
-                    <div class="timeline-range">
-                        <div class="mui-textfield">
-                            <input type="datetime-local" id="start-time" class="mui-input" />
-                        </div>
-                        <span class="range-separator">to</span>
-                        <div class="mui-textfield">
-                            <input type="datetime-local" id="end-time" class="mui-input" />
-                        </div>
-                        <button id="reset-timeline" class="mui-button secondary">
-                            <span class="material-icons">refresh</span>
-                            <span>Reset</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Active Filters -->
-            <div class="active-filters" id="active-filters" style="display: none;">
-                <div class="filter-chips" id="filter-chips"></div>
-            </div>
-
-            <!-- Log Stats -->
-            <div class="log-stats" id="log-stats">
-                <span id="log-count">0 logs loaded</span>
-                <span id="filtered-count"></span>
-            </div>
-
-            <!-- Log List -->
-            <div class="log-list-container">
-                <div class="log-list" id="log-list">
-                    <!-- Log entries will be populated here -->
-                </div>
-                <div class="loading" id="loading" style="display: none;">Loading...</div>
-                <div class="load-more" id="load-more" style="display: none;">
-                    <button class="secondary-btn">Load More</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Filter Dialog -->
-    <div class="dialog-overlay" id="filter-dialog" style="display: none;">
-        <div class="dialog">
-            <div class="dialog-header">
-                <h2>Filter Logs</h2>
-                <button class="close-btn" id="close-filter">✕</button>
-            </div>
-            <div class="dialog-content">
-                <!-- Log Levels -->
-                <div class="filter-section">
-                    <h3>Log Levels</h3>
-                    <div class="level-chips" id="level-chips">
-                        <!-- Level chips will be populated here -->
-                    </div>
-                </div>
-
-                <!-- Process -->
-                <div class="filter-section">
-                    <h3>Process</h3>
-                    <div class="process-list" id="process-list">
-                        <!-- Process checkboxes will be populated here -->
-                    </div>
-                </div>
-
-                <!-- Loggers -->
-                <div class="filter-section">
-                    <h3>Loggers</h3>
-                    <div class="logger-list" id="logger-list">
-                        <!-- Logger checkboxes will be populated here -->
-                    </div>
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="clear-filters" class="secondary-btn">Clear All</button>
-                <button id="cancel-filter" class="secondary-btn">Cancel</button>
-                <button id="apply-filters" class="primary-btn">Apply</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Analytics Dialog -->
-    <div class="dialog-overlay" id="analytics-dialog" style="display: none;">
-        <div class="dialog">
-            <div class="dialog-header">
-                <h2>Logger Analytics</h2>
-                <button class="close-btn" id="close-analytics">✕</button>
-            </div>
-            <div class="dialog-content">
-                <div id="analytics-content">
-                    <!-- Analytics charts will be populated here -->
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="close-analytics-btn" class="secondary-btn">Close</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Log Detail Dialog -->
-    <div class="dialog-overlay" id="detail-dialog" style="display: none;">
-        <div class="dialog large">
-            <div class="dialog-header">
-                <h2>Log Details</h2>
-                <button class="close-btn" id="close-detail">✕</button>
-            </div>
-            <div class="dialog-content">
-                <div id="detail-content">
-                    <!-- Log details will be populated here -->
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="copy-log" class="secondary-btn">Copy</button>
-                <button id="close-detail-btn" class="secondary-btn">Close</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Material-UI JavaScript -->
-    <script src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
-    <script src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
-    <script src="https://unpkg.com/@mui/material@latest/umd/material-ui.production.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-    <script src="script.js"></script>
-</body>
-</html>

mobile/apps/auth/.gitignore

@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+android/app/build/
 
 # Editors
 .vscode/

mobile/apps/auth/lib/l10n/arb/app_en.arb

@@ -527,5 +527,24 @@
   "errorInvalidQRCodeBody": "The scanned QR code is not a valid 2FA account.",
   "errorNoQRCode": "No QR code found",
   "errorGenericTitle": "An Error Occurred",
-  "errorGenericBody": "An unexpected error occurred while importing."
+  "errorGenericBody": "An unexpected error occurred while importing.",
+  "localBackupSettingsTitle": "Local backup",
+  "localBackupSidebarTitle": "Local backup",
+  "enableAutomaticBackups": "Enable automatic backups",
+  "backupDescription": "This will automatically backup your data to an on-device location. Backups are updated whenever entries are added, edited or deleted",
+  "currentLocation": "Current backup location:",
+  "securityNotice": "Security notice",
+  "backupSecurityNotice": "This encrypted backup holds your 2FA keys. If lost, you may not be able to recover your accounts. Keep it safe!",
+  "locationUpdatedAndBackupCreated": "Location updated and initial backup created!",
+  "initialBackupCreated": "Initial backup created!",
+  "passwordTooShort": "Password must be at least 8 characters long.",
+  "noDefaultBackupFolder": "Could not create default backup folder.",
+  "backupLocationChoiceDescription": "Where do you want to save your backups?",
+  "chooseBackupLocation": "Choose a backup location",
+  "loadDefaultLocation": "Loading default location...",
+  "couldNotDetermineLocation":"Could not determine location...",
+  "saveAction":"Save",
+  "saveBackup":"Save backup",
+  "changeLocation": "Change location",
+  "changeCurrentLocation": "Change current location"
 }

mobile/apps/auth/lib/services/local_backup_service.dart

@@ -0,0 +1,177 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:ente_auth/models/export/ente.dart';
+import 'package:ente_auth/store/code_store.dart';
+import 'package:ente_crypto_dart/ente_crypto_dart.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:intl/intl.dart';  //for time based file naming
+import 'package:logging/logging.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+//we gonn change
+
+class LocalBackupService {
+  final _logger = Logger('LocalBackupService');
+  static final LocalBackupService instance =
+      LocalBackupService._privateConstructor();
+  LocalBackupService._privateConstructor();
+
+  static const int _maxBackups = 2;
+
+  // to create an encrypted backup file if the toggle is on
+  Future<void> triggerAutomaticBackup() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+
+      final isEnabled = prefs.getBool('isAutoBackupEnabled') ?? false;
+      if (!isEnabled) {
+        return;
+      }
+
+      final backupPath = prefs.getString('autoBackupPath');
+      if (backupPath == null) {
+        return;
+      }
+      
+      const storage = FlutterSecureStorage();
+      final password = await storage.read(key: 'autoBackupPassword');
+      if (password == null || password.isEmpty) {
+        _logger.warning("Automatic backup skipped: password not set.");
+        return;
+      }
+
+      _logger.info("Change detected, triggering automatic encrypted backup...");
+
+
+      String rawContent = await CodeStore.instance.getCodesForExport();
+
+      List<String> lines = rawContent.split('\n');
+      List<String> cleanedLines = [];
+
+      for (String line in lines) {
+        if (line.trim().isEmpty) continue;
+  
+        String cleanUrl;
+        if (line.startsWith('"') && line.endsWith('"')) {
+          cleanUrl = jsonDecode(line); 
+        }
+
+        else {
+          cleanUrl = line;
+        }
+
+        cleanedLines.add(cleanUrl);
+      }
+
+      final plainTextContent = cleanedLines.join('\n');
+
+      if (plainTextContent.trim().isEmpty) {
+        return;
+      }
+
+      final kekSalt = CryptoUtil.getSaltToDeriveKey();
+      final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(
+        utf8.encode(password),
+        kekSalt,
+      );
+      
+      final encResult = await CryptoUtil.encryptData(
+        utf8.encode(plainTextContent),
+        derivedKeyResult.key,
+      );
+
+      final encContent = CryptoUtil.bin2base64(encResult.encryptedData!);
+      final encNonce = CryptoUtil.bin2base64(encResult.header!);
+
+      final EnteAuthExport data = EnteAuthExport(
+        version: 1,
+        encryptedData: encContent,
+        encryptionNonce: encNonce,
+        kdfParams: KDFParams(
+          memLimit: derivedKeyResult.memLimit,
+          opsLimit: derivedKeyResult.opsLimit,
+          salt: CryptoUtil.bin2base64(kekSalt),
+        ),
+      );
+      
+      final encryptedJson = jsonEncode(data.toJson());
+
+      final now = DateTime.now();
+      final formatter = DateFormat('yyyy-MM-dd_HH-mm-ss');
+      final formattedDate = formatter.format(now);
+      final fileName = 'ente-auth-auto-backup-$formattedDate.json';
+
+      final filePath = '$backupPath/$fileName';
+      final backupFile = File(filePath);
+      
+      await backupFile.writeAsString(encryptedJson);
+      await _manageOldBackups(backupPath);
+
+      _logger.info('Automatic encrypted backup successful! Saved to: $filePath');
+    } catch (e, s) {
+      _logger.severe('Silent error during automatic backup', e, s);
+    }
+  }
+
+  Future<void> _manageOldBackups(String backupPath) async {
+    try {
+      _logger.info("Checking for old backups to clean up...");
+      final directory = Directory(backupPath);
+
+      // fetch all filenames in the folder, filter out ente backup files
+      final files = directory.listSync()
+          .where((entity) =>
+              entity is File &&
+              entity.path.split('/').last.startsWith('ente-auth-auto-backup-'),)
+          .map((entity) => entity as File)
+          .toList();
+
+      // sort the fetched files in asc order (oldest first because the name is a timestamp)
+      files.sort((a, b) => a.path.compareTo(b.path));
+
+      // if we have more files than our limit, delete the oldest ones (current limit=_maxBackups)
+      while (files.length > _maxBackups) {
+  // remove the oldest file (at index 0) from the list
+  final fileToDelete = files.removeAt(0); 
+  // and delete it from the device's storage..
+  await fileToDelete.delete(); 
+  _logger.info('Deleted old backup: ${fileToDelete.path}');
+}
+_logger.info('Backup count is now ${files.length}. Cleanup complete.');
+    } catch (e, s) {
+      _logger.severe('Error during old backup cleanup', e, s);
+    }
+  }
+
+  Future<void> deleteAllBackupsIn(String path) async {
+    try {
+      _logger.info("Deleting all backups in old location: $path");
+      final directory = Directory(path);
+
+      if (!await directory.exists()) {
+        _logger.warning("Old backup directory not found. Nothing to delete.");
+        return;
+      }
+
+      final files = directory.listSync()
+          .where((entity) =>
+              entity is File &&
+              entity.path.split('/').last.startsWith('ente-auth-auto-backup-'),)
+          .map((entity) => entity as File)
+          .toList();
+
+      if (files.isEmpty) {
+        _logger.info("No old backup files found to delete.");
+        return;
+      }
+      
+      for (final file in files) {
+        await file.delete();
+        _logger.info('Deleted: ${file.path}');
+      }
+      _logger.info("Successfully cleaned up old backup location.");
+
+    } catch (e, s) {
+      _logger.severe('Error during full backup cleanup of old directory', e, s);
+    }
+  }
+}

mobile/apps/auth/lib/store/code_store.dart

@@ -7,6 +7,7 @@ import 'package:ente_auth/events/codes_updated_event.dart';
 import 'package:ente_auth/models/authenticator/entity_result.dart';
 import 'package:ente_auth/models/code.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
+import 'package:ente_auth/services/local_backup_service.dart';
 import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:ente_events/event_bus.dart';
 import 'package:logging/logging.dart';
@@ -64,6 +65,27 @@ class CodeStore {
     return true;
   }
 
+  Future<void> updateCode(Code originalCode, Code updatedCode, {bool shouldSync = true}) async {
+    if (updatedCode.generatedID == null) return; 
+
+    await _authenticatorService.updateEntry(
+      updatedCode.generatedID!,
+      updatedCode.toOTPAuthUrlFormat(),
+      shouldSync, 
+      _authenticatorService.getAccountMode(),
+    );
+    Bus.instance.fire(CodesUpdatedEvent());
+
+    final bool isMajorChange = originalCode.issuer != updatedCode.issuer ||
+        originalCode.account != updatedCode.account ||
+        originalCode.secret != updatedCode.secret ||
+        originalCode.display.note != updatedCode.display.note;
+        
+    if (isMajorChange) {
+      LocalBackupService.instance.triggerAutomaticBackup().ignore();
+    }
+  }
+
   Future<List<Code>> getAllCodes({
     AccountMode? accountMode,
     bool sortCodes = true,
@@ -95,7 +117,6 @@ class CodeStore {
     }
 
     if (sortCodes) {
-      // sort codes by issuer,account
       codes.sort((firstCode, secondCode) {
         if (secondCode.isPinned && !firstCode.isPinned) return 1;
         if (!secondCode.isPinned && firstCode.isPinned) return -1;
@@ -120,13 +141,17 @@ class CodeStore {
     bool shouldSync = true,
     AccountMode? accountMode,
     List<Code>? existingAllCodes,
+    bool isFrequencyOrRecencyUpdate = false,
   }) async {
+
     final mode = accountMode ?? _authenticatorService.getAccountMode();
     final allCodes = existingAllCodes ?? (await getAllCodes(accountMode: mode));
     bool isExistingCode = false;
     bool hasSameCode = false;
+
     for (final existingCode in allCodes) {
       if (existingCode.hasError) continue;
+
       if (code.generatedID != null &&
           existingCode.generatedID == code.generatedID) {
         isExistingCode = true;
@@ -148,6 +173,9 @@ class CodeStore {
         shouldSync,
         mode,
       );
+      if (!isFrequencyOrRecencyUpdate) {
+        LocalBackupService.instance.triggerAutomaticBackup().ignore();
+      }
     } else {
       result = AddResult.newCode;
       code.generatedID = await _authenticatorService.addEntry(
@@ -155,6 +183,7 @@ class CodeStore {
         shouldSync,
         mode,
       );
+      LocalBackupService.instance.triggerAutomaticBackup().ignore();
     }
     Bus.instance.fire(CodesUpdatedEvent());
     return result;
@@ -164,6 +193,7 @@ class CodeStore {
     final mode = accountMode ?? _authenticatorService.getAccountMode();
     await _authenticatorService.deleteEntry(code.generatedID!, mode);
     Bus.instance.fire(CodesUpdatedEvent());
+    LocalBackupService.instance.triggerAutomaticBackup().ignore();
   }
 
   bool _isOfflineImportRunning = false;
@@ -214,7 +244,6 @@ class CodeStore {
           'importingCode: genID ${eachCode.generatedID} & isAlreadyPresent $alreadyPresent',
         );
         if (!alreadyPresent) {
-          // Avoid conflict with generatedID of online codes
           eachCode.generatedID = null;
           final AddResult result = await CodeStore.instance.addCode(
             eachCode,
@@ -236,10 +265,21 @@ class CodeStore {
       _isOfflineImportRunning = false;
     }
   }
+
+  Future<String> getCodesForExport() async {
+  final allCodes = await getAllCodes(sortCodes: false);
+  String data = "";
+  for (final code in allCodes) {
+    if (code.hasError) continue;
+    data += "${code.toOTPAuthUrlFormat()}\n";
+  }
+  return data;
+}
+
 }
 
 enum AddResult {
   newCode,
   duplicate,
   updateCode,
-}
+}

mobile/apps/auth/lib/ui/code_widget.dart

@@ -478,7 +478,7 @@ class _CodeWidgetState extends State<CodeWidget> {
       _getCurrentOTP(),
       confirmationMessage: context.l10n.copiedToClipboard,
     );
-    _udateCodeMetadata().ignore();
+    _updateCodeMetadata().ignore();
   }
 
   void _copyNextToClipboard() {
@@ -486,10 +486,10 @@ class _CodeWidgetState extends State<CodeWidget> {
       _getNextTotp(),
       confirmationMessage: context.l10n.copiedNextToClipboard,
     );
-    _udateCodeMetadata().ignore();
+    _updateCodeMetadata().ignore();
   }
 
-  Future<void> _udateCodeMetadata() async {
+  Future<void> _updateCodeMetadata() async {
     if (widget.sortKey == null) return;
     Future.delayed(const Duration(milliseconds: 100), () {
       if (mounted) {
@@ -502,7 +502,7 @@ class _CodeWidgetState extends State<CodeWidget> {
               lastUsedAt: DateTime.now().microsecondsSinceEpoch,
             ),
           );
-          unawaited(CodeStore.instance.addCode(code));
+          unawaited(CodeStore.instance.addCode(code, isFrequencyOrRecencyUpdate: true));
         }
       }
     });

mobile/apps/auth/lib/ui/home_page.dart

@@ -94,6 +94,7 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
+
     _codeSortKey = PreferenceService.instance.codeSortKey();
     _textController.addListener(_applyFilteringAndRefresh);
     _loadCodes();
@@ -153,6 +154,7 @@ class _HomePageState extends State<HomePage> {
   }
 
   void _loadCodes() {
+    debugPrint("[HOME_DEBUG] _loadCodes triggered!");
     CodeStore.instance.getAllCodes().then((codes) {
       _allCodes = codes;
       hasTrashedCodes = false;
@@ -817,4 +819,4 @@ class _HomePageState extends State<HomePage> {
       ],
     );
   }
-}
+}

mobile/apps/auth/lib/ui/settings/data/data_section_widget.dart

@@ -10,6 +10,7 @@ import 'package:ente_auth/ui/settings/common_settings.dart';
 import 'package:ente_auth/ui/settings/data/duplicate_code_page.dart';
 import 'package:ente_auth/ui/settings/data/export_widget.dart';
 import 'package:ente_auth/ui/settings/data/import_page.dart';
+import 'package:ente_auth/ui/settings/data/local_backup_settings_page.dart'; //for local backup
 import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/navigation_util.dart';
 import 'package:flutter/material.dart';
@@ -29,6 +30,10 @@ class DataSectionWidget extends StatelessWidget {
     );
   }
 
+  Future<void> _handleLocalBackupClick(BuildContext context) async {
+    await routeToPage(context, const LocalBackupSettingsPage());
+  }
+
   Column _getSectionOptions(BuildContext context) {
     final l10n = context.l10n;
     List<Widget> children = [];
@@ -86,10 +91,21 @@ class DataSectionWidget extends StatelessWidget {
           );
         },
       ),
+      MenuItemWidget(
+        captionedTextWidget: CaptionedTextWidget(
+          title: l10n.localBackupSidebarTitle,
+        ),
+        pressedColor: getEnteColorScheme(context).fillFaint,
+        trailingIcon: Icons.chevron_right_outlined,
+        trailingIconIsMuted: true,
+        onTap: () async {
+          await _handleLocalBackupClick(context);
+        },
+      ),
       sectionOptionSpacing,
     ]);
     return Column(
       children: children,
     );
   }
-}
+}

mobile/apps/auth/lib/ui/settings/data/import/encrypted_ente_import.dart

@@ -153,4 +153,4 @@ Future<void> _pickEnteJsonFile(BuildContext context) async {
       context.l10n.importFailureDescNew,
     );
   }
-}
+}

mobile/apps/auth/lib/ui/settings/data/local_backup_settings_page.dart

@@ -0,0 +1,458 @@
+import 'dart:io';
+
+import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/services/local_backup_service.dart';
+import 'package:ente_auth/theme/ente_theme.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/dialog_widget.dart';
+import 'package:ente_auth/ui/components/models/button_result.dart';
+import 'package:ente_auth/ui/components/models/button_type.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class LocalBackupSettingsPage extends StatefulWidget {
+  const LocalBackupSettingsPage({super.key});
+
+  @override
+  State<LocalBackupSettingsPage> createState() =>
+      _LocalBackupSettingsPageState();
+}
+
+class _LocalBackupSettingsPageState extends State<LocalBackupSettingsPage> {
+  bool _isBackupEnabled = false;
+  String? _backupPath;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSettings();
+  }
+
+  // to load the saved settings from SharedPreferences when the page opens.
+  Future<void> _loadSettings() async {
+    final prefs = await SharedPreferences.getInstance();
+    setState(() {
+      _isBackupEnabled = prefs.getBool('isAutoBackupEnabled') ?? false;
+      _backupPath = prefs.getString('autoBackupPath');
+    });
+  }
+
+  Future<String?> _showCustomPasswordDialog() async {
+    final l10n = context.l10n;
+    final textController = TextEditingController();
+    // state variable to track password visibility
+    bool isPasswordHidden = true;
+
+    return showDialog<String>(
+      context: context,
+      barrierDismissible: false, 
+      builder: (context) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            return AlertDialog(
+              title: Text(l10n.setPasswordTitle, style: getEnteTextTheme(context).largeBold),
+              content: TextField(
+                controller: textController,
+                autofocus: true,
+                obscureText: isPasswordHidden,
+                decoration: InputDecoration(
+                  hintText: l10n.enterPassword,
+                  hintStyle: getEnteTextTheme(context).mini,
+                  suffixIcon: IconButton(
+                    icon: Icon(
+                      isPasswordHidden ? Icons.visibility_off : Icons.visibility,
+                    ),
+                    onPressed: () {
+                      setState(() {
+                        isPasswordHidden = !isPasswordHidden;
+                      });
+                    },
+                  ),
+                ),
+                onChanged: (text) => setState(() {}),
+              ),
+              actions: [
+                Row(
+                  children: [
+
+                    Expanded(
+                      child: ButtonWidget(
+                        buttonType: ButtonType.secondary,
+                        labelText: l10n.cancel,
+                        onTap: () async => Navigator.of(context).pop(null),
+                      ),
+                    ),
+
+                    const SizedBox(width: 8), 
+
+                    Expanded(
+                      child: ButtonWidget(
+                        buttonType: ButtonType.primary,
+                        labelText: l10n.saveAction,
+                        isDisabled: textController.text.isEmpty,
+                        onTap: () async => Navigator.of(context).pop(textController.text),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<ButtonResult?> _showLocationChoiceDialog({required String displayPath}) async {
+    final l10n = context.l10n;
+
+    final dialogBody =
+        '${l10n.backupLocationChoiceDescription}\n\nSelected: ${_simplifyPath(displayPath)}';
+
+    final result = await showDialogWidget(
+      title: l10n.chooseBackupLocation,
+      context: context,
+      body: dialogBody, 
+      buttons: [
+        ButtonWidget(
+          buttonType: ButtonType.primary,
+          labelText: l10n.saveBackup,
+          isInAlert: true,
+          buttonSize: ButtonSize.large,
+          buttonAction: ButtonAction.first,
+        ),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          labelText: l10n.changeLocation, 
+          isInAlert: true,
+          buttonSize: ButtonSize.large,
+          buttonAction: ButtonAction.second,
+        ),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          labelText: l10n.cancel,
+          isInAlert: true,
+          buttonSize: ButtonSize.large,
+          buttonAction: ButtonAction.cancel,
+        ),
+      ],
+    );
+
+    return result;
+  }
+
+  Future<bool> _handleLocationSetup() async {
+
+    String currentPath = _backupPath ?? await _getDefaultBackupPath();
+
+    while (true) {
+      final result = await _showLocationChoiceDialog(displayPath: currentPath);
+
+      if (result?.action == ButtonAction.first) {
+        final prefs = await SharedPreferences.getInstance();
+        try {
+          await Directory(currentPath).create(recursive: true);
+          await prefs.setString('autoBackupPath', currentPath);
+          setState(() {
+            _backupPath = currentPath;
+          });
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(context.l10n.initialBackupCreated)),
+          );
+          return true; 
+        } catch (e) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(context.l10n.noDefaultBackupFolder)),
+          );
+          return false; 
+        }
+      }
+
+      else if (result?.action == ButtonAction.second) {
+        final newPath = await FilePicker.platform.getDirectoryPath();
+        if (newPath != null) {
+          currentPath = newPath;
+        }
+        
+      }
+      
+      else {
+        return false;
+      }
+    }
+  }
+
+  Future<String> _getDefaultBackupPath() async {
+    if (Platform.isAndroid) {
+      Directory? externalDir = await getExternalStorageDirectory();
+      if (externalDir != null) {
+        String storagePath = externalDir.path.split('/Android')[0];
+        return '$storagePath/Download/EnteAuthBackups';
+      }
+    }
+
+    Directory? dir = await getDownloadsDirectory();
+    dir ??= await getApplicationDocumentsDirectory();
+    return '${dir.path}/EnteAuthBackups';
+  }
+
+  String _simplifyPath(String fullPath) {   //takes a file path string and shortens it if it matches the common Android root path.
+    const rootToRemove = '/storage/emulated/0/';
+    if (fullPath.startsWith(rootToRemove)) {
+      return fullPath.substring(rootToRemove.length);
+    }
+    return fullPath;
+  }
+
+  // opens directory picker
+  Future<bool> _pickAndSaveBackupLocation({String? successMessage}) async {
+    final prefs = await SharedPreferences.getInstance();
+    final l10n = context.l10n;
+
+    String? directoryPath = await FilePicker.platform.getDirectoryPath();
+
+    if (directoryPath != null) {
+
+      await prefs.setString('autoBackupPath', directoryPath);
+      
+      // we only set the state and create the backup if a path was chosen
+      setState(() {
+        _backupPath = directoryPath;
+      });
+      await LocalBackupService.instance.triggerAutomaticBackup();
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(successMessage ?? l10n.locationUpdatedAndBackupCreated),  
+        ),
+      );
+      return true; 
+    }
+    return false; //user cancelled the file picker
+  }
+
+   Future<void> _showSetPasswordDialog() async {
+    final String? password = await _showCustomPasswordDialog();
+    if (password == null) {
+      setState(() {
+        _isBackupEnabled = false;
+      });
+      return;
+    }
+
+    if (password.length < 8) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.passwordTooShort),
+        ),
+      );
+      setState(() {
+        _isBackupEnabled = false;
+      });
+      return;
+    }
+
+    const storage = FlutterSecureStorage();
+    await storage.write(key: 'autoBackupPassword', value: password);
+
+    SchedulerBinding.instance.addPostFrameCallback((_) async {
+      final bool setupCompleted = await _handleLocationSetup();
+      if (!mounted) return;
+
+      if (setupCompleted) {
+        final prefs = await SharedPreferences.getInstance();
+        await prefs.setBool('isAutoBackupEnabled', true);
+        setState(() {
+          _isBackupEnabled = true;
+        });
+        await LocalBackupService.instance.triggerAutomaticBackup();
+      } else {
+        setState(() {
+          _isBackupEnabled = false;
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(l10n.localBackupSettingsTitle), //text shown on appbar
+      ),
+      body: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Expanded(
+                    child: Text(
+                      l10n.enableAutomaticBackups,  //toggle text
+                      style: getEnteTextTheme(context).largeBold,
+                    ),
+                  ),
+                  Switch.adaptive(
+                    value: _isBackupEnabled,
+                    activeColor: Theme.of(context)
+                        .colorScheme
+                        .enteTheme
+                        .colorScheme
+                        .primary400,
+                    activeTrackColor: Theme.of(context)
+                        .colorScheme
+                        .enteTheme
+                        .colorScheme
+                        .primary300,
+                    inactiveTrackColor: Theme.of(context)
+                        .colorScheme
+                        .enteTheme
+                        .colorScheme
+                        .fillMuted,
+                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    onChanged: (value) async {
+                      final prefs = await SharedPreferences.getInstance();
+
+                      if (value == true) {
+                        //when toggle is ON, show password dialog
+                        await _showSetPasswordDialog();
+                      } else {
+                        await prefs.setBool('isAutoBackupEnabled', false);
+                        setState(() {
+                          _isBackupEnabled = false;
+                        });
+                      }
+                    },
+                  ),
+                ],
+              ),
+              Padding(
+                padding: const EdgeInsets.only(top: 10.0),
+                child: Text(
+                  l10n.backupDescription, //text below toggle
+                  style: getEnteTextTheme(context).mini,
+                ),
+              ),
+              const SizedBox(height: 20),
+              Opacity(
+                opacity: _isBackupEnabled ? 1.0 : 0.4,
+                child: IgnorePointer(
+                  ignoring: !_isBackupEnabled,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            l10n.currentLocation, //shows current backup location
+                            style: getEnteTextTheme(context).body,
+                          ),
+                          const SizedBox(height: 4),
+                          if (_backupPath != null)
+                            Text(
+                              _simplifyPath(_backupPath!),
+                              style: getEnteTextTheme(context).small,
+                            )
+                          else
+                            FutureBuilder<String>(
+                              future: _getDefaultBackupPath(),
+                              builder: (context, snapshot) {
+                                if (snapshot.connectionState ==
+                                    ConnectionState.waiting) {
+                                  return Text(
+                                     l10n.loadDefaultLocation, 
+                                    style: getEnteTextTheme(context)
+                                        .small
+                                        .copyWith(color: Colors.grey),
+                                  );
+                                } else if (snapshot.hasError) {
+                                  return Text(
+                                    l10n.couldNotDetermineLocation, 
+                                    style: getEnteTextTheme(context)
+                                        .small
+                                        .copyWith(color: Colors.red),
+                                  );
+                                } else {
+                                  return Text(
+                                    _simplifyPath(snapshot.data ?? ''),
+                                    style: getEnteTextTheme(context)
+                                        .small
+                                        .copyWith(color: Colors.grey),
+                                  );
+                                }
+                              },
+                            ),
+                          const SizedBox(height: 30),
+                          SizedBox(
+                            width: double.infinity,
+                            child: ElevatedButton(
+                              onPressed: () => _pickAndSaveBackupLocation(),
+                              child: Text(l10n.changeCurrentLocation),
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 20),
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          color: Colors.orange.withAlpha(26),
+                          borderRadius: BorderRadius.circular(8),
+                          border: Border.all(
+                            color: Colors.orange.withAlpha(77),
+                            width: 1,
+                          ),
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              children: [
+                                const Icon(
+                                  Icons.security_outlined,
+                                  color: Colors.orange,
+                                  size: 20,
+                                ),
+                                const SizedBox(width: 8),
+                                Text(
+                                  l10n.securityNotice,  //security notice title
+                                  style: getEnteTextTheme(context)
+                                      .smallBold
+                                      .copyWith(
+                                        color: Colors.orange,
+                                      ),
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 8),
+                            Text(
+                              l10n.backupSecurityNotice,  //security notice description
+                              style: getEnteTextTheme(context).mini.copyWith(
+                                    color: Colors.orange.shade700,
+                                  ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

mobile/apps/auth/lib/utils/dialog_util.dart

@@ -414,6 +414,7 @@ Future<dynamic> showTextInputDialog(
   bool alwaysShowSuccessState = false,
   bool isPasswordInput = false,
   bool useRootNavigator = false,
+  VoidCallback? onCancel,
 }) {
   return showDialog(
     barrierColor: backdropFaintDark,

mobile/apps/auth/pubspec.lock

@@ -1153,9 +1153,9 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "91e4d1a9c55b28bf93425d1f12faf410efc1e48d"
-      resolved-ref: "91e4d1a9c55b28bf93425d1f12faf410efc1e48d"
-      url: "https://github.com/Sayegh7/move_to_background"
+      ref: v2-only
+      resolved-ref: "0cdfeed654d79636eff0c57110f3f6ad5801ba2f"
+      url: "https://github.com/ente-io/move_to_background.git"
     source: git
     version: "1.0.2"
   native_dio_adapter:

mobile/apps/auth/pubspec.yaml

@@ -95,10 +95,10 @@ dependencies:
   local_auth_darwin: ^1.2.2
   logging: ^1.0.1
   modal_bottom_sheet: ^3.0.0
-  move_to_background: # no package updates on pub.dev
+  move_to_background: # no updates in git, replace package
     git:
-      url: https://github.com/Sayegh7/move_to_background
-      ref: 91e4d1a9c55b28bf93425d1f12faf410efc1e48d
+      url: https://github.com/ente-io/move_to_background.git
+      ref: v2-only
   native_dio_adapter: ^1.4.0
   otp: ^3.1.1
   package_info_plus: ^8.0.2

mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart

@@ -53,8 +53,6 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
         widget.collection!.publicURLs.firstOrNull?.enableDownload ?? true;
     final isPasswordEnabled =
         widget.collection!.publicURLs.firstOrNull?.passwordEnabled ?? false;
-    final isJoinEnabled =
-        widget.collection!.publicURLs.firstOrNull?.enableJoin ?? false;
     final enteColorScheme = getEnteColorScheme(context);
     final PublicURL url = widget.collection!.publicURLs.firstOrNull!;
     final String urlValue =
@@ -96,31 +94,6 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
                         AppLocalizations.of(context).allowAddPhotosDescription,
                   ),
                   const SizedBox(height: 24),
-                  if (flagService.internalUser)
-                    MenuItemWidget(
-                      key: ValueKey("Allow join $isJoinEnabled"),
-                      captionedTextWidget: const CaptionedTextWidget(
-                        title: "Allow joining album (i)",
-                      ),
-                      alignCaptionedTextToLeft: true,
-                      menuItemColor: getEnteColorScheme(context).fillFaint,
-                      trailingWidget: ToggleSwitchWidget(
-                        value: () => isJoinEnabled,
-                        onChanged: () async {
-                          await _updateUrlSettings(
-                            context,
-                            {'enableJoin': !isJoinEnabled},
-                          );
-                        },
-                      ),
-                    ),
-                  if (flagService.internalUser)
-                    MenuSectionDescriptionWidget(
-                      content: isCollectEnabled
-                          ? "Allow people with link to join your album as Collaborator"
-                          : "Allow people with link to join your album as Viewer",
-                    ),
-                  if (flagService.internalUser) const SizedBox(height: 24),
                   MenuItemWidget(
                     alignCaptionedTextToLeft: true,
                     captionedTextWidget: CaptionedTextWidget(

mobile/apps/photos/pubspec.yaml

@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.2.6+1205
+version: 1.2.5+1205
 publish_to: none
 
 environment:

mobile/apps/photos/scripts/internal_changes.txt

@@ -1,6 +1,4 @@
-- Neeraj: (i) Add allow joining album option in manage links
-- Neeraj: Fix lock error + improve logViewer
 - Laurens: text embedding caching for memories and discover
 - Neeraj: (i) Option to send qr for link
 - Neeraj: (i) Debug option to enable logViewer
-- Neeraj: Potential fix for ios in-app payment
+- Neeraj: Potential fix for ios in-app payment

mobile/packages/log_viewer/lib/src/ui/log_filter_dialog.dart

@@ -69,7 +69,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
         level,
         style: TextStyle(
           color: isSelected ? Colors.white : color,
-          fontSize: 9,
+          fontSize: 13,
           fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
         ),
       ),
@@ -79,9 +79,9 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
       checkmarkColor: Colors.white,
       side: BorderSide(
         color: isSelected ? color : color.withValues(alpha: 0.3),
-        width: isSelected ? 1.5 : 1,
+        width: isSelected ? 2 : 1,
       ),
-      padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
       onSelected: (selected) {
         setState(() {
           if (selected) {
@@ -103,7 +103,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
         borderRadius: BorderRadius.circular(16),
       ),
       child: Container(
-        constraints: const BoxConstraints(maxWidth: 380, maxHeight: 500),
+        constraints: const BoxConstraints(maxWidth: 400, maxHeight: 600),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(16),
         ),
@@ -112,7 +112,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
           children: [
             // Header
             Container(
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
               decoration: const BoxDecoration(
                 borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
               ),
@@ -123,7 +123,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                     'Filter Logs',
                     style: theme.textTheme.titleLarge?.copyWith(
                       fontWeight: FontWeight.w600,
-                      fontSize: 18,
+                      fontSize: 20,
                     ),
                   ),
                   IconButton(
@@ -140,7 +140,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
             Flexible(
               child: SingleChildScrollView(
                 padding:
-                    const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+                    const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
@@ -149,124 +149,19 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                       'Log Levels',
                       style: theme.textTheme.titleMedium?.copyWith(
                         fontWeight: FontWeight.w600,
-                        fontSize: 14,
+                        fontSize: 16,
                       ),
                     ),
-                    const SizedBox(height: 8),
+                    const SizedBox(height: 12),
                     Wrap(
                       spacing: 8,
-                      runSpacing: 3,
+                      runSpacing: 8,
                       children: LogLevels.all
                           .where((level) => level != 'ALL' && level != 'OFF')
                           .map(_buildLevelChip)
                           .toList(),
                     ),
-                    const SizedBox(height: 16),
-
-                    // Process Prefixes
-                    if (widget.availableProcesses.isNotEmpty) ...[
-                      Text(
-                        'Process',
-                        style: theme.textTheme.titleMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
-                          fontSize: 15,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Container(
-                        constraints: const BoxConstraints(maxHeight: 120),
-                        decoration: BoxDecoration(
-                          border: Border.all(
-                            color: theme.dividerColor.withValues(alpha: 0.5),
-                            width: 1,
-                          ),
-                          borderRadius: BorderRadius.circular(6),
-                          color: theme.cardColor,
-                        ),
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.circular(6),
-                          child: ListView.separated(
-                            shrinkWrap: true,
-                            itemCount: widget.availableProcesses.length,
-                            separatorBuilder: (context, index) => Divider(
-                              height: 1,
-                              thickness: 0.5,
-                              color: theme.dividerColor.withValues(alpha: 0.3),
-                            ),
-                            itemBuilder: (context, index) {
-                              final process = widget.availableProcesses[index];
-                              final isSelected =
-                                  _selectedProcesses.contains(process);
-                              final displayName = LogEntry(
-                                message: '',
-                                level: 'INFO',
-                                timestamp: DateTime.now(),
-                                loggerName: '',
-                                processPrefix: process,
-                              ).processDisplayName;
-
-                              return InkWell(
-                                onTap: () {
-                                  setState(() {
-                                    if (isSelected) {
-                                      _selectedProcesses.remove(process);
-                                    } else {
-                                      _selectedProcesses.add(process);
-                                    }
-                                  });
-                                },
-                                child: Container(
-                                  padding: const EdgeInsets.symmetric(
-                                    horizontal: 12,
-                                    vertical: 8,
-                                  ),
-                                  child: Row(
-                                    children: [
-                                      Expanded(
-                                        child: Text(
-                                          displayName,
-                                          style: TextStyle(
-                                            fontSize: 13,
-                                            color: isSelected
-                                                ? theme.primaryColor
-                                                : theme
-                                                    .textTheme.bodyLarge?.color,
-                                            fontWeight: isSelected
-                                                ? FontWeight.w500
-                                                : FontWeight.normal,
-                                          ),
-                                          overflow: TextOverflow.ellipsis,
-                                        ),
-                                      ),
-                                      SizedBox(
-                                        width: 20,
-                                        height: 20,
-                                        child: Checkbox(
-                                          value: isSelected,
-                                          onChanged: (selected) {
-                                            setState(() {
-                                              if (selected == true) {
-                                                _selectedProcesses.add(process);
-                                              } else {
-                                                _selectedProcesses
-                                                    .remove(process);
-                                              }
-                                            });
-                                          },
-                                          materialTapTargetSize:
-                                              MaterialTapTargetSize.shrinkWrap,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 16),
-                    ],
+                    const SizedBox(height: 20),
 
                     // Loggers
                     if (widget.availableLoggers.isNotEmpty) ...[
@@ -274,22 +169,22 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                         'Loggers',
                         style: theme.textTheme.titleMedium?.copyWith(
                           fontWeight: FontWeight.w600,
-                          fontSize: 15,
+                          fontSize: 16,
                         ),
                       ),
-                      const SizedBox(height: 8),
+                      const SizedBox(height: 12),
                       Container(
-                        constraints: const BoxConstraints(maxHeight: 120),
+                        constraints: const BoxConstraints(maxHeight: 180),
                         decoration: BoxDecoration(
                           border: Border.all(
                             color: theme.dividerColor.withValues(alpha: 0.5),
                             width: 1,
                           ),
-                          borderRadius: BorderRadius.circular(6),
+                          borderRadius: BorderRadius.circular(8),
                           color: theme.cardColor,
                         ),
                         child: ClipRRect(
-                          borderRadius: BorderRadius.circular(6),
+                          borderRadius: BorderRadius.circular(8),
                           child: ListView.separated(
                             shrinkWrap: true,
                             itemCount: widget.availableLoggers.length,
@@ -314,8 +209,8 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                                 },
                                 child: Container(
                                   padding: const EdgeInsets.symmetric(
-                                    horizontal: 12,
-                                    vertical: 8,
+                                    horizontal: 16,
+                                    vertical: 12,
                                   ),
                                   child: Row(
                                     children: [
@@ -323,7 +218,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                                         child: Text(
                                           logger,
                                           style: TextStyle(
-                                            fontSize: 13,
+                                            fontSize: 14,
                                             color: isSelected
                                                 ? theme.primaryColor
                                                 : theme
@@ -336,8 +231,8 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                                         ),
                                       ),
                                       SizedBox(
-                                        width: 20,
-                                        height: 20,
+                                        width: 24,
+                                        height: 24,
                                         child: Checkbox(
                                           value: isSelected,
                                           onChanged: (selected) {
@@ -361,7 +256,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                           ),
                         ),
                       ),
-                      const SizedBox(height: 16),
+                      const SizedBox(height: 20),
                     ],
                   ],
                 ),
@@ -370,7 +265,7 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
 
             // Actions
             Container(
-              padding: const EdgeInsets.all(12),
+              padding: const EdgeInsets.all(16),
               decoration: BoxDecoration(
                 border: Border(
                   top: BorderSide(
@@ -389,8 +284,8 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                     style: TextButton.styleFrom(
                       foregroundColor: theme.colorScheme.error,
                       padding: const EdgeInsets.symmetric(
-                        horizontal: 12,
-                        vertical: 8,
+                        horizontal: 16,
+                        vertical: 10,
                       ),
                     ),
                     child: const Text(
@@ -404,8 +299,8 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                         onPressed: () => Navigator.pop(context),
                         style: TextButton.styleFrom(
                           padding: const EdgeInsets.symmetric(
-                            horizontal: 16,
-                            vertical: 8,
+                            horizontal: 20,
+                            vertical: 10,
                           ),
                         ),
                         child: Text(
@@ -416,13 +311,13 @@ class _LogFilterDialogState extends State<LogFilterDialog> {
                           ),
                         ),
                       ),
-                      const SizedBox(width: 8),
+                      const SizedBox(width: 12),
                       FilledButton(
                         onPressed: _applyFilters,
                         style: FilledButton.styleFrom(
                           padding: const EdgeInsets.symmetric(
-                            horizontal: 20,
-                            vertical: 8,
+                            horizontal: 24,
+                            vertical: 10,
                           ),
                           shape: RoundedRectangleBorder(
                             borderRadius: BorderRadius.circular(8),