release-3.22 (#4739)

.cspell.json

@@ -35,6 +35,7 @@
     "webviews",
     "winstaller",
     "wireapp",
-    "zipball"
+    "zipball",
+    "zuid"
   ]
 }

.github/dependabot.yml

@@ -7,16 +7,14 @@ updates:
       time: '07:00'
       timezone: 'Europe/Berlin'
     open-pull-requests-limit: 99
-    assignees:
-      - ffflorian
     versioning-strategy: increase
     ignore:
       - dependency-name: '@types/node'
         versions:
           - '>= 13.x'
       - dependency-name: electron
         versions:
-          - '>= 10.x'
+          - '>= 11.x'
       - dependency-name: electron-builder
         versions:
           - '>= 21.x'
@@ -26,6 +24,4 @@ updates:
       interval: weekly
       day: sunday
     open-pull-requests-limit: 99
-    assignees:
-      - ffflorian
     versioning-strategy: increase

.github/workflows/build_test.yml

@@ -9,16 +9,12 @@ on:
 jobs:
   build_test:
     name: Build and Test
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.5.0
         with:
-          access_token: ${{ github.token }}
+          access_token: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }}
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
@@ -33,6 +29,5 @@ jobs:
         run: yarn --frozen-lockfile
       - name: Use xvfb-run on Linux
         run: sed -i 's/\(electron-mocha \)/xvfb-run \1/g' package.json
-        if: contains(matrix.os, 'ubuntu')
       - name: Test
         run: yarn test

.github/workflows/codeql-analysis.yml

@@ -6,13 +6,8 @@
 name: 'CodeQL'
 
 on:
-  push:
-    branches: [dev, main, staging]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [dev]
   schedule:
-    - cron: '0 18 * * 1'
+    - cron: '0 18 * * MON'
 
 jobs:
   analyze:

.github/workflows/download_translations.yml

@@ -1,9 +1,6 @@
 name: Download translations
 
 on:
-  push:
-    branches:
-      - dev
   schedule:
     - cron: '0 6 * * *'
 
@@ -18,7 +15,7 @@ jobs:
       - name: Download translations
         uses: crowdin/github-action@1.0.9
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }}
           CROWDIN_PROJECT_ID: 342373
         with:
           upload_sources: false

app-config/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.27.5",
-    "wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.27.6-0"
+    "wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.28.2",
+    "wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.28.3-0"
   }
 }

bin/bin-utils.ts

@@ -18,7 +18,7 @@
 
 import {LogFactory, Logger} from '@wireapp/commons/src/main/LogFactory';
 import {exec} from 'child_process';
