- {trustedSenders.length === 0 ? (
+ {isLoading ? (
+
+
+
+ ) : activeSenders.length === 0 ? (
/* Empty State */
@@ -209,7 +255,7 @@ export function TrustedSendersModal({ isOpen, onClose }: TrustedSendersModalProp
{email}
{/* Footer - Add sender */}
- {trustedSenders.length > 0 && (
+ {!isLoading && activeSenders.length > 0 && (
{isAdding ? (
@@ -244,9 +290,10 @@ export function TrustedSendersModal({ isOpen, onClose }: TrustedSendersModalProp
/>
{emailError && (
diff --git a/lib/debug.ts b/lib/debug.ts
index 116235b2..d8049dac 100644
--- a/lib/debug.ts
+++ b/lib/debug.ts
@@ -104,7 +104,7 @@ export const debug = {
}
};
-const CATEGORY_KEYS = new Set
(['jmap', 'calendar', 'tasks', 'auth', 'filters', 'email', 'push']);
+const CATEGORY_KEYS = new Set(['jmap', 'calendar', 'tasks', 'auth', 'filters', 'email', 'push', 'contacts']);
function isCategoryKey(value: string): value is DebugCategory {
return CATEGORY_KEYS.has(value);
}
diff --git a/lib/jmap/client-interface.ts b/lib/jmap/client-interface.ts
index 2ee86860..8b1a225b 100644
--- a/lib/jmap/client-interface.ts
+++ b/lib/jmap/client-interface.ts
@@ -178,6 +178,7 @@ export interface IJMAPClient {
getContactsAccountId(): string;
getAddressBooks(): Promise;
getAllAddressBooks(): Promise;
+ createAddressBook(name: string): Promise;
updateAddressBook(addressBookId: string, updates: Partial, targetAccountId?: string): Promise;
getContacts(addressBookId?: string): Promise;
getAllContacts(): Promise;
diff --git a/lib/jmap/client.ts b/lib/jmap/client.ts
index cddd4bea..5f5c9771 100644
--- a/lib/jmap/client.ts
+++ b/lib/jmap/client.ts
@@ -2818,6 +2818,27 @@ export class JMAPClient implements IJMAPClient {
}
}
+ async createAddressBook(name: string): Promise {
+ const accountId = this.getContactsAccountId();
+ const response = await this.request([
+ ["AddressBook/set", {
+ accountId,
+ create: { "new-book": { name } },
+ }, "0"]
+ ], this.contactUsing());
+
+ if (response.methodResponses?.[0]?.[0] === "AddressBook/set") {
+ const result = response.methodResponses[0][1];
+ const created = result.created?.["new-book"];
+ if (created) {
+ return { id: created.id, name, ...created } as AddressBook;
+ }
+ const err = result.notCreated?.["new-book"];
+ throw new Error(err?.description || "Failed to create address book");
+ }
+ throw new Error("Failed to create address book");
+ }
+
async updateAddressBook(addressBookId: string, updates: Partial, targetAccountId?: string): Promise {
const accountId = targetAccountId || this.getContactsAccountId();
// Only forward server-settable properties
diff --git a/locales/en/common.json b/locales/en/common.json
index 8062a10e..8a8a6549 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -893,7 +893,10 @@
"remove": "Remove",
"close": "Close",
"invalid_email": "Please enter a valid email address",
- "already_added": "This sender is already trusted"
+ "already_added": "This sender is already trusted",
+ "save_error": "Failed to save — check the Contacts debug log for details",
+ "use_address_book_label": "Sync with address book",
+ "use_address_book_description": "Store trusted senders in a dedicated \"Trusted Senders\" address book so they sync across all your devices"
},
"hover_actions": {
"label": "Quick Hover Actions",
@@ -1197,7 +1200,9 @@
"email": "Email Viewing",
"email_description": "Email rendering, TNEF processing, and mark-as-read",
"push": "Push Notifications",
- "push_description": "Push notification setup and delivery"
+ "push_description": "Push notification setup and delivery",
+ "contacts": "Contacts & Address Books",
+ "contacts_description": "Contact sync, address book operations, and trusted senders"
},
"settings_sync": {
"label": "Settings Sync",
diff --git a/stores/contact-store.ts b/stores/contact-store.ts
index dd844513..ee80767d 100644
--- a/stores/contact-store.ts
+++ b/stores/contact-store.ts
@@ -3,6 +3,7 @@ import { persist } from 'zustand/middleware';
import type { ContactCard, AddressBook, ContactName } from '@/lib/jmap/types';
import type { IJMAPClient } from '@/lib/jmap/client-interface';
import { generateUUID } from '@/lib/utils';
+import { debug } from '@/lib/debug';
export function getContactDisplayName(contact: ContactCard): string {
if (contact.name) {
@@ -44,6 +45,8 @@ export function getContactPhotoUri(contact: ContactCard): string | undefined {
return undefined;
}
+export const TRUSTED_SENDERS_BOOK_NAME = 'Trusted Senders';
+
interface ContactStore {
contacts: ContactCard[];
addressBooks: AddressBook[];
@@ -53,6 +56,12 @@ interface ContactStore {
error: string | null;
supportsSync: boolean;
+ // Trusted senders address book cache (runtime only, not persisted)
+ trustedSenderEmails: string[];
+ trustedSendersBookId: string | null;
+ trustedSendersLoaded: boolean;
+ trustedSendersLoading: boolean;
+
selectedContactIds: Set;
lastSelectedContactId: string | null;
activeTab: 'all' | 'groups';
@@ -95,6 +104,12 @@ interface ContactStore {
renameKeyword: (client: IJMAPClient | null, oldKeyword: string, newKeyword: string) => Promise;
importContacts: (client: IJMAPClient | null, contacts: ContactCard[]) => Promise;
+
+ // Trusted senders address book
+ loadTrustedSendersBook: (client: IJMAPClient) => Promise;
+ addToTrustedSendersBook: (client: IJMAPClient, email: string) => Promise;
+ removeFromTrustedSendersBook: (client: IJMAPClient, email: string) => Promise;
+ isTrustedAddressBookSender: (email: string) => boolean;
}
export const useContactStore = create()(
@@ -139,6 +154,10 @@ export const useContactStore = create()(
isLoading: false,
error: null,
supportsSync: false,
+ trustedSenderEmails: [],
+ trustedSendersBookId: null,
+ trustedSendersLoaded: false,
+ trustedSendersLoading: false,
selectedContactIds: new Set(),
lastSelectedContactId: null,
activeTab: 'all' as const,
@@ -667,6 +686,74 @@ export const useContactStore = create()(
}
},
+ loadTrustedSendersBook: async (client) => {
+ if (get().trustedSendersLoading) return;
+ set({ trustedSendersLoading: true });
+ try {
+ debug.log('contacts', 'Loading trusted senders address book');
+ const books = await client.getAddressBooks();
+ let book = books.find(b => b.name === TRUSTED_SENDERS_BOOK_NAME);
+ if (!book) {
+ debug.log('contacts', 'Creating new trusted senders address book');
+ book = await client.createAddressBook(TRUSTED_SENDERS_BOOK_NAME);
+ }
+ const bookId = book.id;
+ debug.log('contacts', 'Trusted senders book id:', bookId);
+ const contacts = await client.getContacts(bookId);
+ debug.log('contacts', 'Loaded', contacts.length, 'trusted sender contacts');
+ const emails = contacts.flatMap(c =>
+ c.emails ? Object.values(c.emails).map(e => e.address.toLowerCase().trim()) : []
+ ).filter(Boolean);
+ set({ trustedSendersBookId: bookId, trustedSenderEmails: emails, trustedSendersLoaded: true, trustedSendersLoading: false });
+ } catch (error) {
+ debug.error('Failed to load trusted senders address book:', error);
+ set({ trustedSendersLoaded: true, trustedSendersLoading: false });
+ }
+ },
+
+ addToTrustedSendersBook: async (client, email) => {
+ const normalizedEmail = email.toLowerCase().trim();
+ const { trustedSenderEmails } = get();
+ if (trustedSenderEmails.includes(normalizedEmail)) return;
+
+ let bookId = get().trustedSendersBookId;
+ if (!bookId) {
+ await get().loadTrustedSendersBook(client);
+ bookId = get().trustedSendersBookId;
+ }
+ if (!bookId) throw new Error('Could not find or create trusted senders address book');
+
+ debug.log('contacts', 'Adding trusted sender:', normalizedEmail, 'to book:', bookId);
+ await client.createContact({
+ addressBookIds: { [bookId]: true },
+ emails: { email: { address: normalizedEmail } },
+ });
+ set((state) => ({ trustedSenderEmails: [...state.trustedSenderEmails, normalizedEmail] }));
+ debug.log('contacts', 'Trusted sender added successfully');
+ },
+
+ removeFromTrustedSendersBook: async (client, email) => {
+ const normalizedEmail = email.toLowerCase().trim();
+ const { trustedSendersBookId } = get();
+ if (!trustedSendersBookId) return;
+
+ debug.log('contacts', 'Removing trusted sender:', normalizedEmail);
+ const contacts = await client.getContacts(trustedSendersBookId);
+ const match = contacts.find(c =>
+ c.emails && Object.values(c.emails).some(e => e.address.toLowerCase().trim() === normalizedEmail)
+ );
+ if (match) {
+ await client.deleteContact(match.id);
+ debug.log('contacts', 'Trusted sender removed');
+ }
+ set((state) => ({ trustedSenderEmails: state.trustedSenderEmails.filter(e => e !== normalizedEmail) }));
+ },
+
+ isTrustedAddressBookSender: (email) => {
+ const normalizedEmail = email.toLowerCase().trim();
+ return get().trustedSenderEmails.includes(normalizedEmail);
+ },
+
importContacts: async (client, contacts) => {
const { supportsSync } = get();
let imported = 0;
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 870d9fab..8a5f5fb9 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -49,7 +49,7 @@ export const ALL_HOVER_ACTIONS: { id: HoverAction; labelKey: string }[] = [
{ id: 'spam', labelKey: 'spam' },
];
-export type DebugCategory = 'jmap' | 'calendar' | 'tasks' | 'auth' | 'filters' | 'email' | 'push';
+export type DebugCategory = 'jmap' | 'calendar' | 'tasks' | 'auth' | 'filters' | 'email' | 'push' | 'contacts';
export const ALL_DEBUG_CATEGORIES: { id: DebugCategory; labelKey: string }[] = [
{ id: 'jmap', labelKey: 'jmap' },
@@ -59,6 +59,7 @@ export const ALL_DEBUG_CATEGORIES: { id: DebugCategory; labelKey: string }[] = [
{ id: 'filters', labelKey: 'filters' },
{ id: 'email', labelKey: 'email' },
{ id: 'push', labelKey: 'push' },
+ { id: 'contacts', labelKey: 'contacts' },
];
export interface KeywordDefinition {
@@ -140,6 +141,7 @@ interface SettingsState {
// Privacy & Security
sessionTimeout: number; // minutes (0 = never)
trustedSenders: string[]; // Email addresses that can load external content
+ trustedSendersAddressBook: boolean; // Store trusted senders in a dedicated JMAP address book
// Filters
expandedFilterView: boolean;
@@ -273,6 +275,7 @@ const DEFAULT_SETTINGS = {
// Privacy & Security
sessionTimeout: 0, // Never
trustedSenders: [] as string[],
+ trustedSendersAddressBook: false,
// Filters
expandedFilterView: false,