From 960482f527b7d5cc01a0df6a8594b8b3826d978b Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sat, 26 Aug 2023 12:03:45 +0100 Subject: [PATCH 1/5] docs: correct year in privacy policy --- PRIVACY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVACY.md b/PRIVACY.md index ff16e09afe..dbd48940f6 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -131,4 +131,4 @@ You accept our Terms of Service ("Terms") by installing or using any of our apps **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat. -Updated August 17, 2022 +Updated August 17, 2023 From 10f8b8086ec4fcea6a42ac62335ed5d74d24cc10 Mon Sep 17 00:00:00 2001 From: "M. Sarmad Qadeer" Date: Sun, 27 Aug 2023 21:45:13 +0500 Subject: [PATCH 2/5] Sq/website fdroid page (#2980) * website: change height of f-droid page main section * website: update lang strings for f-droid page * website: fix fdroid page broken in other languages * update translations * website: add language navigation to fdroid page link --------- Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> --- website/.eleventy.js | 2 +- website/langs/ar.json | 10 ++-------- website/langs/de.json | 10 +++------- website/langs/en.json | 8 ++------ website/langs/es.json | 10 +++------- website/langs/fr.json | 10 +++------- website/langs/it.json | 10 +++------- website/langs/nl.json | 10 +++------- website/langs/uk.json | 10 +++------- website/src/_includes/contact_page.html | 5 +++-- website/src/_includes/hero.html | 3 ++- .../src/_includes/sections/join_simplex.html | 4 +++- website/src/fdroid.html | 17 ++++++++++++++--- website/web.sh | 1 + 14 files changed, 46 insertions(+), 64 deletions(-) diff --git a/website/.eleventy.js b/website/.eleventy.js index fbfc0d71c8..fb9fe108f2 100644 --- a/website/.eleventy.js +++ b/website/.eleventy.js @@ -52,7 +52,7 @@ const globalConfig = { } const translationsDirectoryPath = './langs' -const supportedRoutes = ["blog", "contact", "invitation", "docs", ""] +const supportedRoutes = ["blog", "contact", "invitation", "docs", "fdroid", ""] let supportedLangs = [] fs.readdir(translationsDirectoryPath, (err, files) => { if (err) { diff --git a/website/langs/ar.json b/website/langs/ar.json index fd6cf4eb84..afa1076a6f 100644 --- a/website/langs/ar.json +++ b/website/langs/ar.json @@ -237,14 +237,8 @@ "simplex-chat-via-f-droid": "SimpleX Chat عبر F-Droid", "simplex-chat-repo": "مستودع SimpleX Chat", "stable-and-beta-versions-built-by-developers": "الإصدارات الثابتة والتجريبية التي أنشأها المطورون", - "to-add-it-to-your-f-droid-client": "لإضافته إلى عميل F-Droid الخاص بك", - "scan-the-qr-code-or": "مسح رمز QR أو", - "use-this-url": "استخدم عنوان URL هذا", "signing-key-fingerprint": "توقيع مفتاح البصمة (SHA-256)", "f-droid-org-repo": "مستودع F-Droid.org", "stable-versions-built-by-f-droid-org": "الإصدارات الثابتة التي تم إنشاؤها بواسطة F-Droid.org", - "releases-to-this-repo-are-done-1-2-days-later": "يتم إصدار الإصدارات إلى هذا المستودع بعد يوم أو يومين", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "يتم إنشاء علامة المستودعات SimpleX Chat و F-Droid.org بمفاتيح مختلفة. للتبديل، من فضلك", - "export": "تصدير", - "chat-db-and-re-install-app": "قاعدة بيانات الدردشة وأعِد تثبيت التطبيق" -} + "releases-to-this-repo-are-done-1-2-days-later": "يتم إصدار الإصدارات إلى هذا المستودع بعد يوم أو يومين" +} \ No newline at end of file diff --git a/website/langs/de.json b/website/langs/de.json index 48f4e87c46..ced2abffd3 100644 --- a/website/langs/de.json +++ b/website/langs/de.json @@ -233,18 +233,14 @@ "guide-dropdown-3": "Geheime Gruppen", "docs-dropdown-7": "SimpleX Chat übersetzen", "glossary": "Glossar", - "scan-the-qr-code-or": "Scannen Sie den QR-Code oder", - "use-this-url": "nutzen Sie diese URL", "signing-key-fingerprint": "Fingerabdruck des Signaturschlüssels (SHA-256)", "f-droid-org-repo": "F-Droid.org Repository", "stable-versions-built-by-f-droid-org": "Von F-Droid.org erstellte stabile Versionen", - "export": "die Chat-Datenbank exportieren", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "SimpleX Chat- und F-Droid.org-Repositorys signieren ihre Builds mit verschiedenen Schlüsseln. Zum Umschalten bitte", + "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat- und F-Droid.org-Repositorys signieren ihre Builds mit verschiedenen Schlüsseln. Zum Umschalten bitte die Chat-Datenbank exportieren und die App neu installieren.", "releases-to-this-repo-are-done-1-2-days-later": "Die Versionen für dieses Repository werden 1..2 Tage später erstellt", - "chat-db-and-re-install-app": "und die App neu installieren", "docs-dropdown-8": "SimpleX Verzeichnisdienst", "simplex-chat-via-f-droid": "SimpleX Chat per F-Droid", "simplex-chat-repo": "SimpleX Chat Repository", "stable-and-beta-versions-built-by-developers": "Von den Entwicklern erstellte stabile und Beta-Versionen", - "to-add-it-to-your-f-droid-client": "Um es Ihrem F-Droid-Client hinzuzufügen" -} + "f-droid-page-simplex-chat-repo-section-text": "Um es Ihrem F-Droid-Client hinzuzufügen scannen Sie den QR-Code oder nutzen Sie diese URL:" +} \ No newline at end of file diff --git a/website/langs/en.json b/website/langs/en.json index 66989ef93d..4bb9036d69 100644 --- a/website/langs/en.json +++ b/website/langs/en.json @@ -237,14 +237,10 @@ "simplex-chat-via-f-droid": "SimpleX Chat via F-Droid", "simplex-chat-repo": "SimpleX Chat repo", "stable-and-beta-versions-built-by-developers": "Stable and beta versions built by the developers", - "to-add-it-to-your-f-droid-client": "To add it to your F-Droid client", - "scan-the-qr-code-or": "scan the QR code or", - "use-this-url": "use this URL", + "f-droid-page-simplex-chat-repo-section-text": "To add it to your F-Droid client, scan the QR code or use this URL:", "signing-key-fingerprint": "Signing key fingerprint (SHA-256)", "f-droid-org-repo": "F-Droid.org repo", "stable-versions-built-by-f-droid-org": "Stable versions built by F-Droid.org", "releases-to-this-repo-are-done-1-2-days-later": "The releases to this repo are done 1-2 days later", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "SimpleX Chat and F-Droid.org repositories sign builds with the different keys. To switch, please", - "export": "export", - "chat-db-and-re-install-app": "the chat database and re-install the app" + "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat and F-Droid.org repositories sign builds with the different keys. To switch, please export the chat database and re-install the app." } diff --git a/website/langs/es.json b/website/langs/es.json index c3d20709df..4505d4b987 100644 --- a/website/langs/es.json +++ b/website/langs/es.json @@ -234,17 +234,13 @@ "back-to-top": "Volver arriba", "glossary": "Glosario", "stable-and-beta-versions-built-by-developers": "Versiones estables y beta compilados por los desarrolladores", - "to-add-it-to-your-f-droid-client": "Para añadirlo a tu cliente F-Droid", - "use-this-url": "usa esta URL", - "scan-the-qr-code-or": "escanea el código QR", - "export": "exportar", - "chat-db-and-re-install-app": "la base de datos y reinstala la aplicación", + "f-droid-page-simplex-chat-repo-section-text": "Para añadirlo a tu cliente F-Droid escanea el código QR usa esta URL:", "docs-dropdown-8": "Servicio Simplex Directory", "simplex-chat-repo": "Repositorio Simplex Chat", "simplex-chat-via-f-droid": "SimpleX Chat en F-Droid", "f-droid-org-repo": "Repositorio F-Droid.org", "stable-versions-built-by-f-droid-org": "Versión estable compilada por F-Droid.org", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "Los repositorios de SimpleX Chat y F-Droid.org firman con distinto certificado. Para cambiar, por favor", + "f-droid-page-f-droid-org-repo-section-text": "Los repositorios de SimpleX Chat y F-Droid.org firman con distinto certificado. Para cambiar, por favor exportar la base de datos y reinstala la aplicación.", "signing-key-fingerprint": "Huella digital de la clave de firma (SHA-256)", "releases-to-this-repo-are-done-1-2-days-later": "Las versiones aparecen 1-2 días más tarde en este repositorio" -} +} \ No newline at end of file diff --git a/website/langs/fr.json b/website/langs/fr.json index 5a87062cf0..ab29ca7c61 100644 --- a/website/langs/fr.json +++ b/website/langs/fr.json @@ -235,17 +235,13 @@ "on-this-page": "Sur cette page", "glossary": "Glossaire", "releases-to-this-repo-are-done-1-2-days-later": "Les mises à jour de ce dépôt sont faites 1 à 2 jours plus tard", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "Les dépôts SimpleX Chat et F-Droid.org signent les builds avec des clés différentes. Pour changer, veuillez", - "chat-db-and-re-install-app": "la base de données des chats et réinstaller l'application", - "export": "exporter", + "f-droid-page-f-droid-org-repo-section-text": "Les dépôts SimpleX Chat et F-Droid.org signent les builds avec des clés différentes. Pour changer, veuillez exporter la base de données des chats et réinstaller l'application.", "docs-dropdown-8": "Service de répertoire SimpleX", "simplex-chat-via-f-droid": "SimpleX Chat via F-Droid", "simplex-chat-repo": "Dépot SimpleX Chat", "stable-and-beta-versions-built-by-developers": "Versions stables et bêta crées par les développeurs", - "to-add-it-to-your-f-droid-client": "Pour l'ajouter à votre client F-Droid", - "scan-the-qr-code-or": "scannez le code QR ou", - "use-this-url": "utilisez cette URL", + "f-droid-page-simplex-chat-repo-section-text": "Pour l'ajouter à votre client F-Droid scannez le code QR ou utilisez cette URL:", "signing-key-fingerprint": "Empreinte de signature numérique (SHA-256)", "f-droid-org-repo": "Dépot F-Droid.org", "stable-versions-built-by-f-droid-org": "Versions stables créées par F-Droid.org" -} +} \ No newline at end of file diff --git a/website/langs/it.json b/website/langs/it.json index d7e9ca34db..41ea654b24 100644 --- a/website/langs/it.json +++ b/website/langs/it.json @@ -234,10 +234,7 @@ "docs-dropdown-7": "Traduci SimpleX Chat", "glossary": "Glossario", "releases-to-this-repo-are-done-1-2-days-later": "Le pubblicazioni su questo repo avvengono 1-2 giorni dopo", - "export": "esporta", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "I repository di SimpleX Chat e F-Droid.org firmano i pacchetti con chiavi diverse. Per passare da uno all'altro,", - "chat-db-and-re-install-app": "il database della chat e reinstalla l'app", - "use-this-url": "usa questo URL", + "f-droid-page-f-droid-org-repo-section-text": "I repository di SimpleX Chat e F-Droid.org firmano i pacchetti con chiavi diverse. Per passare da uno all'altro, esporta il database della chat e reinstalla l'app.", "signing-key-fingerprint": "Impronta della chiave di firma (SHA-256)", "f-droid-org-repo": "Repo di F-Droid.org", "stable-versions-built-by-f-droid-org": "Versioni stabili compilate da F-Droid.org", @@ -245,6 +242,5 @@ "simplex-chat-via-f-droid": "SimpleX Chat via F-Droid", "simplex-chat-repo": "Repo di SimpleX Chat", "stable-and-beta-versions-built-by-developers": "Versioni stabili e beta compilate dagli sviluppatori", - "to-add-it-to-your-f-droid-client": "Per aggiungerlo al tuo client F-Droid", - "scan-the-qr-code-or": "scansiona il codice QR o" -} + "f-droid-page-simplex-chat-repo-section-text": "Per aggiungerlo al tuo client F-Droid scansiona il codice QR o usa questo URL:" +} \ No newline at end of file diff --git a/website/langs/nl.json b/website/langs/nl.json index 71752b8bcd..980d16c0ff 100644 --- a/website/langs/nl.json +++ b/website/langs/nl.json @@ -236,15 +236,11 @@ "simplex-chat-via-f-droid": "SimpleX Chat via F-Droid", "simplex-chat-repo": "SimpleX Chat repo", "stable-and-beta-versions-built-by-developers": "Stabiele en bètaversies gebouwd door de ontwikkelaars", - "to-add-it-to-your-f-droid-client": "Om het toe te voegen aan uw F-Droid-client", - "scan-the-qr-code-or": "scan de QR-code of", - "use-this-url": "gebruik deze URL", + "f-droid-page-simplex-chat-repo-section-text": "Om het toe te voegen aan uw F-Droid-client scan de QR-code of gebruik deze URL:", "f-droid-org-repo": "F-Droid.org repo", "signing-key-fingerprint": "Signing key fingerprint (SHA-256)", "stable-versions-built-by-f-droid-org": "Stabiele versies gebouwd door F-Droid.org", "releases-to-this-repo-are-done-1-2-days-later": "De releases voor deze repository vinden 1-2 dagen later plaats", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "SimpleX Chat- en F-Droid.org-repository's ondertekenen builds met de verschillende sleutels. Om over te stappen, alstublieft", - "export": "exporteer", - "chat-db-and-re-install-app": "de chatdatabase en installeer de app opnieuw", + "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat- en F-Droid.org-repository's ondertekenen builds met de verschillende sleutels. Om over te stappen, alstublieft exporteer de chatdatabase en installeer de app opnieuw.", "docs-dropdown-8": "SimpleX Directory Service" -} +} \ No newline at end of file diff --git a/website/langs/uk.json b/website/langs/uk.json index 7289e3be17..eae508ed47 100644 --- a/website/langs/uk.json +++ b/website/langs/uk.json @@ -234,8 +234,7 @@ "guide-dropdown-3": "Таємні групи", "glossary": "Глосарій", "docs-dropdown-8": "Служба каталогів SimpleX", - "to-add-it-to-your-f-droid-client": "Щоб додати його в клієнт F-Droid", - "scan-the-qr-code-or": "відскануйте QR-код або", + "f-droid-page-simplex-chat-repo-section-text": "Щоб додати його в клієнт F-Droid відскануйте QR-код або використовуйте цю URL-адресу:", "simplex-chat-via-f-droid": "SimpleX Chat через F-Droid", "signing-key-fingerprint": "Відбиток ключа підпису (SHA-256)", "stable-versions-built-by-f-droid-org": "Стабільні версії, зібрані на F-Droid.org", @@ -243,8 +242,5 @@ "f-droid-org-repo": "Репо F-Droid.org", "releases-to-this-repo-are-done-1-2-days-later": "Релізи в це репо відбуваються на 1-2 дні пізніше", "stable-and-beta-versions-built-by-developers": "Стабільні та бета-версії, створені розробниками", - "use-this-url": "використовуйте цю URL-адресу", - "simplex-and-f-droid-repo-sign-builds-with-different-keys": "Репозиторії SimpleX Chat та F-Droid.org підписують збірки з різними ключами. Щоб перемикнутися, будь ласка", - "export": "експорт", - "chat-db-and-re-install-app": "базу даних чату та перевстановіть додаток" -} + "f-droid-page-f-droid-org-repo-section-text": "Репозиторії SimpleX Chat та F-Droid.org підписують збірки з різними ключами. Щоб перемикнутися, будь ласка експорт базу даних чату та перевстановіть додаток." +} \ No newline at end of file diff --git a/website/src/_includes/contact_page.html b/website/src/_includes/contact_page.html index 9e81a0b50a..a03a3aea4f 100644 --- a/website/src/_includes/contact_page.html +++ b/website/src/_includes/contact_page.html @@ -1,3 +1,4 @@ +{% set lang = page.url | getlang %} {% block js_scripts %} @@ -18,7 +19,7 @@
- +
@@ -51,7 +52,7 @@
- +
diff --git a/website/src/_includes/hero.html b/website/src/_includes/hero.html index 43fb4a3541..161e0da4a8 100644 --- a/website/src/_includes/hero.html +++ b/website/src/_includes/hero.html @@ -1,3 +1,4 @@ +{% set lang = page.url | getlang %}
@@ -46,7 +47,7 @@
- +
diff --git a/website/src/_includes/sections/join_simplex.html b/website/src/_includes/sections/join_simplex.html index 400a2482df..776ec33d45 100644 --- a/website/src/_includes/sections/join_simplex.html +++ b/website/src/_includes/sections/join_simplex.html @@ -1,3 +1,5 @@ +{% set lang = page.url | getlang %} + {# join simplex #}
@@ -28,7 +30,7 @@
- +
diff --git a/website/src/fdroid.html b/website/src/fdroid.html index 9951a2d1e3..ff56b9cc95 100644 --- a/website/src/fdroid.html +++ b/website/src/fdroid.html @@ -5,7 +5,18 @@ description: "Get the app via F-Droid" templateEngineOverride: njk --- -
+ + +

{{ "simplex-chat-via-f-droid" | i18n({}, lang ) | safe }}

@@ -16,7 +27,7 @@ templateEngineOverride: njk

{{ "stable-and-beta-versions-built-by-developers" | i18n({}, lang ) | safe }}

-

{{ "to-add-it-to-your-f-droid-client" | i18n({}, lang ) | safe }}, {{ "use-this-url" | i18n({}, lang ) | safe }}:

+

{{ "f-droid-page-simplex-chat-repo-section-text" | i18n({}, lang ) | safe }}

https://app.simplex.chat/fdroid/repo @@ -40,7 +51,7 @@ templateEngineOverride: njk

{{ "stable-versions-built-by-f-droid-org" | i18n({}, lang ) | safe }}

{{ "releases-to-this-repo-are-done-1-2-days-later" | i18n({}, lang ) | safe }}.

-

{{ "simplex-and-f-droid-repo-sign-builds-with-different-keys" | i18n({}, lang ) | safe }} {{ "export" | i18n({}, lang ) | safe }} {{ "chat-db-and-re-install-app" | i18n({}, lang ) | safe }}.

+

{{ "f-droid-page-f-droid-org-repo-section-text" | i18n({}, lang ) | safe }}

diff --git a/website/web.sh b/website/web.sh index 9e3ae76ad6..e64f74d21d 100755 --- a/website/web.sh +++ b/website/web.sh @@ -32,6 +32,7 @@ for lang in "${langs[@]}"; do cp src/index.html src/$lang cp src/contact.html src/$lang cp src/invitation.html src/$lang + cp src/fdroid.html src/$lang echo "{\"lang\":\"$lang\"}" > src/$lang/$lang.json echo "done $lang copying" done From 95d57bc4e151cec5d400de1f27e024d53dd67b71 Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:16:29 +0300 Subject: [PATCH 3/5] desktop: fixed gradle (#2982) * fix gradle * correct cert identity * proper file paths * moving to secrets * order of lines * returned back --- .github/workflows/build.yml | 4 ++++ apps/multiplatform/build.gradle.kts | 12 +++++++----- scripts/desktop/build-desktop-mac-ci.sh | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09412eee55..d7322cd92f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,6 +166,10 @@ jobs: id: mac_desktop_build if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest' shell: bash + env: + APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }} + APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }} + APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }} run: | scripts/desktop/build-desktop-mac-ci.sh echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)" diff --git a/apps/multiplatform/build.gradle.kts b/apps/multiplatform/build.gradle.kts index 5e0ae5eb47..f277da4bde 100644 --- a/apps/multiplatform/build.gradle.kts +++ b/apps/multiplatform/build.gradle.kts @@ -9,6 +9,8 @@ buildscript { // No file was created } } + fun ExtraPropertiesExtension.getOrNull(name: String): Any? = if (has(name)) get("name") else null + extra.set("compose.version", prop["compose.version"] ?: extra["compose.version"]) extra.set("kotlin.version", prop["kotlin.version"] ?: extra["kotlin.version"]) extra.set("gradle.plugin.version", prop["gradle.plugin.version"] ?: extra["gradle.plugin.version"]) @@ -30,11 +32,11 @@ buildscript { /** Mac signing and notarization */ // You can specify `compose.desktop.mac.*` keys and values from the right side of the command in `$HOME/.gradle/gradle.properties`. // This will be project-independent setup without requiring to have `local.properties` file - extra.set("desktop.mac.signing.identity", prop["desktop.mac.signing.identity"] ?: extra["compose.desktop.mac.signing.identity"]) - extra.set("desktop.mac.signing.keychain", prop["desktop.mac.signing.keychain"] ?: extra["compose.desktop.mac.signing.keychain"]) - extra.set("desktop.mac.notarization.apple_id", prop["desktop.mac.notarization.apple_id"] ?: extra["compose.desktop.mac.notarization.appleID"]) - extra.set("desktop.mac.notarization.password", prop["desktop.mac.notarization.password"] ?: extra["compose.desktop.mac.notarization.password"]) - extra.set("desktop.mac.notarization.team_id", prop["desktop.mac.notarization.team_id"] ?: extra["compose.desktop.mac.notarization.ascProvider"]) + extra.set("desktop.mac.signing.identity", prop["desktop.mac.signing.identity"] ?: extra.getOrNull("compose.desktop.mac.signing.identity")) + extra.set("desktop.mac.signing.keychain", prop["desktop.mac.signing.keychain"] ?: extra.getOrNull("compose.desktop.mac.signing.keychain")) + extra.set("desktop.mac.notarization.apple_id", prop["desktop.mac.notarization.apple_id"] ?: extra.getOrNull("compose.desktop.mac.notarization.appleID")) + extra.set("desktop.mac.notarization.password", prop["desktop.mac.notarization.password"] ?: extra.getOrNull("compose.desktop.mac.notarization.password")) + extra.set("desktop.mac.notarization.team_id", prop["desktop.mac.notarization.team_id"] ?: extra.getOrNull("compose.desktop.mac.notarization.ascProvider")) repositories { google() diff --git a/scripts/desktop/build-desktop-mac-ci.sh b/scripts/desktop/build-desktop-mac-ci.sh index d11dfccb58..07a3db9c8e 100755 --- a/scripts/desktop/build-desktop-mac-ci.sh +++ b/scripts/desktop/build-desktop-mac-ci.sh @@ -2,7 +2,7 @@ set -e -trap "rm apps/multiplatform/local.properties; rm /tmp/simplex.keychain" EXIT +trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT echo "desktop.mac.signing.identity=Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T)" >> apps/multiplatform/local.properties echo "desktop.mac.signing.keychain=/tmp/simplex.keychain" >> apps/multiplatform/local.properties echo "desktop.mac.notarization.apple_id=$APPLE_SIMPLEX_NOTARIZATION_APPLE_ID" >> apps/multiplatform/local.properties From 0f076d9ac91a7fec5984614dfec6a55c30f474c6 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:32:44 +0100 Subject: [PATCH 4/5] docs: update technical details and limitations --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 56e219d50a..561a322c62 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ SimpleX Chat founder - [News and updates](#news-and-updates) - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app) - [SimpleX Platform design](#simplex-platform-design) -- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations) +- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations) - [For developers](#for-developers) - [Roadmap](#roadmap) - [Disclaimers, Security contact, License](#disclaimers) @@ -262,7 +262,7 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md). -## Privacy: technical details and limitations +## Privacy and security: technical details and limitations SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario. @@ -281,12 +281,15 @@ What is already implemented: 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details. 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings. 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections. +12. Manual messaging queue rotations to move conversation to another SMP relay. -We plan to add soon: +We plan to add: -1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days). -2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. -3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time. +1. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. This is currently in progress. +2. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party. +3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days). +4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time. +5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code. ## For developers From 4aac3c7922c9ec7ba0c5641317337341f7081d06 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Mon, 28 Aug 2023 22:23:49 +0100 Subject: [PATCH 5/5] website: update comparison --- website/langs/en.json | 5 +++-- website/src/index.html | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/website/langs/en.json b/website/langs/en.json index 4bb9036d69..d9ff80f3e4 100644 --- a/website/langs/en.json +++ b/website/langs/en.json @@ -205,8 +205,9 @@ "comparison-section-list-point-1": "Usually based on a phone number, in some cases on usernames", "comparison-section-list-point-2": "DNS-based addresses", "comparison-section-list-point-3": "Public key or some other globally unique ID", - "comparison-section-list-point-4": "If operator’s servers are compromised", - "comparison-section-list-point-5": "Does not protect users' metadata", + "comparison-section-list-point-4a": "SimpleX relays cannot compromise e2e encryption. Verify security code to mitigate attack on out-of-band channel", + "comparison-section-list-point-4": "If operator’s servers are compromised. Verify security code in Signal and some other apps to mitigate it", + "comparison-section-list-point-5": "Does not protect users' metadata privacy", "comparison-section-list-point-6": "While P2P are distributed, they are not federated - they operate as a single network", "comparison-section-list-point-7": "P2P networks either have a central authority or the whole network can be compromised", "see-here": "see here", diff --git a/website/src/index.html b/website/src/index.html index 16bab8d98f..f1bde906a2 100644 --- a/website/src/index.html +++ b/website/src/index.html @@ -189,8 +189,8 @@ active_home: true {{ "comparison-point-2-text" | i18n({}, lang ) | safe }} - {{ "no-secure" | i18n({}, lang ) | safe }} - {{ "yes" | i18n({}, lang ) | safe }} 4 + {{ "no-secure" | i18n({}, lang ) | safe }} 4 + {{ "yes" | i18n({}, lang ) | safe }} 5 {{ "yes" | i18n({}, lang ) | safe }} {{ "yes" | i18n({}, lang ) | safe }} @@ -205,15 +205,15 @@ active_home: true {{ "comparison-point-4-text" | i18n({}, lang ) | safe }} {{ "no-decentralized" | i18n({}, lang ) | safe }} {{ "yes" | i18n({}, lang ) | safe }} - {{ "no-federated" | i18n({}, lang ) | safe }} 5 - {{ "yes" | i18n({}, lang ) | safe }} 6 + {{ "no-federated" | i18n({}, lang ) | safe }} 6 + {{ "yes" | i18n({}, lang ) | safe }} 7 {{ "comparison-point-5-text" | i18n({}, lang ) | safe }} {{ "no-resilient" | i18n({}, lang ) | safe }} {{ "yes" | i18n({}, lang ) | safe }} {{ "yes" | i18n({}, lang ) | safe }} 2 - {{ "yes" | i18n({}, lang ) | safe }} 7 + {{ "yes" | i18n({}, lang ) | safe }} 8 @@ -227,6 +227,7 @@ active_home: true
  • {{ "comparison-section-list-point-1" | i18n({}, lang ) | safe }}
  • {{ "comparison-section-list-point-2" | i18n({}, lang ) | safe }}
  • {{ "comparison-section-list-point-3" | i18n({}, lang ) | safe }}
    • +
  • {{ "comparison-section-list-point-4a" | i18n({}, lang ) | safe }}
  • {{ "comparison-section-list-point-4" | i18n({}, lang ) | safe }}
  • {{ "comparison-section-list-point-5" | i18n({}, lang ) | safe }}
  • {{ "comparison-section-list-point-6" | i18n({}, lang ) | safe }}