-import commander from 'commander';
+import {OptionValues} from 'commander';
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
@@ -57,7 +57,7 @@ export const getLogger = (namespace: string, name: string): Logger =>
   LogFactory.getLogger(name, {forceEnable: true, namespace: `@wireapp/${namespace}`, separator: '/'});
 
 export function checkCommanderOptions(
-  commanderInstance: typeof commander,
+  commanderInstance: OptionValues,
   logdownInstance: Logger,
   options: string[],
 ): void {

bin/build-tools/build-cli.ts

@@ -56,7 +56,7 @@ commander
 const platform = (commander.args[0] || '').toLowerCase();
 
 (async () => {
-  const {envFile, manualSign, wireJson, packageJson}: CommanderData = commander as any;
+  const {envFile, manualSign, wireJson, packageJson} = commander.opts() as CommanderData;
 
   switch (platform) {
     case 'win':

bin/deploy-tools/github-draft-cli.ts

@@ -36,10 +36,12 @@ commander
   .option('-w, --wrapper-build <build>', 'Specify the wrapper build (e.g. "Linux#3.7.1234")')
   .parse(process.argv);
 
-checkCommanderOptions(commander, logger, ['githubToken', 'wrapperBuild']);
+const commanderOptions = commander.opts();
 
-if (!commander.wrapperBuild.includes('#')) {
-  logger.error(`Invalid wrapper build id "${commander.wrapperBuild}"`);
+checkCommanderOptions(commanderOptions, logger, ['githubToken', 'wrapperBuild']);
+
+if (!commanderOptions.wrapperBuild.includes('#')) {
+  logger.error(`Invalid wrapper build id "${commanderOptions.wrapperBuild}"`);
   commander.outputHelp();
   process.exit(1);
 }
@@ -52,8 +54,8 @@ const endsWithAny = (suffixes: string[], str: string) => suffixes.some(suffix =>
   let PLATFORM: string;
   const extensions = [FileExtension.ASC, FileExtension.SIG];
 
-  const [platform, version] = commander.wrapperBuild.toLowerCase().split('#');
-  const basePath = commander.path || path.resolve('.');
+  const [platform, version] = commanderOptions.wrapperBuild.toLowerCase().split('#');
+  const basePath = commanderOptions.path || path.resolve('.');
 
   if (platform.includes('linux')) {
     PLATFORM = 'Linux';
@@ -70,12 +72,12 @@ const endsWithAny = (suffixes: string[], str: string) => suffixes.some(suffix =>
 
   const {stdout: commitId} = await execAsync('git rev-parse HEAD');
   const changelog = '...';
-  const githubToken = commander.githubToken;
+  const githubToken = commanderOptions.githubToken;
 
   logger.log('Creating a draft ...');
 
   const githubDraftDeployer = new GitHubDraftDeployer({
-    dryRun: commander.dryRun || false,
+    dryRun: commanderOptions.dryRun || false,
     githubToken,
     repoSlug,
   });

bin/deploy-tools/hockey-cli.ts

@@ -37,10 +37,12 @@ commander
   .option('-w, --wrapper-build <build>', 'Specify the wrapper build (e.g. "Linux#3.7.1234")')
   .parse(process.argv);
 
-checkCommanderOptions(commander, logger, ['hockeyToken', 'hockeyId', 'wrapperBuild']);
+const commanderOptions = commander.opts();
 
-if (!commander.wrapperBuild.includes('#')) {
-  logger.error(`Invalid wrapper build id "${commander.wrapperBuild}"`);
+checkCommanderOptions(commanderOptions, logger, ['hockeyToken', 'hockeyId', 'wrapperBuild']);
+
+if (!commanderOptions.wrapperBuild.includes('#')) {
+  logger.error(`Invalid wrapper build id "${commanderOptions.wrapperBuild}"`);
   commander.outputHelp();
   process.exit(1);
 }
@@ -57,9 +59,9 @@ function getUploadFile(platform: string, basePath: string): Promise<FindResult>
 }
 
 (async () => {
-  const {hockeyId, hockeyToken, wrapperBuild} = commander;
+  const {hockeyId, hockeyToken, wrapperBuild} = commanderOptions;
   const [platform, version] = wrapperBuild.toLowerCase().split('#');
-  const searchBasePath = commander.path || path.resolve('.');
+  const searchBasePath = commanderOptions.path || path.resolve('.');
   const [majorVersion, minorVersion] = version.split('.');
 
   const {filePath} = await getUploadFile(platform, searchBasePath);
@@ -71,7 +73,7 @@ function getUploadFile(platform: string, basePath: string): Promise<FindResult>
   logger.log(`Creating app version "${majorVersion}.${minorVersion}" on Hockey ...`);
 
   const hockeyDeployer = new HockeyDeployer({
-    dryRun: commander.dryRun || false,
+    dryRun: commanderOptions.dryRun || false,
     hockeyAppId: hockeyId,
     hockeyToken,
     version,

bin/deploy-tools/s3-cli.ts

@@ -37,21 +37,23 @@ commander
   .option('-w, --wrapper-build <build>', 'Specify the wrapper build (e.g. "Linux#3.7.1234")')
   .parse(process.argv);
 
-checkCommanderOptions(commander, logger, ['bucket', 'keyId', 'secretKey', 'wrapperBuild']);
+const commanderOptions = commander.opts();
 
-if (!commander.wrapperBuild.includes('#')) {
-  logger.error(`Invalid wrapper build id "${commander.wrapperBuild}"`);
+checkCommanderOptions(commanderOptions, logger, ['bucket', 'keyId', 'secretKey', 'wrapperBuild']);
+
+if (!commanderOptions.wrapperBuild.includes('#')) {
+  logger.error(`Invalid wrapper build id "${commanderOptions.wrapperBuild}"`);
   commander.outputHelp();
   process.exit(1);
 }
 
 (async () => {
-  const searchBasePath = commander.path || path.join(__dirname, '../../wrap');
-  const s3BasePath = `${commander.s3path || ''}/`;
-  const [platform, version] = commander.wrapperBuild.toLowerCase().split('#');
-  const {bucket, secretKey: secretAccessKey, keyId: accessKeyId} = commander;
+  const searchBasePath = commanderOptions.path || path.join(__dirname, '../../wrap');
+  const s3BasePath = `${commanderOptions.s3path || ''}/`;
+  const [platform, version] = commanderOptions.wrapperBuild.toLowerCase().split('#');
+  const {bucket, secretKey: secretAccessKey, keyId: accessKeyId} = commanderOptions;
 
-  const s3Deployer = new S3Deployer({accessKeyId, dryRun: commander.dryRun || false, secretAccessKey});
+  const s3Deployer = new S3Deployer({accessKeyId, dryRun: commanderOptions.dryRun || false, secretAccessKey});
 
   const files = await s3Deployer.findUploadFiles(platform, searchBasePath, version);
 

bin/deploy-tools/s3-win-releases-cli.ts

@@ -38,24 +38,26 @@ commander
   .option('-w, --wrapper-build <build>', 'Specify the wrapper build (e.g. "Linux#3.7.1234")')
   .parse(process.argv);
 
-checkCommanderOptions(commander, logger, ['bucket', 'keyId', 'secretKey', 'wrapperBuild']);
+const commanderOptions = commander.opts();
 
-if (!commander.wrapperBuild.includes('#')) {
-  logger.error(`Invalid wrapper build id "${commander.wrapperBuild}"`);
+checkCommanderOptions(commanderOptions, logger, ['bucket', 'keyId', 'secretKey', 'wrapperBuild']);
+
+if (!commanderOptions.wrapperBuild.includes('#')) {
+  logger.error(`Invalid wrapper build id "${commanderOptions.wrapperBuild}"`);
   commander.outputHelp();
   process.exit(1);
 }
 
 (async () => {
-  const [platform, version] = commander.wrapperBuild.toLowerCase().split('#');
+  const [platform, version] = commanderOptions.wrapperBuild.toLowerCase().split('#');
 
   if (!platform.includes('windows')) {
     throw new Error('Copying release files on S3 is supported only for Windows');
   }
 
-  const bucket = commander.bucket;
-  const searchBasePath = commander.path || path.resolve('.');
-  const s3BasePath = `${commander.s3path || ''}/`.replace('//', '/');
+  const bucket = commanderOptions.bucket;
+  const searchBasePath = commanderOptions.path || path.resolve('.');
+  const s3BasePath = `${commanderOptions.s3path || ''}/`.replace('//', '/');
 
   const nupkgFile = await find('*-full.nupkg', {cwd: searchBasePath});
   const setupExe = await find('*-Setup.exe', {cwd: searchBasePath});
@@ -76,9 +78,9 @@ if (!commander.wrapperBuild.includes('#')) {
   const latestReleaseKey = `${s3BasePath}/${appShortName}-${version}-RELEASES`;
   const latestExeKey = `${s3BasePath}/${appShortName}-${version}.exe`;
 
-  const {secretKey: secretAccessKey, keyId: accessKeyId} = commander;
+  const {secretKey: secretAccessKey, keyId: accessKeyId} = commanderOptions;
 
-  const s3Deployer = new S3Deployer({accessKeyId, dryRun: commander.dryRun || false, secretAccessKey});
+  const s3Deployer = new S3Deployer({accessKeyId, dryRun: commanderOptions.dryRun || false, secretAccessKey});
 
   logger.log(`Deleting "${staticReleaseKey}" from S3 ...`);
   await s3Deployer.deleteFromS3({bucket, s3Path: `${bucket}/${staticReleaseKey}`});

electron/locale/fr-FR.json

@@ -95,7 +95,7 @@
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} comptes déjà actifs",
   "wrapperAddAccountErrorTitleSingular": "Compte déjà actif",
   "wrapperAddAccountErrorMessagePlural": "Vous pouvez être connecté·e à {{maximumAccounts}} comptes en même temps. Déconnectez-vous de l'un d'entre eux pour en ajouter un autre.",
-  "wrapperAddAccountErrorMessageSingular": "Vous pouvez être connecté·e à un seul compte à la fois. Déconnectez-vous de celui-ci pour en ajouter un autre.",
+  "wrapperAddAccountErrorMessageSingular": "Vous ne pouvez vous connecter qu’à un seul compte à la fois. Déconnectez-vous de celui-ci pour en ajouter un autre.",
   "promptOK": "OK",
   "promptCancel": "Annuler",
   "promptWarning": "Avertissement",

electron/locale/it-IT.json

@@ -100,5 +100,5 @@
   "promptCancel": "Annulla",
   "promptWarning": "Attenzione",
   "promptError": "Errore",
-  "urlBlockedPromptText": "A potentially unsafe URL has been blocked. If you still wish to open it, copy the URL and open the appropriate application."
+  "urlBlockedPromptText": "Un URL potenzialmente non sicuro è stato bloccato. Se vuoi ancora aprirlo, copia l'URL e apri l'applicazione appropriata."
 }

electron/locale/ja-JP.json

@@ -28,7 +28,7 @@
   "menuCopy": "コピー",
   "menuCut": "カット",
   "menuDelete": "削除...",
-  "menuDownloadDebugLogs": "Download Debug Logs",
+  "menuDownloadDebugLogs": "デバッグログをダウンロード",
   "menuEdit": "編集",
   "menuFullScreen": "フルスクリーン",
   "menuHelp": "ヘルプ",
@@ -87,18 +87,18 @@
   "wrapperLogOut": "ログアウト",
   "wrapperManageTeam": "チームを管理する",
   "wrapperRemoveAccount": "アカウントを削除",
-  "menuEnableSpellChecking": "Enable Spell Checking",
+  "menuEnableSpellChecking": "スペルチェックを有効にする",
   "menuCopyPicture": "Copy Picture",
   "menuActualSize": "Actual Size",
-  "menuZoomIn": "Zoom In",
-  "menuZoomOut": "Zoom Out",
+  "menuZoomIn": "ズームイン",
+  "menuZoomOut": "ズームアウト",
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",
   "wrapperAddAccountErrorMessageSingular": "You can only be logged in with one account at once. Log out from this one to add another.",
   "promptOK": "OK",
   "promptCancel": "キャンセル",
-  "promptWarning": "Warning",
-  "promptError": "Error",
+  "promptWarning": "警告",
+  "promptError": "エラー",
   "urlBlockedPromptText": "A potentially unsafe URL has been blocked. If you still wish to open it, copy the URL and open the appropriate application."
 }

electron/locale/lt-LT.json

@@ -14,9 +14,9 @@
   "certificateVerifyProcManagerWarningTextChromium": "{brandName} jūs įspėja, kai esate prisijungę prie tinklo, kuris neleidžia saugių sujungimų su {brandName} serveriais. Tam gali būti daug priežasčių:\n\n• Esate už korporacinės užkardos, kuri perima ryšius\n• Naudojatės viešuoju belaidžiu (Wi-Fi) tinklu (pvz., viešbutyje ar oro uoste), kuris perima ryšius tol, kol nesate prisiregistravę per belaisvį portalą\n• Gali būti, kad užpuolikai bando pavogti jūsų informaciją\n\nJūs neturėtumėte naudotis {brandName} šiame tinkle.",
   "certificateVerifyProcManagerWarningTextPinning": "{brandName} jūs įspėja, kai esate prisijungę prie tinklo, kuris neleidžia saugių sujungimų su {brandName} serveriais. Tam gali būti daug priežasčių:\n\n• Esate už korporacinės užkardos, kuri perima ryšius\n• Naudojatės viešuoju belaidžiu (Wi-Fi) tinklu (pvz., viešbutyje ar oro uoste), kuris perima ryšius tol, kol nesate prisiregistravę per belaisvį portalą\n• Gali būti, kad užpuolikai bando pavogti jūsų informaciją\n\nJūs neturėtumėte naudotis {brandName} šiame tinkle, nebent tikrai žinote, ką darote.",
   "certificateVerifyProcManagerWarningTitle": "Jūsų ryšys nėra privatus",
-  "changeEnvironmentModalConfirm": "Connect",
+  "changeEnvironmentModalConfirm": "Prisijungti",
   "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"",
-  "changeEnvironmentModalTitle": "Connect to server",
+  "changeEnvironmentModalTitle": "Prisijungti prie serverio",
   "menuAbout": "Apie {brandName}",
   "menuAddPeople": "Pridėti žmones...",
   "menuAppURL": "{brandName} internetinė svetainė",
@@ -88,17 +88,17 @@
   "wrapperManageTeam": "Tvarkyti komandą",
   "wrapperRemoveAccount": "Šalinti paskyrą",
   "menuEnableSpellChecking": "Įjungti rašybos tikrinimą",
-  "menuCopyPicture": "Copy Picture",
+  "menuCopyPicture": "Kopijuoti paveikslą",
   "menuActualSize": "Actual Size",
-  "menuZoomIn": "Zoom In",
-  "menuZoomOut": "Zoom Out",
+  "menuZoomIn": "Didinti",
+  "menuZoomOut": "Mažinti",
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
-  "wrapperAddAccountErrorTitleSingular": "Account already active",
+  "wrapperAddAccountErrorTitleSingular": "Paskyra jau aktyvi",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",
   "wrapperAddAccountErrorMessageSingular": "You can only be logged in with one account at once. Log out from this one to add another.",
   "promptOK": "Gerai",
   "promptCancel": "Atsisakyti",
-  "promptWarning": "Warning",
-  "promptError": "Error",
+  "promptWarning": "Įspėjimas",
+  "promptError": "Klaida",
   "urlBlockedPromptText": "A potentially unsafe URL has been blocked. If you still wish to open it, copy the URL and open the appropriate application."
 }