diff --git a/README.md b/README.md index 04e83d0d..2af4bb24 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ pnpm -w build:electron && pnpm --filter=@deltachat-desktop/target-electron exec ```sh cd /Users/milinddeore/PROJECTS/delta/privitty-desktop +pnpm install --no-frozen-lockfile pnpm -w build:electron cd /Users/milinddeore/PROJECTS/delta/privitty-desktop/packages/target-electron export CSC_IDENTITY_AUTO_DISCOVERY=false diff --git a/package.json b/package.json index e807adb2..a4ca846c 100644 --- a/package.json +++ b/package.json @@ -69,10 +69,10 @@ "lodash": ">=4.17.23", "js-yaml": ">=4.1.1", "minimatch@>=9.0.0 <10.2.1": "10.2.1", - "@privitty/privitty-core-darwin-arm64": "0.4.2", - "@privitty/privitty-core-darwin-x64": "0.4.2", - "@privitty/privitty-core-linux-x64": "0.4.2", - "@privitty/privitty-core-win32-x64": "0.4.2" + "@privitty/privitty-core-darwin-arm64": "0.4.3", + "@privitty/privitty-core-darwin-x64": "0.4.3", + "@privitty/privitty-core-linux-x64": "0.4.3", + "@privitty/privitty-core-win32-x64": "0.4.3" } }, "devDependencies": { diff --git a/packages/frontend/scss/components/_secure-image-viewer.scss b/packages/frontend/scss/components/_secure-image-viewer.scss index ab3d0e9b..232f2865 100644 --- a/packages/frontend/scss/components/_secure-image-viewer.scss +++ b/packages/frontend/scss/components/_secure-image-viewer.scss @@ -115,7 +115,7 @@ padding: 20px; &::before { - content: ""; + content: ''; position: absolute; inset: 0; background-image: url('./images/privitty-watermark.png'); diff --git a/packages/frontend/scss/components/_secure-pdf-viewer.scss b/packages/frontend/scss/components/_secure-pdf-viewer.scss index 68fda814..bb736248 100644 --- a/packages/frontend/scss/components/_secure-pdf-viewer.scss +++ b/packages/frontend/scss/components/_secure-pdf-viewer.scss @@ -72,7 +72,7 @@ position: relative; &::before { - content: ""; + content: ''; position: absolute; inset: 0; background-image: url('./images/privitty-watermark.png'); diff --git a/packages/frontend/scss/components/_secure-video-viewer.scss b/packages/frontend/scss/components/_secure-video-viewer.scss index b3a996f2..2d4aaca8 100644 --- a/packages/frontend/scss/components/_secure-video-viewer.scss +++ b/packages/frontend/scss/components/_secure-video-viewer.scss @@ -107,7 +107,7 @@ justify-content: center; &::before { - content: ""; + content: ''; position: absolute; inset: 0; background-image: url('./images/privitty-watermark.png'); diff --git a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx index f05a5656..9aaab5f8 100644 --- a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx +++ b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx @@ -1,13 +1,6 @@ import React, { useEffect, useMemo, useState } from 'react' import { runtime } from '@deltachat-desktop/runtime-interface' -import { - DialogBody, - DialogContent, - DialogFooter, - DialogWithHeader, - FooterActionButton, - FooterActions, -} from '../Dialog' +import { DialogBody, DialogContent, DialogWithHeader } from '../Dialog' import useTranslationFunction from '../../hooks/useTranslationFunction' import { avatarInitial } from '../Avatar' import { basename } from 'path' @@ -615,8 +608,8 @@ export default function FileAccessStatusDialog({ )} > {!isOwner && user.role === 'Relay' && ( - You - )} + You + )}
{initial}
diff --git a/packages/frontend/src/components/message/messageFunctions.ts b/packages/frontend/src/components/message/messageFunctions.ts index de6c2ee4..44fb0346 100644 --- a/packages/frontend/src/components/message/messageFunctions.ts +++ b/packages/frontend/src/components/message/messageFunctions.ts @@ -552,12 +552,14 @@ async function waitForPrivittyProtection(chatId: number): Promise { } await new Promise(resolve => { - const unsubscribe = runtime.onPrivittyMessageDetected((protectedChatId: number) => { - if (protectedChatId === chatId) { - unsubscribe() - resolve() + const unsubscribe = runtime.onPrivittyMessageDetected( + (protectedChatId: number) => { + if (protectedChatId === chatId) { + unsubscribe() + resolve() + } } - }) + ) }) } diff --git a/packages/target-electron/package.json b/packages/target-electron/package.json index 5f3b1c6b..f90d44ef 100644 --- a/packages/target-electron/package.json +++ b/packages/target-electron/package.json @@ -64,7 +64,7 @@ "dependencies": { "@deltachat/jsonrpc-client": "catalog:", "@privitty/deltachat-rpc-server": "1.160.0", - "@privitty/privitty-core": "0.4.2", + "@privitty/privitty-core": "0.4.3", "mime-types": "catalog:", "sass": "catalog:", "ws": "7.5.10" diff --git a/packages/target-electron/src/privitty/client.ts b/packages/target-electron/src/privitty/client.ts index 30736bdc..9b2c1a97 100644 --- a/packages/target-electron/src/privitty/client.ts +++ b/packages/target-electron/src/privitty/client.ts @@ -1,4 +1,5 @@ import { join, dirname } from 'path' +import { createRequire } from 'module' import { getLogger } from '@deltachat-desktop/shared/logger' import { ChildProcessWithoutNullStreams, spawn } from 'child_process' import { getLogsPath } from '../application-constants' @@ -7,6 +8,15 @@ import { app, dialog } from 'electron/main' import { existsSync, readdirSync } from 'fs' import { fileURLToPath } from 'url' +const _require = createRequire(import.meta.url) +const privittyCoreVersion: string = (() => { + try { + return _require('@privitty/privitty-core/package.json').version + } catch { + return 'unknown' + } +})() + const log = getLogger('Privitty') export class PrivittyClient { @@ -152,6 +162,7 @@ export class PrivittyClient { } start() { + log.info(`Privitty Core version: ${privittyCoreVersion}`) log.info('Starting privitty-server', { binary: this._cmd_path, accountsPath: this.accounts_path, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68ea2593..5287fa17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,10 +38,10 @@ overrides: lodash: '>=4.17.23' js-yaml: '>=4.1.1' minimatch@>=9.0.0 <10.2.1: 10.2.1 - '@privitty/privitty-core-darwin-arm64': 0.4.2 - '@privitty/privitty-core-darwin-x64': 0.4.2 - '@privitty/privitty-core-linux-x64': 0.4.2 - '@privitty/privitty-core-win32-x64': 0.4.2 + '@privitty/privitty-core-darwin-arm64': 0.4.3 + '@privitty/privitty-core-darwin-x64': 0.4.3 + '@privitty/privitty-core-linux-x64': 0.4.3 + '@privitty/privitty-core-win32-x64': 0.4.3 importers: @@ -342,8 +342,8 @@ importers: specifier: 1.160.0 version: 1.160.0(@deltachat/jsonrpc-client@1.159.5(ws@7.5.10)) '@privitty/privitty-core': - specifier: 0.4.2 - version: 0.4.2 + specifier: 0.4.3 + version: 0.4.3 mime-types: specifier: 'catalog:' version: 2.1.35 @@ -1519,33 +1519,33 @@ packages: peerDependencies: '@deltachat/jsonrpc-client': '*' - '@privitty/privitty-core-darwin-arm64@0.4.2': - resolution: {integrity: sha512-hZBXz4Tb59WKxHKiwhoddN5PuvtLC2ic+MyNV3G6qCVqMn6to2z74JNoEaZQFskXuVNu5aFCtBJKZGT/x6+HtA==} + '@privitty/privitty-core-darwin-arm64@0.4.3': + resolution: {integrity: sha512-d4QvjxVkkoNoFB+fqjL9MBxUTq7ldeKcH735lzN0yKLxhoC1wACkivsI3cNBo18xhIlZ+l3kDYyIcteiOM2ptg==} cpu: [arm64] os: [darwin] - '@privitty/privitty-core-darwin-universal@0.4.2': - resolution: {integrity: sha512-ypCHYBdhZsYaHVv82DwcWJ+jbG5aSiJ4EmteBC6AjKFQvDIsz5cGAghlCUH4/OP2fDga90L4qbZWNwexOWZ0BA==} + '@privitty/privitty-core-darwin-universal@0.4.3': + resolution: {integrity: sha512-qU1AfuCj6Di0bYM8EB1efm6NwFg9gkiHN0WQkPpB3b8RGvQUFN419wfVgig/pvhOtTwTuc6YDOkxoDGK4cG+1A==} cpu: [arm64, x64] os: [darwin] - '@privitty/privitty-core-darwin-x64@0.4.2': - resolution: {integrity: sha512-Kq5FWhv2c8rrqmkt0cprwsbDtu7DO6EaP386T0yiFAuMz4xgTM7Z9Oga2ShI2iPdT4bzEXS/w8bRGKNSkT2OfQ==} + '@privitty/privitty-core-darwin-x64@0.4.3': + resolution: {integrity: sha512-OiEdfSaVK/7j6AGqronZ85+WZ9n+xBEW90cI28dkz+xW+ROHslSRE7WmWJWMyLk+OVABDPnYrne4HGU5fjLvtg==} cpu: [x64] os: [darwin] - '@privitty/privitty-core-linux-x64@0.4.2': - resolution: {integrity: sha512-yoyKGkmTU7Lz7VtwzMIQE0e9QBIFuOZCPKFnFn9t/NVzMeajSUSKcM9wexndNL/t0qiR3VVF/wsnLa0TVygO3g==} + '@privitty/privitty-core-linux-x64@0.4.3': + resolution: {integrity: sha512-yM6fgi9kh6bJKjW+L43rJj93GUlpwSyJD3zy/mc/EB41+iKloZhxI5pXGrDk3MpjUh2k0Vjwqhst/Bk7PiOv1w==} cpu: [x64] os: [linux] - '@privitty/privitty-core-win32-x64@0.4.2': - resolution: {integrity: sha512-LGGTnczim8LfOJqKkOqP0J5pO4GystX4MOaDcxli9LKZBCkPstFbsaVfCkCYDCKVZrDlGujlPWjGx54q0IvHkw==} + '@privitty/privitty-core-win32-x64@0.4.3': + resolution: {integrity: sha512-W/6D/ACuhjrWa1GmWRksq/dfvmvvguBwfDGRczscwesUPI7Alsjd1kLvlFOotud9h8neFkGRWpQp70CYgfyt1A==} cpu: [x64] os: [win32] - '@privitty/privitty-core@0.4.2': - resolution: {integrity: sha512-ZEpyzpkZQ12INLPfU5D4kosgU9Kknc2D+MZGcSYI3c5WlDIWPY7Kmice1Dr6jr1g6oJ87nrGMiQWcZ4TIbil1A==} + '@privitty/privitty-core@0.4.3': + resolution: {integrity: sha512-KBQiYw4akMAFO0smmgOgA5fiIIghYQAp6kEKJpjrZaqg+RvHK1ub5WhFbC+DOJGylHLDg4Cp10RkaLCj8scLcQ==} engines: {node: '>=14.0.0'} cpu: [x64, arm64] os: [darwin, linux, win32] @@ -5107,28 +5107,28 @@ snapshots: '@privitty/deltachat-rpc-server-win32-ia32': 1.160.0 '@privitty/deltachat-rpc-server-win32-x64': 1.160.0 - '@privitty/privitty-core-darwin-arm64@0.4.2': + '@privitty/privitty-core-darwin-arm64@0.4.3': optional: true - '@privitty/privitty-core-darwin-universal@0.4.2': + '@privitty/privitty-core-darwin-universal@0.4.3': optional: true - '@privitty/privitty-core-darwin-x64@0.4.2': + '@privitty/privitty-core-darwin-x64@0.4.3': optional: true - '@privitty/privitty-core-linux-x64@0.4.2': + '@privitty/privitty-core-linux-x64@0.4.3': optional: true - '@privitty/privitty-core-win32-x64@0.4.2': + '@privitty/privitty-core-win32-x64@0.4.3': optional: true - '@privitty/privitty-core@0.4.2': + '@privitty/privitty-core@0.4.3': optionalDependencies: - '@privitty/privitty-core-darwin-arm64': 0.4.2 - '@privitty/privitty-core-darwin-universal': 0.4.2 - '@privitty/privitty-core-darwin-x64': 0.4.2 - '@privitty/privitty-core-linux-x64': 0.4.2 - '@privitty/privitty-core-win32-x64': 0.4.2 + '@privitty/privitty-core-darwin-arm64': 0.4.3 + '@privitty/privitty-core-darwin-universal': 0.4.3 + '@privitty/privitty-core-darwin-x64': 0.4.3 + '@privitty/privitty-core-linux-x64': 0.4.3 + '@privitty/privitty-core-win32-x64': 0.4.3 '@sindresorhus/is@4.6.0': {}