Merge branch 'dev' into feature/check-github-for-updates

syphon-org · Apr 15, 2023 · 801fbe8 · 801fbe8
2 parents 9c4e538 + 8f3658d
commit 801fbe8
Show file tree

Hide file tree

Showing 67 changed files with 1,832 additions and 754 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -12,7 +12,7 @@ trigger:
     - push
 steps:
   - name: build linux
-    image: cirrusci/flutter:3.0.1
+    image: cirrusci/flutter:3.0.5
     commands:
       # Install dependencies
       - apt-get update -y
@@ -57,7 +57,7 @@ trigger:
     - push
 steps:
   - name: build linux
-    image: cirrusci/flutter:3.0.1
+    image: cirrusci/flutter:3.0.5
     commands:
       # Install dependencies
       - apt-get update -y
@@ -101,7 +101,7 @@ steps:
 #    - push
 #steps:
 #  - name: build linux
-#    image: cirrusci/flutter:3.0.1
+#    image: cirrusci/flutter:3.0.5
 #    commands:
 #      # Install dependencies
 #      - apt-get update -y
@@ -142,7 +142,7 @@ trigger:
     - push
 steps:
   - name: build android
-    image: cirrusci/flutter:3.0.1
+    image: cirrusci/flutter:3.0.5
     commands:
       # Keep track of the time when build was started
       - echo $(date -Iseconds) > BUILD_START_TIME
@@ -193,7 +193,7 @@ trigger:
     - push
 steps:
   - name: build android
