diff --git a/src/main/index.ts b/src/main/index.ts index d66e61c..9cbc968 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -137,7 +137,7 @@ function startRelay(): void { // A text over the Rabbit's SIM: pending here until the Rabbit's next check // sends it and says how it went (relay.ts). function relaySend(contact: string, text: string, refs: MediaRef[]): void { - if (!relay) throw new Error('The Rabbit relay is off: connect it in Settings → Rabbit.') + if (!relay) throw new Error('The Rabbit relay is off: connect it in Settings → jai.') const kind = refs.length || isGroup(contact) ? 'mms' : 'sms' const tempId = db.insertPending({ did: SIM_DID, contact, direction: 'out', body: text, ts: Date.now(), kind, ...(refs.length ? { media: refs } : {}) }) relay.send(tempId, contact, text, refs) diff --git a/src/main/relay.ts b/src/main/relay.ts index ff2baae..2fec5b8 100644 --- a/src/main/relay.ts +++ b/src/main/relay.ts @@ -228,7 +228,7 @@ export class RelayEngine extends EventEmitter { body: JSON.stringify({ device: 'desktop', since, push: push.map((r) => r.blob) }), signal: AbortSignal.timeout(120_000) }) - if (res.status === 401) throw new Error('jai turned down the token. Check it in Settings → Rabbit.') + if (res.status === 401) throw new Error('jai turned down the token. Check it in Settings → jai.') if (!res.ok) throw new Error(`jai answered ${res.status}`) const body = (await res.json()) as { cursor: number; events: string[]; more: boolean } // Only now that jai has them: out of the outbox. diff --git a/src/renderer/src/components/SettingsDialog.tsx b/src/renderer/src/components/SettingsDialog.tsx index 06c67c6..4f5d54f 100644 --- a/src/renderer/src/components/SettingsDialog.tsx +++ b/src/renderer/src/components/SettingsDialog.tsx @@ -18,7 +18,7 @@ export function SettingsDialog({ state, sync, onClose, onChanged }: Props) { const [s, setS] = useState(state.settings) const [note, setNote] = useState() const [page, setPage] = useState('Appearance') - // voip.ms numbers; Google Voice has its own page. + // voip.ms numbers; Google Voice has its own section. const smsDids = state.dids.filter((d) => d.smsEnabled && d.provider !== 'gvoice') useEffect(() => { @@ -126,65 +126,59 @@ export function SettingsDialog({ state, sync, onClose, onChanged }: Props) { ), - Account: ( -
-

voip.ms

-
- voip.ms user - {state.username} -
-
- Messages stored - {sync?.total.toLocaleString() ?? '—'} -
-
- History import - {sync?.backfillDone ? 'Complete' : sync?.backfillCursor ? `In progress (back to ${sync.backfillCursor})` : 'Pending'} -
-
- Password stored in - - {state.keyringBackend.startsWith('gnome') || state.keyringBackend.includes('libsecret') - ? 'GNOME Keyring' - : state.keyringBackend} - -
-
- -
-
- ), - 'Google Voice': , - Contacts: change({ ...s, contactBook })} />, - ...(smsDids.length > 0 && { - Numbers: ( + Accounts: ( + <>
-

Numbers to sync

- {smsDids.map((d) => ( - - ))} +

voip.ms

+
+ voip.ms user + {state.username} +
+
+ Password stored in + + {state.keyringBackend.startsWith('gnome') || state.keyringBackend.includes('libsecret') + ? 'GNOME Keyring' + : state.keyringBackend} + +
+
+ +
+
+ +
+

Numbers

+ {smsDids.length > 0 && ( + <> +

Sync these voip.ms numbers:

+ {smsDids.map((d) => ( + + ))} + + )} {sendFrom.length > 1 && ( )} + + +
+ Messages stored + {sync?.total.toLocaleString() ?? '—'} +
+
+ History import + + {sync?.backfillDone ? 'Complete' : sync?.backfillCursor ? `In progress (back to ${sync.backfillCursor})` : 'Pending'} + +
- ) - }), - Sync: ( -
-

Checking

- - -
- ), - Rabbit: ( - <> - - ), + Contacts: change({ ...s, contactBook })} />, + Rabbit: , + jai: , Storage: (

Storage & backups

@@ -526,7 +526,7 @@ function RelaySection({ onChanged }: { onChanged: () => void }) { .relayConnect(url, token) .then(() => { setToken('') - setDone('Connected. Now use Sync to Rabbit (above) once, with the Rabbit plugged in, so it gets the key.') + setDone('Connected. Now use Sync to Rabbit (on the Rabbit page) once, with the Rabbit plugged in, so it gets the key.') refresh() onChanged() }) @@ -550,7 +550,7 @@ function RelaySection({ onChanged }: { onChanged: () => void }) { : undefined return (
-

Rabbit relay (jai)

+

Rabbit relay

Texts the Rabbit's SIM card sends and gets show up here, you can text from it here (as "Rabbit SIM"), and chat names and read/unread/archived stay in step with the Rabbit without plugging it in. It goes through jai, which only passes on sealed messages