Expose sendUpdateInterval & sendUpdateMaxSize

- don't open webxdc on notification click
deltachat · Dec 11, 2024 · a0a45f9 · a0a45f9
1 parent 3edca1f
commit a0a45f9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 33 deletions.
diff --git a/packages/frontend/src/components/RuntimeAdapter.tsx b/packages/frontend/src/components/RuntimeAdapter.tsx
@@ -11,8 +11,6 @@ import useDialog from '../hooks/dialog/useDialog'
 import WebxdcSaveToChatDialog from './dialogs/WebxdcSendToChat'
 import { saveLastChatId } from '../backend/chat'
 import useChat from '../hooks/chat/useChat'
-import { internalOpenWebxdc } from '../system-integration/webxdc'
-import { BackendRemote } from '../backend-com'
 
 type Props = {
   accountId?: number
@@ -44,12 +42,7 @@ export default function RuntimeAdapter({
     }
 
     runtime.setNotificationCallback(
-      async ({
-        accountId: notificationAccountId,
-        msgId,
-        chatId,
-        isWebxdcInfo,
-      }) => {
+      async ({ accountId: notificationAccountId, msgId, chatId }) => {
         if (accountId !== notificationAccountId) {
           closeAllDialogs()
           // selectAccount always loads the last used chat
@@ -59,10 +52,6 @@ export default function RuntimeAdapter({
           await window.__selectAccount(notificationAccountId)
         } else if (chatId !== 0) {
           await selectChat(accountId, chatId)
-          if (isWebxdcInfo) {
-            const message = await BackendRemote.rpc.getMessage(accountId, msgId)
-            internalOpenWebxdc(accountId, message)
-          }
           clearNotificationsForChat(notificationAccountId, chatId)
         }
         if (msgId) {

diff --git a/packages/runtime/runtime.ts b/packages/runtime/runtime.ts
@@ -115,12 +115,7 @@ export interface Runtime {
   clearNotifications(chatId: number): void
   // enables to set a callback (used in frontend RuntimeAdapter)
   setNotificationCallback(
-    cb: (data: {
-      accountId: number
-      chatId: number
-      msgId: number
-      isWebxdcInfo: boolean
-    }) => void
+    cb: (data: { accountId: number; chatId: number; msgId: number }) => void
   ): void
   /** @param name optional name needed for browser */
   writeClipboardToTempFile(name?: string): Promise<string>

diff --git a/packages/target-browser/runtime-browser/runtime.ts b/packages/target-browser/runtime-browser/runtime.ts
@@ -384,12 +384,7 @@ class BrowserRuntime implements Runtime {
   }
 
   setNotificationCallback(
-    cb: (data: {
-      accountId: number
-      chatId: number
-      msgId: number
-      isWebxdcInfo: boolean
-    }) => void
+    cb: (data: { accountId: number; chatId: number; msgId: number }) => void
   ): void {
     this.notificationCB = cb
   }

diff --git a/packages/target-electron/runtime-electron/runtime.ts b/packages/target-electron/runtime-electron/runtime.ts
@@ -194,12 +194,7 @@ class ElectronRuntime implements Runtime {
     isWebxdcInfo: boolean
   }) => void = () => {}
   setNotificationCallback(
-    cb: (data: {
-      accountId: number
-      chatId: number
-      msgId: number
-      isWebxdcInfo: boolean
-    }) => void
+    cb: (data: { accountId: number; chatId: number; msgId: number }) => void
   ): void {
     this.notificationCallback = cb
   }

diff --git a/packages/target-electron/src/deltachat/webxdc.ts b/packages/target-electron/src/deltachat/webxdc.ts
@@ -100,6 +100,7 @@ export default class DCWebxdc extends SplitOut {
     ) => {
       const { webxdcInfo, chatName, displayname, accountId, href } = p
       const addr = webxdcInfo.selfAddr
+      const { sendUpdateInterval, sendUpdateMaxSize } = webxdcInfo
       let base64EncodedHref = ''
       const appURL = `webxdc://${accountId}.${msg_id}.webxdc`
       if (href && href !== '') {
@@ -222,7 +223,9 @@ export default class DCWebxdc extends SplitOut {
             // initializes the preload script, the actual implementation of `window.webxdc` is found there: static/webxdc-preload.js
             return makeResponse(
               Buffer.from(
-                `window.parent.webxdc_internal.setup("${selfAddr}","${displayName}")
+                `window.parent.webxdc_internal.setup("${selfAddr}","${displayName}", ${Number(
+                  sendUpdateInterval
+                )}, ${Number(sendUpdateMaxSize)})
                 window.webxdc = window.parent.webxdc
                 window.webxdc_custom = window.parent.webxdc_custom`
               ),

diff --git a/packages/target-electron/src/notifications.ts b/packages/target-electron/src/notifications.ts
@@ -38,7 +38,7 @@ if (Notification.isSupported()) {
 
 function createNotification(data: DcNotification): Notification {
   let icon: NativeImage | undefined = data.icon
-    ? data.icon.indexOf('base64') > -1
+    ? data.icon.startsWith('data:')
       ? nativeImage.createFromDataURL(data.icon)
       : nativeImage.createFromPath(data.icon)
     : undefined

diff --git a/packages/target-electron/static/webxdc-preload.js b/packages/target-electron/static/webxdc-preload.js
@@ -247,12 +247,14 @@ class RealtimeListener {
   const connections = []
 
   contextBridge.exposeInMainWorld('webxdc_internal', {
-    setup: (selfAddr, selfName) => {
+    setup: (selfAddr, selfName, sendUpdateInterval, sendUpdateMaxSize) => {
       if (is_ready) {
         return
       }
       api.selfAddr = Buffer.from(selfAddr, 'base64').toString('utf-8')
       api.selfName = Buffer.from(selfName, 'base64').toString('utf-8')
+      api.sendUpdateInterval = sendUpdateInterval ? sendUpdateInterval : 1000
+      api.sendUpdateMaxSize = sendUpdateMaxSize ? sendUpdateMaxSize : 18874368
 
       // be sure that webxdc.js was included
       contextBridge.exposeInMainWorld('webxdc', api)