-    image: cirrusci/flutter:3.0.1
+    image: cirrusci/flutter:3.0.5
     commands:
       # Keep track of the time when build was started
       - echo $(date -Iseconds) > BUILD_START_TIME

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "org.tether.tether"
-        minSdkVersion 18
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -68,9 +68,12 @@ android {
    buildTypes {
        release {
            signingConfig signingConfigs.release
+           resValue "string", "app_name", "Syphon"
        }
        debug {
             signingConfig signingConfigs.debug
+            resValue "string", "app_name", "Syphon Debug"
+            applicationIdSuffix ".debug"
         }
    }
     externalNativeBuild {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
     <application
         android:name="${applicationName}"
-        android:label="Syphon"
+        android:label="@string/app_name"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher">
         <service

diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -20,6 +20,11 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch(Exception e) {
       Log.e(TAG, "Error registering plugin android_alarm_manager_plus, dev.fluttercommunity.plus.androidalarmmanager.AndroidAlarmManagerPlugin", e);
     }
+    try {
+      flutterEngine.getPlugins().add(new io.flutter.plugins.camera.CameraPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin camera_android, io.flutter.plugins.camera.CameraPlugin", e);
+    }
     try {
       flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.connectivity.ConnectivityPlugin());
     } catch(Exception e) {
@@ -41,9 +46,9 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
       Log.e(TAG, "Error registering plugin file_picker, com.mr.flutter.plugin.filepicker.FilePickerPlugin", e);
     }
     try {
-      flutterEngine.getPlugins().add(new com.example.flutterimagecompress.FlutterImageCompressPlugin());
+      flutterEngine.getPlugins().add(new com.fluttercandies.flutter_image_compress.ImageCompressPlugin());
     } catch(Exception e) {
-      Log.e(TAG, "Error registering plugin flutter_image_compress, com.example.flutterimagecompress.FlutterImageCompressPlugin", e);
+      Log.e(TAG, "Error registering plugin flutter_image_compress, com.fluttercandies.flutter_image_compress.ImageCompressPlugin", e);
     }
     try {
       flutterEngine.getPlugins().add(new com.jrai.flutter_keyboard_visibility.FlutterKeyboardVisibilityPlugin());
@@ -68,7 +73,7 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.imagepicker.ImagePickerPlugin());
     } catch(Exception e) {
-      Log.e(TAG, "Error registering plugin image_picker, io.flutter.plugins.imagepicker.ImagePickerPlugin", e);
+      Log.e(TAG, "Error registering plugin image_picker_android, io.flutter.plugins.imagepicker.ImagePickerPlugin", e);
     }
     try {
       flutterEngine.getPlugins().add(new com.csdcorp.local_image_provider.LocalImageProviderPlugin());
@@ -88,7 +93,7 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     try {
       flutterEngine.getPlugins().add(new com.baseflow.permissionhandler.PermissionHandlerPlugin());
     } catch(Exception e) {
-      Log.e(TAG, "Error registering plugin permission_handler, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
+      Log.e(TAG, "Error registering plugin permission_handler_android, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
     }
     try {
       flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.share.SharePlusPlugin());

diff --git a/android/olm b/android/olm
diff --git a/assets/translations/ar.json b/assets/translations/ar.json
@@ -333,7 +333,7 @@
     "content-remove-screen-lock": "هل أنت متأكد أنك تريد إزالة قفل الشاشة؟ هذا سيزيل أيضاً حماية المخبأ",
     "list-item-settings-dismiss-keyboard": "تجاهل لوحة المفاتيح",
     "list-item-settings-auto-download": "تنزيل تلقائي",
-    "alert-log-out-enable-multiaccount": "يجب عليك تسجيل الخروج من جلسة العمل/n الحالية لتمكين الحسابات المتعددة",
+    "alert-log-out-enable-multiaccount": "يجب تسجيل الخروج من الجلسة الحالية \\ n لتمكين الحسابات المتعددة",
     "content-export-session-keys": "أدخل كلمة مرور للنسخ الاحتياطي لمفتاح الجلسة هذا.\n\nيرجى الانتباه إلى أن التصدير قد يستغرق بعض الوقت لإكماله.",
     "content-logout-multiaccount-confirm": "\n\nنظرا لأن لديك حسابات أخرى ، فإن تسجيل الخروج سيحولك إلى جلسة حساب أخرى.",
     "alert-copied-to-clipboard": "تم نسخها إلى الحافظة",
@@ -342,5 +342,30 @@
     "content-key-backup-warning": "نظرا لمعالجة الخلفية على iOS ، قد يتم تشغيل النسخة الاحتياطية المجدولة أو لا يتم تشغيلها بناء على البطارية وقوة المعالجة وعوامل أخرى.\n\nتأكد دائما من حفظ النسخ الاحتياطية بشكل مناسب.",
     "label-fab-search": "البحث في المحادثات",
     "label-fab-create-group": "بدء الدردشة الجماعية",
-    "label-fab-create-public": "بدء الدردشة العامة"
+    "label-fab-create-public": "بدء الدردشة العامة",
+    "title-dialog-block-user": "حظر المستخدم",
+    "subtitle-settings-read-receipts": "إذا كانت إيصالات القراءة معطلة أو خاصة، فلن يتمكن المستخدمون الآخرون من معرفة وقت قراءة رسائلهم.",
+    "label-always": "دائماً",
+    "label-private": "خاص",
+    "list-item-mute-for-one-day": "كتم الصوت لمدة يوم واحد",
+    "content-dialog-photo-permission": "مطلوب إذن الصور للوصول إلى المعرض. هل ترغب في المتابعة إلى إعدادات التطبيق؟",
+    "list-item-mute-for-one-hour": "كتم الصوت لمدة ساعة",
+    "popup-menu-item-invite-friends": "دعوة الأصدقاء",
+    "semantics-open-actions-ring": "افتح حلقة الإجراءات",
+    "tooltip-message-details": "تفاصيل الرسالة",
+    "popup-menu-item-search": "بحث",
+    "popup-menu-item-mute-notifications": "كتم الإشعارات",
+    "popup-menu-item-chat-settings": "إعدادات الدردشة",
+    "tooltip-copy-message-content": "نسخ محتوى الرسالة",
+    "title-dialog-photo-permission": "الإذن مطلوب",
+    "list-item-settings-read-receipts": "إيصالات القراءة",
+    "semantics-close-actions-ring": "إغلاق حلقة الإجراءات",
+    "tooltip-delete-message": "حذف رسالة",
+    "tooltip-edit-message": "تحرير الرسالة",
+    "tooltip-quote-and-reply": "الاقتباس والرد",
+    "tooltip-share-chats": "مشاركة الدردشات",
+    "list-item-mute-for-hours": "كتم الصوت لمدة {} ساعات",
+    "list-item-mute-for-days": "كتم الصوت لمدة {} أيام",
+    "content-dialog-block-user": "إذا قمت بحظر {} ، فلن تتمكن من رؤية رسائلهم وستغادر هذه الدردشة على الفور.",
+    "popup-menu-item-all-media": "جميع الوسائط"
 }
diff --git a/assets/translations/cs.json b/assets/translations/cs.json
@@ -100,7 +100,7 @@
     "label-users-results": "Shodný Uživatelé",
     "label-users-recent": "Nedávný Uživatelé",
     "label-users": "Uživatelé",
-    "label-email": "Email",
+    "label-email": "E-mail",
     "label-off": "Vypnout",
     "label-on": "Zapnout",
     "label-syncing-chats": "Synchronizace chatu…",

diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -313,7 +313,7 @@
     "list-item-settings-when-using-mobile-data": "Bei Nutzung mobiler Daten",
     "subtitle-settings-enter-sends": "Wenn Sie die Eingabetaste drücken, wird eine Nachricht gesendet",
     "subtitle-force-full-sync": "Erzwungene vollständige Synchronisierung aller Benutzerdaten und Nachrichten",
-    "button-text-confirm-delete-keys": "Tasten löschen",
+    "button-text-confirm-delete-keys": "Schlüssel löschen",
     "button-text-remove": "Entfernen",
     "list-item-settings-sort-by": "Sortieren nach",
     "list-item-settings-group-by": "Gruppe nach",
@@ -342,5 +342,30 @@
     "label-fab-create-group": "Gruppenchat starten",
     "label-fab-create-public": "Öffentlichen Chat starten",
     "content-key-backup-warning": "Aufgrund der Hintergrundverarbeitung unter iOS kann es sein, dass Ihre geplante Sicherung je nach Akku, Verarbeitungsleistung und anderen Faktoren nicht ausgeführt wird.\n\nVergewissern Sie sich immer, dass Ihre Backups ordnungsgemäß gespeichert werden.",
-    "title-dialog-key-backup-warning": "Warnung vor Schlüsselsicherung"
+    "title-dialog-key-backup-warning": "Warnung vor Schlüsselsicherung",
+    "popup-menu-item-chat-settings": "Chat-Einstellungen",
+    "popup-menu-item-invite-friends": "Freunde einladen",
+    "popup-menu-item-mute-notifications": "Benachrichtigungen stummschalten",
+    "semantics-close-actions-ring": "Aktionsring schließen",
+    "semantics-open-actions-ring": "Aktionsring öffnen",
+    "subtitle-settings-read-receipts": "Wenn Lesebestätigungen deaktiviert oder privat sind, können andere Benutzer nicht sehen, wann Sie ihre Nachrichten gelesen haben.",
+    "label-always": "Immer",
+    "title-dialog-block-user": "Benutzer blockieren",
+    "label-private": "Privat",
+    "list-item-mute-for-one-day": "Für 1 Tag stummschalten",
+    "content-dialog-block-user": "Wenn Sie {} blockieren, können Sie seine/ihre Nachrichten nicht sehen und Sie verlassen diesen Chat sofort.",
+    "tooltip-edit-message": "Nachricht bearbeiten",
+    "popup-menu-item-search": "Suche",
+    "popup-menu-item-all-media": "Alle Medien",
+    "tooltip-message-details": "Details zur Nachricht",
+    "tooltip-copy-message-content": "Nachrichteninhalt kopieren",
+    "tooltip-quote-and-reply": "Zitieren und antworten",
+    "tooltip-delete-message": "Nachricht löschen",
+    "tooltip-share-chats": "Chats teilen",
+    "title-dialog-photo-permission": "Berechtigung erforderlich",
+    "content-dialog-photo-permission": "Für den Zugriff auf die Galerie ist eine Genehmigung für Fotos erforderlich. Möchten Sie mit den Anwendungseinstellungen fortfahren?",
+    "list-item-mute-for-one-hour": "Für 1 St. stummschalten",
+    "list-item-mute-for-hours": "Für {} St. stummschalten",
+    "list-item-mute-for-days": "Für {} Tage stummschalten",
+    "list-item-settings-read-receipts": "Lesebestägigungen"
 }
diff --git a/assets/translations/en-gb.json b/assets/translations/en-gb.json
@@ -1,5 +1,11 @@
 {
     "content-intro-section-one": "{} works by using an encrypted \nand decentralised network \ncalled ",
     "content-intro-section-three": "Both Matrix and {} are developed\nopenly by organisations and people,\nnot corporations",
-    "confirm-advanced-colors": "Are you sure you want to use advanced colour selection?\n\nSelecting the same colour\nas the background may prevent you from seeing parts of the app!"
+    "confirm-advanced-colors": "Are you sure you want to use advanced colour selection?\n\nSelecting the same colour\nas the background may prevent you from seeing parts of the app!",
+    "button-text-login": "Log in",
+    "semantics-image-signup-username": "Person resting elbow on ID card",
+    "confirm-terms-of-service": "THIS SOFTWARE ({}) IS PROVIDED BY THE AUTHOR ‘AS IS’ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+    "title-dialog-chat-color": "Select chat colour",
+    "title-dialog-logout": "Log out",
+    "label-color": "Colour"
 }
diff --git a/assets/translations/et.json b/assets/translations/et.json
@@ -56,7 +56,7 @@
     "button-confirm-alt": "sobib",
     "button-confirm": "selge lugu",
     "button-confirm-formal": "kinnita",
-    "button-leave-chat": "lahku vestlusest",
+    "button-leave-chat": "Lahku vestlusest",
     "button-delete-chat": "kustuta vestlus",
     "button-archive-chat": "arhiveeri vestlus",
     "button-select-all": "vali kõik",
@@ -66,7 +66,7 @@
     "button-text-signup-question": "Sul veel pole kasutajanimi olemas?",
     "button-text-login": "Logi sisse",
     "button-delete-keys": "kustuta võtmed",
-    "button-block-user": "blokeeri kasutaja",
+    "button-block-user": "Blokeeri kasutaja",
     "button-send-verification": "verifitseerimiseks saada e-kiri",
     "button-confirm-verification": "kinnita verifitseerimine",
     "button-text-settings": "Seadistused",
@@ -144,5 +144,95 @@
     "content-logout-multiaccount-confirm": "\n\nKuna sul on ka teisi kasutajakontosid, siis väljalogimisel võetakse mõnu muu konto kasutusele.",
     "content-import-session-keys": "Sessioonivõtmete importimiseks palun sisesta salasõna.\n\nPalun arvesta, et järgnev andmete import võib natuke aega võtta.",
     "content-export-session-keys-enter-password": "Sisesta salasõna, millega soovid oma sessioonivõtmeid krüptida.",
-    "content-import-session-keys-enter-password": "Sisesta salasõna, millega soovid oma sessioonivõtmeid importida."
+    "content-import-session-keys-enter-password": "Sisesta salasõna, millega soovid oma sessioonivõtmeid importida.",
+    "title-dialog-accept-invite": "Kas võtad kutse vastu?",
+    "title-dialog-chat-color": "Vali vestluse värv",
+    "title-dialog-sync-interval": "Muuda sünkroniseerimise välpa",
+    "title-dialog-chat-with-user": "Vestle kasutajaga {}",
+    "title-dialog-attempt-chat-with-user": "Proovi vestelda kasutajaga {}",
+    "title-user-verification": "Kasutaja verifitseerimine",
+    "header-update-password": "Uuenda salasõna",
+    "title-dialog-email-requirement-verified": "E-posti aadressi kinnitamine",
+    "title-dialog-email-requirement": "E-posti aadress on nõutud",
+    "title-dialog-key-backup-warning": "Võtme varunduse hoiatus",
+    "title-dialog-logout": "Väljalogimine",
+    "title-confirm-password": "Kinnita salasõna õigsust",
+    "title-dialog-confirm-deactivate-account": "Kasutajakonto kustutamine",
+    "title-confirm-email": "Kinnita e-posti aadressi õigsust",
+    "title-export-session-keys": "Ekspordi sessiooni võtmed",
+    "title-dialog-confirm-deactivate-account-final": "Lõplik kinnitus kasutajakonto kustutamisele",
+    "title-dialog-backup-session-keys": "Sessioonivõtmete varundus",
+    "header-general": "Üldised seadistused",
+    "title-blocked-users": "Blokeeritud kasutajad",
+    "title-import-session-keys": "Impordi sessiooni võtmed",
+    "header-media-auto-download": "Meedia automaatne allalaadimine",
+    "tooltip-edit-message": "Muuda sõnumit",
+    "list-item-settings-language": "Keel",
+    "header-media": "Meedia",
+    "tooltip-delete-message": "Kustuta sõnum",
+    "tooltip-message-details": "Sõnumi teave",
+    "list-item-settings-read-receipts": "Lugemisteatised",
+    "tooltip-share-chats": "Jaga vestlusi",
+    "tooltip-copy-message-content": "Kopeeri sõnumi sisu",
+    "tooltip-quote-and-reply": "Tsiteeri ja vasta",
+    "label-seconds": "sekundit",
+    "label-version": "Versioon",
+    "label-search-for-user": "Otsi kasutajat...",
+    "button-text-remove": "Eemalda",
+    "button-text-go-back": "mine tagasi",
+    "button-text-lets-encrypt": "let's encrypt",
+    "list-item-mute-for-hours": "Summita {}'ks tunniks",
+    "list-item-mute-for-days": "Summuta {}'ks päevaks",
+    "button-contact": "Kontakt",
+    "button-text-confirm-delete-keys": "Kustuta võtmed",
+    "button-gallery": "Galerii",
+    "button-file": "Fail",
+    "list-item-mute-for-one-day": "Summuta üheks päevaks",
+    "label-search-unencrypted": "Otsi krüptimata sisust",
+    "title-dialog-remove-screen-lock": "Eemalda ekraanilukustus",
+    "title-dialog-enter-screen-lock-pin": "Sisesta ekraaniluku praegune PIN-kood",
+    "title-dialog-enter-new-screen-lock-pin": "Sisesta ekraaniluku uus PIN-kood",
+    "title-dialog-verify-new-screen-lock-pin": "Korda ekraaniluku uut PIN-koodi",
+    "subtitle-settings-show-membership-events": "Näita vestluse liikmelisuse muutusi",
+    "subtitle-settings-enter-sends": "Sisestusklahvi vajutamine saadab sõnumi",
+    "subtitle-settings-24h-format": "Näita sõumite ajatempleid 24-tunni vormingus",
+    "subtitle-settings-dismiss-keyboard": "Peale sõnumi saatmist eemalda klahvistik",
+    "subtitle-settings-view-uploaded-media": "Vaata kõiki üleslaaditud andmeid, sealhulgas neid, mis enam sõnumitega pole seotud",
+    "subtitle-images-audio-video-files": "Pildid, helifailid, videofailid, muud failid",
+    "subtitle-theme-settings": "Teema {}, font {}",
+    "subtitle-privacy-settings": "Ekraanilukk {}, registreerimislukk {}",
+    "label-about": "Rakenduse teave",
+    "label-fab-create-group": "Alusta rühmavestlust",
+    "label-fab-create-dm": "Otsevestlus",
+    "button-create": "loo",
+    "button-dismiss": "Katkesta",
+    "button-text-load-captcha": "Laadi robotilõks",
+    "button-text-import": "impordi",
+    "list-item-chat-detail-notification-setting": "Teavituse seadistused",
+    "list-item-chat-detail-notifications": "Teavitused",
+    "label-default-room-notification": "Vaikimsi (Argon)",
+    "button-login": "logi sisse",
+    "label-on": "Sees",
+    "title-dialog-draft-preview": "Kavandi eelvaade",
+    "button-text-confirmed": "Kinnitatud",
+    "label-chat-settings": "Vestluse seadistused",
+    "label-color": "Värv",
+    "button-text-accept": "nõustu",
+    "button-location": "Asukoht",
+    "list-item-chat-detail-toggle-direct-chat": "Otsevestlus",
+    "list-item-chat-detail-privacy-status": "Privaatsus ja olek",
+    "list-item-chat-detail-view-key": "Vaata krüptivõtit",
+    "list-item-chat-detail-vibrate": "Värinaalarm",
+    "list-item-chat-detail-notification-sound": "Teavitusheli",
+    "title-dialog-block-user": "Blokeeri kasutaja",
+    "label-timestamp": "Ajatempel",
+    "label-current-password": "Senine salasõna",
+    "label-new-password": "Uus salasõna",
+    "label-confirm-new-password": "Korda uut salasõna",
+    "label-always": "Alati",
+    "label-fab-create-public": "Alusta avalikku vestlust",
+    "label-off": "Väljas",
+    "label-private": "Privaatne",
+    "button-enable": "võta kasutusele",
+    "list-item-mute-for-one-hour": "Summuta üheks tunniks"
 }