Fix attachments

docs/UPSTREAM-MERGE-GUIDE.md

@@ -1,3 +1,8 @@
+<!--
+Copyright 2026 Lockdown Systems LLC
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
 # Observer Vault: Upstream Merge Guide
 
 This document describes Observer Vault's customizations from Signal-Desktop and how to merge upstream releases.
@@ -181,10 +186,10 @@ Upstream changes function signatures:
 // CONFLICT: Function signature changed
 // SOLUTION: Update to new signature but keep our logic
 export function shouldShowCallQualitySurvey(
-  newParam: NewType,  // Accept new parameter
+  newParam: NewType, // Accept new parameter
   cqsTestMode?: boolean
 ): boolean {
-  return false;  // Keep our disabled implementation
+  return false; // Keep our disabled implementation
 }
 ```
 

scripts/audit-customizations.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright 2026 Lockdown Systems LLC
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # List all Observer Vault customizations
 #

scripts/fix-ringrtc-imports.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright 2026 Lockdown Systems LLC
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # Fix RingRTC imports after merge
 #

scripts/merge-upstream.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright 2026 Lockdown Systems LLC
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # Observer Vault: Merge Upstream Signal-Desktop
 #

ts/background.preload.ts

@@ -557,9 +557,8 @@ export async function startApp(): Promise<void> {
     // Observer Vault: Initialize settings (stories off, camera/mic disabled)
     drop(
       (async () => {
-        const { initializeObserverVaultSettings } = await import(
-          './observervault/initializeSettings.preload.js'
-        );
+        const { initializeObserverVaultSettings } =
+          await import('./observervault/initializeSettings.preload.js');
         await initializeObserverVaultSettings();
       })()
     );

ts/calling/VideoSupport.preload.ts

@@ -5,7 +5,10 @@
 
 // Observer Vault: videoPixelFormatToEnum unused (spawnSender removed)
 // import { videoPixelFormatToEnum } from '@lockdown-systems/ringrtc';
-import type { VideoFrameSender, VideoFrameSource } from '@lockdown-systems/ringrtc';
+import type {
+  VideoFrameSender,
+  VideoFrameSource,
+} from '@lockdown-systems/ringrtc';
 import type { RefObject } from 'react';
 import { createLogger } from '../logging/log.std.js';
 // Observer Vault: toLogFormat unused (startCapturing removed)

ts/messageModifiers/AttachmentDownloads.preload.ts

@@ -16,6 +16,9 @@ import {
 } from '../util/migrations.preload.js';
 import { getMessageById } from '../messages/getMessageById.preload.js';
 import { trimMessageWhitespace } from '../types/BodyRange.std.js';
+// Observer Vault: Import the immediate save function
+import { saveAttachmentToObserverVault } from '../observervault/messageHandler.preload.js';
+import { drop } from '../util/drop.std.js';
 
 const { omit } = lodash;
 
@@ -88,6 +91,19 @@ export async function addAttachmentToMessage(
     return;
   }
 
+  // Observer Vault: Immediately save downloaded attachments to avoid loss from
+  // message expiration. This runs synchronously with download completion.
+  if (type === 'attachment' && isDownloaded(attachment)) {
+    drop(
+      saveAttachmentToObserverVault(attachment, messageId).catch(error => {
+        log.error(
+          `${logPrefix}: Observer Vault save failed:`,
+          error instanceof Error ? error.message : String(error)
+        );
+      })
+    );
+  }
+
   if (type === 'long-message') {
     let handledAnywhere = false;
     let attachmentData: Uint8Array | undefined;

ts/observervault/initializeSettings.preload.ts

@@ -26,7 +26,7 @@ export async function initializeObserverVaultSettings(): Promise<void> {
   try {
     const { getStoriesDisabled } = await import('../util/stories.preload.js');
     const storiesDisabled = getStoriesDisabled();
-    
+
     if (!storiesDisabled) {
       log.info('Stories not disabled, disabling now...');
       await setStoriesDisabled(true);
@@ -41,7 +41,7 @@ export async function initializeObserverVaultSettings(): Promise<void> {
   // 2. Disable microphone access
   try {
     const hasMediaPermissions = await window.Events.getMediaPermissions();
-    
+
     if (hasMediaPermissions !== false) {
       log.info('Microphone access not disabled, disabling now...');
       await window.IPC.setMediaPermissions(false);
@@ -55,8 +55,9 @@ export async function initializeObserverVaultSettings(): Promise<void> {
 
   // 3. Disable camera access
   try {
-    const hasMediaCameraPermissions = await window.Events.getMediaCameraPermissions();
-
+    const hasMediaCameraPermissions =
+      await window.Events.getMediaCameraPermissions();
+
     if (hasMediaCameraPermissions !== false) {
       log.info('Camera access not disabled, disabling now...');
       await window.IPC.setMediaCameraPermissions(false);