Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
padding: 20px;

&::before {
content: "";
content: '';
position: absolute;
inset: 0;
background-image: url('./images/privitty-watermark.png');
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/scss/components/_secure-pdf-viewer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
position: relative;

&::before {
content: "";
content: '';
position: absolute;
inset: 0;
background-image: url('./images/privitty-watermark.png');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
justify-content: center;

&::before {
content: "";
content: '';
position: absolute;
inset: 0;
background-image: url('./images/privitty-watermark.png');
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -615,8 +608,8 @@ export default function FileAccessStatusDialog({
)}
>
{!isOwner && user.role === 'Relay' && (
<span className={styles.youBadge}>You</span>
)}
<span className={styles.youBadge}>You</span>
)}
<div className={styles.userMain}>
<div className={styles.avatar}>{initial}</div>
<div className={styles.userInfo}>
Expand Down
12 changes: 7 additions & 5 deletions packages/frontend/src/components/message/messageFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,14 @@ async function waitForPrivittyProtection(chatId: number): Promise<void> {
}

await new Promise<void>(resolve => {
const unsubscribe = runtime.onPrivittyMessageDetected((protectedChatId: number) => {
if (protectedChatId === chatId) {
unsubscribe()
resolve()
const unsubscribe = runtime.onPrivittyMessageDetected(
(protectedChatId: number) => {
if (protectedChatId === chatId) {
unsubscribe()
resolve()
}
}
})
)
})
}

Expand Down
2 changes: 1 addition & 1 deletion packages/target-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions packages/target-electron/src/privitty/client.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
58 changes: 29 additions & 29 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading