mirror of
https://github.com/sudosylabs/vnidrop.git
synced 2026-08-05 10:29:58 +02:00
feat(network): support custom relay servers
Add strict custom Iroh relay profiles with safe restart and rollback across the Rust core, Compose apps, and Apple apps. Preserve multi-relay invitations and fail closed on configuration or recovery mismatches.
This commit is contained in:
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Übertragung prüfen</string>
|
||||
<string name="receive_title">Empfangen</string>
|
||||
<string name="receive_unknown_transfer">VniDrop-Übertragung</string>
|
||||
<string name="relay_add_url">Relay-Server hinzufügen</string>
|
||||
<string name="relay_apply">Netzwerkeinstellungen anwenden</string>
|
||||
<string name="relay_applying">Wird angewendet…</string>
|
||||
<string name="relay_apply_active_transfers">Beenden Sie alle aktiven Übertragungen und Freigaben, bevor Sie die Netzwerkeinstellungen anwenden.</string>
|
||||
<string name="relay_apply_failed">Diese Einstellungen konnten nicht angewendet werden. Die vorherigen Netzwerkeinstellungen wurden wiederhergestellt.</string>
|
||||
<string name="relay_apply_restart_description">Beim Anwenden wird die Netzwerkverbindung von VniDrop neu gestartet. Beenden Sie zuerst aktive Übertragungen und Freigaben. Vorhandene Einladungen müssen eventuell erneut geteilt werden.</string>
|
||||
<string name="relay_custom_urls_help">Geben Sie pro Zeile eine HTTPS-Relay-URL ein. Anmeldedaten in URLs werden nicht unterstützt. Das TLS-Zertifikat muss von einer öffentlich vertrauenswürdigen Zertifizierungsstelle ausgestellt sein.</string>
|
||||
<string name="relay_custom_urls_label">Relay-URLs</string>
|
||||
<string name="relay_mode_automatic">Automatisch</string>
|
||||
<string name="relay_mode_automatic_description">Verwendet die öffentliche Standard-Relay-Infrastruktur von VniDrop, wenn keine direkte Verbindung möglich ist.</string>
|
||||
<string name="relay_mode_custom">Benutzerdefiniert</string>
|
||||
<string name="relay_mode_custom_description">Verwendet ausschließlich die unten aufgeführten Relay-Server.</string>
|
||||
<string name="relay_privacy_description">Relays leiten verschlüsselten Datenverkehr weiter und können Ihre Dateien nicht lesen, ihr Betreiber kann jedoch Verbindungsmetadaten sehen.</string>
|
||||
<string name="relay_remove_url">Relay-Server entfernen</string>
|
||||
<string name="relay_restore_failed">Die vorherigen Netzwerkeinstellungen konnten nicht wiederhergestellt werden. Starten Sie VniDrop neu und prüfen Sie Ihre Relay-Konfiguration.</string>
|
||||
<string name="relay_settings_applied">Netzwerkeinstellungen angewendet.</string>
|
||||
<string name="relay_strict_warning">Der benutzerdefinierte Modus ist strikt: VniDrop greift weder auf öffentliche Relays noch auf öffentliche Erkennung zurück. Andere Geräte müssen Ihre konfigurierten Relays erreichen können.</string>
|
||||
<string name="relay_validation_duplicate_url">Die Relay-URL in Zeile %1$d ist bereits zuvor eingetragen.</string>
|
||||
<string name="relay_validation_https_required">Die Relay-URL in Zeile %1$d muss mit https:// beginnen.</string>
|
||||
<string name="relay_validation_invalid_url">Die Relay-URL in Zeile %1$d ist ungültig.</string>
|
||||
<string name="relay_validation_missing_url">Fügen Sie mindestens eine Relay-URL hinzu.</string>
|
||||
<string name="relay_validation_too_many_urls">Sie können bis zu %1$d Relay-Server konfigurieren.</string>
|
||||
<string name="send_access_anyone">Jeder mit dieser Übertragung</string>
|
||||
<string name="send_access_anyone_description">Keine Genehmigung erforderlich. Verwenden Sie dies nur für Objekte, die Sie unbedenklich teilen können.</string>
|
||||
<string name="send_access_anyone_warning">Jeder mit der Einladung kann herunterladen, bis Sie die Freigabe beenden. Verwenden Sie dies nicht für private oder sensible Objekte.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Übertragung erstellt.</string>
|
||||
<string name="send_transfer_details_title">Übertragungsdetails</string>
|
||||
<string name="send_transfers_title">Ihre Übertragungen</string>
|
||||
<string name="settings_advanced_title">Erweitert</string>
|
||||
<string name="settings_network_title">Netzwerk</string>
|
||||
<string name="settings_subtitle">Ihr Name, wo Übertragungen gesichert werden, Darstellung und Mitteilungen.</string>
|
||||
<string name="settings_title">Einstellungen</string>
|
||||
<string name="snackbar_dismiss">Ausblenden</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Anfragen, Genehmigungen und abgeschlossene Zustellungen</string>
|
||||
<string name="transfer_receivers_pending">%1$d warten</string>
|
||||
<string name="transfer_receivers_title">Empfänger</string>
|
||||
<string name="transfer_qr_unavailable">Für diese Einladung ist kein QR-Code verfügbar. Verwenden Sie stattdessen Teilen oder Herunterladen.</string>
|
||||
<string name="transfer_scan_qr">Mit VniDrop scannen, um diese Übertragung zu empfangen</string>
|
||||
<string name="transfer_share_description">QR-Code, Einladungsdatei und Optionen in der Nähe</string>
|
||||
<string name="transfer_share_title">Teilen</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Revisar transferencia</string>
|
||||
<string name="receive_title">Recibir</string>
|
||||
<string name="receive_unknown_transfer">Transferencia de VniDrop</string>
|
||||
<string name="relay_add_url">Añadir servidor de retransmisión</string>
|
||||
<string name="relay_apply">Aplicar ajustes de red</string>
|
||||
<string name="relay_applying">Aplicando…</string>
|
||||
<string name="relay_apply_active_transfers">Detenga todas las transferencias y elementos compartidos activos antes de aplicar los ajustes de red.</string>
|
||||
<string name="relay_apply_failed">No se han podido aplicar estos ajustes. Se han restaurado los ajustes de red anteriores.</string>
|
||||
<string name="relay_apply_restart_description">Al aplicar los ajustes, se reinicia la conexión de red de VniDrop. Detenga primero las transferencias y los elementos compartidos activos. Es posible que tenga que volver a compartir las invitaciones existentes.</string>
|
||||
<string name="relay_custom_urls_help">Introduzca una URL HTTPS de relé por línea. No se admiten credenciales en las URL. El certificado TLS debe ser emitido por una autoridad de certificación de confianza pública.</string>
|
||||
<string name="relay_custom_urls_label">URL de relés</string>
|
||||
<string name="relay_mode_automatic">Automático</string>
|
||||
<string name="relay_mode_automatic_description">Usa la infraestructura pública de relés predeterminada de VniDrop cuando no haya una conexión directa disponible.</string>
|
||||
<string name="relay_mode_custom">Personalizado</string>
|
||||
<string name="relay_mode_custom_description">Usa únicamente los servidores de retransmisión indicados a continuación.</string>
|
||||
<string name="relay_privacy_description">Los relés reenvían tráfico cifrado y no pueden leer sus archivos, pero su operador puede observar los metadatos de conexión.</string>
|
||||
<string name="relay_remove_url">Eliminar servidor de retransmisión</string>
|
||||
<string name="relay_restore_failed">No se han podido restaurar los ajustes de red anteriores. Reinicie VniDrop y revise la configuración de relés.</string>
|
||||
<string name="relay_settings_applied">Ajustes de red aplicados.</string>
|
||||
<string name="relay_strict_warning">El modo personalizado es estricto: VniDrop no recurrirá a relés públicos ni al descubrimiento público. Los demás dispositivos deben poder acceder a los relés configurados.</string>
|
||||
<string name="relay_validation_duplicate_url">La URL de relé de la línea %1$d duplica una entrada anterior.</string>
|
||||
<string name="relay_validation_https_required">La URL de relé de la línea %1$d debe empezar por https://.</string>
|
||||
<string name="relay_validation_invalid_url">La URL de relé de la línea %1$d no es válida.</string>
|
||||
<string name="relay_validation_missing_url">Añada al menos una URL de relé.</string>
|
||||
<string name="relay_validation_too_many_urls">Puede configurar hasta %1$d servidores de retransmisión.</string>
|
||||
<string name="send_access_anyone">Cualquiera que tenga esta transferencia</string>
|
||||
<string name="send_access_anyone_description">No se requiere aprobación. Úselo solo para elementos que no le importe compartir.</string>
|
||||
<string name="send_access_anyone_warning">Cualquiera que tenga la invitación puede descargar hasta que deje de compartir. No lo use para elementos privados o sensibles.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Transferencia creada.</string>
|
||||
<string name="send_transfer_details_title">Detalles de la transferencia</string>
|
||||
<string name="send_transfers_title">Sus transferencias</string>
|
||||
<string name="settings_advanced_title">Avanzado</string>
|
||||
<string name="settings_network_title">Red</string>
|
||||
<string name="settings_subtitle">Su nombre, dónde se guardan las transferencias, la apariencia y las notificaciones.</string>
|
||||
<string name="settings_title">Ajustes</string>
|
||||
<string name="snackbar_dismiss">Descartar</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Solicitudes, aprobaciones y entregas completadas</string>
|
||||
<string name="transfer_receivers_pending">%1$d en espera</string>
|
||||
<string name="transfer_receivers_title">Destinatarios</string>
|
||||
<string name="transfer_qr_unavailable">El QR no está disponible para esta invitación. Use Compartir o Descargar.</string>
|
||||
<string name="transfer_scan_qr">Escanee con VniDrop para recibir esta transferencia</string>
|
||||
<string name="transfer_share_description">Código QR, archivo de invitación y opciones cercanas</string>
|
||||
<string name="transfer_share_title">Compartir</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Vérifier le transfert</string>
|
||||
<string name="receive_title">Recevoir</string>
|
||||
<string name="receive_unknown_transfer">Transfert VniDrop</string>
|
||||
<string name="relay_add_url">Ajouter un serveur relais</string>
|
||||
<string name="relay_apply">Appliquer les réglages réseau</string>
|
||||
<string name="relay_applying">Application…</string>
|
||||
<string name="relay_apply_active_transfers">Arrêtez tous les transferts et partages actifs avant d’appliquer les réglages réseau.</string>
|
||||
<string name="relay_apply_failed">Impossible d’appliquer ces réglages. Les réglages réseau précédents ont été restaurés.</string>
|
||||
<string name="relay_apply_restart_description">L’application de ces réglages redémarre la connexion réseau de VniDrop. Arrêtez d’abord les transferts et partages actifs. Il peut être nécessaire de partager à nouveau les invitations existantes.</string>
|
||||
<string name="relay_custom_urls_help">Saisissez une URL de relais HTTPS par ligne. Les identifiants dans les URL ne sont pas pris en charge. Le certificat TLS doit être émis par une autorité de certification reconnue publiquement.</string>
|
||||
<string name="relay_custom_urls_label">URL des relais</string>
|
||||
<string name="relay_mode_automatic">Automatique</string>
|
||||
<string name="relay_mode_automatic_description">Utiliser l’infrastructure de relais publique par défaut de VniDrop lorsqu’une connexion directe est indisponible.</string>
|
||||
<string name="relay_mode_custom">Personnalisé</string>
|
||||
<string name="relay_mode_custom_description">Utiliser uniquement les serveurs relais ci-dessous.</string>
|
||||
<string name="relay_privacy_description">Les relais transmettent du trafic chiffré et ne peuvent pas lire vos fichiers, mais leur opérateur peut observer les métadonnées de connexion.</string>
|
||||
<string name="relay_remove_url">Supprimer le serveur relais</string>
|
||||
<string name="relay_restore_failed">Impossible de restaurer les réglages réseau précédents. Redémarrez VniDrop et vérifiez votre configuration de relais.</string>
|
||||
<string name="relay_settings_applied">Réglages réseau appliqués.</string>
|
||||
<string name="relay_strict_warning">Le mode personnalisé est strict : VniDrop n’utilisera ni les relais publics ni la découverte publique comme solution de repli. Les autres appareils doivent pouvoir accéder aux relais configurés.</string>
|
||||
<string name="relay_validation_duplicate_url">L’URL de relais à la ligne %1$d est identique à une entrée précédente.</string>
|
||||
<string name="relay_validation_https_required">L’URL de relais à la ligne %1$d doit commencer par https://.</string>
|
||||
<string name="relay_validation_invalid_url">L’URL de relais à la ligne %1$d n’est pas valide.</string>
|
||||
<string name="relay_validation_missing_url">Ajoutez au moins une URL de relais.</string>
|
||||
<string name="relay_validation_too_many_urls">Vous pouvez configurer jusqu’à %1$d serveurs relais.</string>
|
||||
<string name="send_access_anyone">Toute personne disposant de ce transfert</string>
|
||||
<string name="send_access_anyone_description">Aucune approbation requise. À n’utiliser que pour des éléments que vous êtes à l’aise de partager.</string>
|
||||
<string name="send_access_anyone_warning">Toute personne disposant de l’invitation peut télécharger jusqu’à ce que vous arrêtiez le partage. Ne l’utilisez pas pour des éléments privés ou sensibles.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Transfert créé.</string>
|
||||
<string name="send_transfer_details_title">Détails du transfert</string>
|
||||
<string name="send_transfers_title">Vos transferts</string>
|
||||
<string name="settings_advanced_title">Avancé</string>
|
||||
<string name="settings_network_title">Réseau</string>
|
||||
<string name="settings_subtitle">Votre nom, l’emplacement d’enregistrement des transferts, l’apparence et les notifications.</string>
|
||||
<string name="settings_title">Réglages</string>
|
||||
<string name="snackbar_dismiss">Ignorer</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Demandes, approbations et livraisons terminées</string>
|
||||
<string name="transfer_receivers_pending">%1$d en attente</string>
|
||||
<string name="transfer_receivers_title">Destinataires</string>
|
||||
<string name="transfer_qr_unavailable">Le code QR n’est pas disponible pour cette invitation. Utilisez plutôt Partager ou Télécharger.</string>
|
||||
<string name="transfer_scan_qr">Scannez avec VniDrop pour recevoir ce transfert</string>
|
||||
<string name="transfer_share_description">QR code, fichier d’invitation et options à proximité</string>
|
||||
<string name="transfer_share_title">Partager</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Rivedi trasferimento</string>
|
||||
<string name="receive_title">Ricevi</string>
|
||||
<string name="receive_unknown_transfer">Trasferimento VniDrop</string>
|
||||
<string name="relay_add_url">Aggiungi server relay</string>
|
||||
<string name="relay_apply">Applica impostazioni di rete</string>
|
||||
<string name="relay_applying">Applicazione…</string>
|
||||
<string name="relay_apply_active_transfers">Interrompa tutti i trasferimenti e le condivisioni attivi prima di applicare le impostazioni di rete.</string>
|
||||
<string name="relay_apply_failed">Impossibile applicare queste impostazioni. Sono state ripristinate le impostazioni di rete precedenti.</string>
|
||||
<string name="relay_apply_restart_description">L’applicazione riavvia la connessione di rete di VniDrop. Interrompa prima i trasferimenti e le condivisioni attivi. Potrebbe essere necessario condividere di nuovo gli inviti esistenti.</string>
|
||||
<string name="relay_custom_urls_help">Inserisca un URL relay HTTPS per riga. Le credenziali negli URL non sono supportate. Il certificato TLS deve essere emesso da un’autorità di certificazione pubblicamente attendibile.</string>
|
||||
<string name="relay_custom_urls_label">URL relay</string>
|
||||
<string name="relay_mode_automatic">Automatica</string>
|
||||
<string name="relay_mode_automatic_description">Usa l’infrastruttura relay pubblica predefinita di VniDrop quando non è disponibile una connessione diretta.</string>
|
||||
<string name="relay_mode_custom">Personalizzata</string>
|
||||
<string name="relay_mode_custom_description">Usa solo i server relay indicati di seguito.</string>
|
||||
<string name="relay_privacy_description">I relay inoltrano traffico cifrato e non possono leggere i suoi file, ma il loro operatore può osservare i metadati di connessione.</string>
|
||||
<string name="relay_remove_url">Rimuovi server relay</string>
|
||||
<string name="relay_restore_failed">Impossibile ripristinare le impostazioni di rete precedenti. Riavvii VniDrop e verifichi la configurazione dei relay.</string>
|
||||
<string name="relay_settings_applied">Impostazioni di rete applicate.</string>
|
||||
<string name="relay_strict_warning">La modalità personalizzata è rigorosa: VniDrop non userà relay pubblici o il rilevamento pubblico come ripiego. Gli altri dispositivi devono poter raggiungere i relay configurati.</string>
|
||||
<string name="relay_validation_duplicate_url">L’URL relay alla riga %1$d duplica una voce precedente.</string>
|
||||
<string name="relay_validation_https_required">L’URL relay alla riga %1$d deve iniziare con https://.</string>
|
||||
<string name="relay_validation_invalid_url">L’URL relay alla riga %1$d non è valido.</string>
|
||||
<string name="relay_validation_missing_url">Aggiunga almeno un URL relay.</string>
|
||||
<string name="relay_validation_too_many_urls">Può configurare fino a %1$d server relay.</string>
|
||||
<string name="send_access_anyone">Chiunque abbia questo trasferimento</string>
|
||||
<string name="send_access_anyone_description">Nessuna approvazione richiesta. Da usare solo per elementi che non ha problemi a condividere.</string>
|
||||
<string name="send_access_anyone_warning">Chiunque abbia l’invito può scaricare finché non interrompe la condivisione. Non lo usi per elementi privati o sensibili.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Trasferimento creato.</string>
|
||||
<string name="send_transfer_details_title">Dettagli del trasferimento</string>
|
||||
<string name="send_transfers_title">I suoi trasferimenti</string>
|
||||
<string name="settings_advanced_title">Avanzate</string>
|
||||
<string name="settings_network_title">Rete</string>
|
||||
<string name="settings_subtitle">Il suo nome, dove vengono salvati i trasferimenti, l’aspetto e le notifiche.</string>
|
||||
<string name="settings_title">Impostazioni</string>
|
||||
<string name="snackbar_dismiss">Ignora</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Richieste, approvazioni e consegne completate</string>
|
||||
<string name="transfer_receivers_pending">%1$d in attesa</string>
|
||||
<string name="transfer_receivers_title">Destinatari</string>
|
||||
<string name="transfer_qr_unavailable">Il codice QR non è disponibile per questo invito. Utilizzi invece Condividi o Scarica.</string>
|
||||
<string name="transfer_scan_qr">Scansioni con VniDrop per ricevere questo trasferimento</string>
|
||||
<string name="transfer_share_description">Codice QR, file di invito e opzioni nelle vicinanze</string>
|
||||
<string name="transfer_share_title">Condividi</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Overdracht controleren</string>
|
||||
<string name="receive_title">Ontvangen</string>
|
||||
<string name="receive_unknown_transfer">VniDrop-overdracht</string>
|
||||
<string name="relay_add_url">Relayserver toevoegen</string>
|
||||
<string name="relay_apply">Netwerkinstellingen toepassen</string>
|
||||
<string name="relay_applying">Toepassen…</string>
|
||||
<string name="relay_apply_active_transfers">Stop alle actieve overdrachten en gedeelde items voordat u de netwerkinstellingen toepast.</string>
|
||||
<string name="relay_apply_failed">Deze instellingen konden niet worden toegepast. De vorige netwerkinstellingen zijn hersteld.</string>
|
||||
<string name="relay_apply_restart_description">Bij het toepassen wordt de netwerkverbinding van VniDrop opnieuw gestart. Stop eerst actieve overdrachten en gedeelde items. Bestaande uitnodigingen moeten mogelijk opnieuw worden gedeeld.</string>
|
||||
<string name="relay_custom_urls_help">Voer per regel één HTTPS-relay-URL in. Aanmeldgegevens in URL\'s worden niet ondersteund. Het TLS-certificaat moet zijn uitgegeven door een openbaar vertrouwde certificeringsinstantie.</string>
|
||||
<string name="relay_custom_urls_label">Relay-URL\'s</string>
|
||||
<string name="relay_mode_automatic">Automatisch</string>
|
||||
<string name="relay_mode_automatic_description">Gebruikt de standaard openbare relay-infrastructuur van VniDrop wanneer geen directe verbinding beschikbaar is.</string>
|
||||
<string name="relay_mode_custom">Aangepast</string>
|
||||
<string name="relay_mode_custom_description">Gebruikt alleen de onderstaande relayservers.</string>
|
||||
<string name="relay_privacy_description">Relays sturen versleuteld verkeer door en kunnen uw bestanden niet lezen, maar de beheerder kan verbindingsmetadata bekijken.</string>
|
||||
<string name="relay_remove_url">Relayserver verwijderen</string>
|
||||
<string name="relay_restore_failed">De vorige netwerkinstellingen konden niet worden hersteld. Start VniDrop opnieuw en controleer uw relayconfiguratie.</string>
|
||||
<string name="relay_settings_applied">Netwerkinstellingen toegepast.</string>
|
||||
<string name="relay_strict_warning">De aangepaste modus is strikt: VniDrop valt niet terug op openbare relays of openbare detectie. Andere apparaten moeten uw ingestelde relays kunnen bereiken.</string>
|
||||
<string name="relay_validation_duplicate_url">De relay-URL op regel %1$d is gelijk aan een eerdere invoer.</string>
|
||||
<string name="relay_validation_https_required">De relay-URL op regel %1$d moet beginnen met https://.</string>
|
||||
<string name="relay_validation_invalid_url">De relay-URL op regel %1$d is ongeldig.</string>
|
||||
<string name="relay_validation_missing_url">Voeg ten minste één relay-URL toe.</string>
|
||||
<string name="relay_validation_too_many_urls">U kunt maximaal %1$d relayservers instellen.</string>
|
||||
<string name="send_access_anyone">Iedereen met deze overdracht</string>
|
||||
<string name="send_access_anyone_description">Geen goedkeuring vereist. Gebruik dit alleen voor items die u gerust kunt delen.</string>
|
||||
<string name="send_access_anyone_warning">Iedereen met de uitnodiging kan downloaden totdat u stopt met delen. Gebruik dit niet voor privé- of gevoelige items.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Overdracht aangemaakt.</string>
|
||||
<string name="send_transfer_details_title">Overdrachtsdetails</string>
|
||||
<string name="send_transfers_title">Uw overdrachten</string>
|
||||
<string name="settings_advanced_title">Geavanceerd</string>
|
||||
<string name="settings_network_title">Netwerk</string>
|
||||
<string name="settings_subtitle">Uw naam, waar overdrachten worden bewaard, weergave en meldingen.</string>
|
||||
<string name="settings_title">Instellingen</string>
|
||||
<string name="snackbar_dismiss">Sluiten</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Verzoeken, goedkeuringen en voltooide leveringen</string>
|
||||
<string name="transfer_receivers_pending">%1$d in behandeling</string>
|
||||
<string name="transfer_receivers_title">Ontvangers</string>
|
||||
<string name="transfer_qr_unavailable">QR is niet beschikbaar voor deze uitnodiging. Gebruik in plaats daarvan Delen of Downloaden.</string>
|
||||
<string name="transfer_scan_qr">Scan met VniDrop om deze overdracht te ontvangen</string>
|
||||
<string name="transfer_share_description">QR-code, uitnodigingsbestand en opties in de buurt</string>
|
||||
<string name="transfer_share_title">Delen</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Przejrzyj transfer</string>
|
||||
<string name="receive_title">Odbierz</string>
|
||||
<string name="receive_unknown_transfer">Transfer VniDrop</string>
|
||||
<string name="relay_add_url">Dodaj serwer przekaźnikowy</string>
|
||||
<string name="relay_apply">Zastosuj ustawienia sieci</string>
|
||||
<string name="relay_applying">Stosowanie…</string>
|
||||
<string name="relay_apply_active_transfers">Zatrzymaj wszystkie aktywne transfery i udostępnienia przed zastosowaniem ustawień sieci.</string>
|
||||
<string name="relay_apply_failed">Nie udało się zastosować tych ustawień. Przywrócono poprzednie ustawienia sieci.</string>
|
||||
<string name="relay_apply_restart_description">Zastosowanie ustawień ponownie uruchamia połączenie sieciowe VniDrop. Najpierw zatrzymaj aktywne transfery i udostępnienia. Istniejące zaproszenia mogą wymagać ponownego udostępnienia.</string>
|
||||
<string name="relay_custom_urls_help">Wprowadź po jednym adresie URL HTTPS przekaźnika w każdym wierszu. Dane logowania w adresach URL nie są obsługiwane. Certyfikat TLS musi być wystawiony przez publicznie zaufany urząd certyfikacji.</string>
|
||||
<string name="relay_custom_urls_label">Adresy URL przekaźników</string>
|
||||
<string name="relay_mode_automatic">Automatyczny</string>
|
||||
<string name="relay_mode_automatic_description">Używa domyślnej publicznej infrastruktury przekaźników VniDrop, gdy połączenie bezpośrednie jest niedostępne.</string>
|
||||
<string name="relay_mode_custom">Niestandardowy</string>
|
||||
<string name="relay_mode_custom_description">Używa wyłącznie poniższych serwerów przekaźnikowych.</string>
|
||||
<string name="relay_privacy_description">Przekaźniki przesyłają zaszyfrowany ruch i nie mogą odczytać plików, ale ich operator może obserwować metadane połączenia.</string>
|
||||
<string name="relay_remove_url">Usuń serwer przekaźnikowy</string>
|
||||
<string name="relay_restore_failed">Nie udało się przywrócić poprzednich ustawień sieci. Uruchom ponownie VniDrop i sprawdź konfigurację przekaźników.</string>
|
||||
<string name="relay_settings_applied">Zastosowano ustawienia sieci.</string>
|
||||
<string name="relay_strict_warning">Tryb niestandardowy jest rygorystyczny: VniDrop nie użyje awaryjnie publicznych przekaźników ani publicznego wykrywania. Inne urządzenia muszą mieć dostęp do skonfigurowanych przekaźników.</string>
|
||||
<string name="relay_validation_duplicate_url">Adres URL przekaźnika w wierszu %1$d powtarza wcześniejszy wpis.</string>
|
||||
<string name="relay_validation_https_required">Adres URL przekaźnika w wierszu %1$d musi zaczynać się od https://.</string>
|
||||
<string name="relay_validation_invalid_url">Adres URL przekaźnika w wierszu %1$d jest nieprawidłowy.</string>
|
||||
<string name="relay_validation_missing_url">Dodaj co najmniej jeden adres URL przekaźnika.</string>
|
||||
<string name="relay_validation_too_many_urls">Możesz skonfigurować maksymalnie %1$d serwerów przekaźnikowych.</string>
|
||||
<string name="send_access_anyone">Każdy, kto ma ten transfer</string>
|
||||
<string name="send_access_anyone_description">Nie jest wymagane zatwierdzenie. Używaj tylko dla elementów, które możesz swobodnie udostępniać.</string>
|
||||
<string name="send_access_anyone_warning">Każdy, kto ma zaproszenie, może pobierać, dopóki nie zatrzymasz udostępniania. Nie używaj tego dla prywatnych ani wrażliwych elementów.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Transfer utworzony.</string>
|
||||
<string name="send_transfer_details_title">Szczegóły transferu</string>
|
||||
<string name="send_transfers_title">Twoje transfery</string>
|
||||
<string name="settings_advanced_title">Zaawansowane</string>
|
||||
<string name="settings_network_title">Sieć</string>
|
||||
<string name="settings_subtitle">Twoja nazwa, miejsce zapisu transferów, wygląd i powiadomienia.</string>
|
||||
<string name="settings_title">Ustawienia</string>
|
||||
<string name="snackbar_dismiss">Zamknij</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Prośby, zatwierdzenia i ukończone dostawy</string>
|
||||
<string name="transfer_receivers_pending">Oczekujące: %1$d</string>
|
||||
<string name="transfer_receivers_title">Odbiorcy</string>
|
||||
<string name="transfer_qr_unavailable">Kod QR jest niedostępny dla tego zaproszenia. Zamiast tego użyj opcji Udostępnij lub Pobierz.</string>
|
||||
<string name="transfer_scan_qr">Zeskanuj za pomocą VniDrop, aby odebrać ten transfer</string>
|
||||
<string name="transfer_share_description">Kod QR, plik zaproszenia i opcje w pobliżu</string>
|
||||
<string name="transfer_share_title">Udostępnij</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Rever transferência</string>
|
||||
<string name="receive_title">Receber</string>
|
||||
<string name="receive_unknown_transfer">Transferência VniDrop</string>
|
||||
<string name="relay_add_url">Adicionar servidor de retransmissão</string>
|
||||
<string name="relay_apply">Aplicar definições de rede</string>
|
||||
<string name="relay_applying">A aplicar…</string>
|
||||
<string name="relay_apply_active_transfers">Pare todas as transferências e partilhas ativas antes de aplicar as definições de rede.</string>
|
||||
<string name="relay_apply_failed">Não foi possível aplicar estas definições. As definições de rede anteriores foram restauradas.</string>
|
||||
<string name="relay_apply_restart_description">A aplicação reinicia a ligação de rede do VniDrop. Pare primeiro as transferências e partilhas ativas. Poderá ser necessário voltar a partilhar os convites existentes.</string>
|
||||
<string name="relay_custom_urls_help">Introduza um URL HTTPS de retransmissor por linha. Não são suportadas credenciais nos URLs. O certificado TLS tem de ser emitido por uma autoridade de certificação publicamente reconhecida.</string>
|
||||
<string name="relay_custom_urls_label">URLs dos retransmissores</string>
|
||||
<string name="relay_mode_automatic">Automático</string>
|
||||
<string name="relay_mode_automatic_description">Utiliza a infraestrutura pública de retransmissores predefinida do VniDrop quando não está disponível uma ligação direta.</string>
|
||||
<string name="relay_mode_custom">Personalizado</string>
|
||||
<string name="relay_mode_custom_description">Utiliza apenas os servidores de retransmissão abaixo.</string>
|
||||
<string name="relay_privacy_description">Os retransmissores encaminham tráfego cifrado e não conseguem ler os seus ficheiros, mas o operador pode observar metadados da ligação.</string>
|
||||
<string name="relay_remove_url">Remover servidor de retransmissão</string>
|
||||
<string name="relay_restore_failed">Não foi possível restaurar as definições de rede anteriores. Reinicie o VniDrop e reveja a configuração dos retransmissores.</string>
|
||||
<string name="relay_settings_applied">Definições de rede aplicadas.</string>
|
||||
<string name="relay_strict_warning">O modo personalizado é estrito: o VniDrop não recorrerá a retransmissores públicos nem à descoberta pública. Os outros dispositivos têm de conseguir aceder aos retransmissores configurados.</string>
|
||||
<string name="relay_validation_duplicate_url">O URL do retransmissor na linha %1$d duplica uma entrada anterior.</string>
|
||||
<string name="relay_validation_https_required">O URL do retransmissor na linha %1$d tem de começar por https://.</string>
|
||||
<string name="relay_validation_invalid_url">O URL do retransmissor na linha %1$d não é válido.</string>
|
||||
<string name="relay_validation_missing_url">Adicione pelo menos um URL de retransmissor.</string>
|
||||
<string name="relay_validation_too_many_urls">Pode configurar até %1$d servidores de retransmissão.</string>
|
||||
<string name="send_access_anyone">Qualquer pessoa com esta transferência</string>
|
||||
<string name="send_access_anyone_description">Não é necessária aprovação. Utilize apenas para itens que não se importe de partilhar.</string>
|
||||
<string name="send_access_anyone_warning">Qualquer pessoa com o convite pode descarregar até parar de partilhar. Não utilize para itens privados ou sensíveis.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Transferência criada.</string>
|
||||
<string name="send_transfer_details_title">Detalhes da transferência</string>
|
||||
<string name="send_transfers_title">As suas transferências</string>
|
||||
<string name="settings_advanced_title">Avançado</string>
|
||||
<string name="settings_network_title">Rede</string>
|
||||
<string name="settings_subtitle">O seu nome, onde as transferências são guardadas, o aspeto e as notificações.</string>
|
||||
<string name="settings_title">Definições</string>
|
||||
<string name="snackbar_dismiss">Ignorar</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Pedidos, aprovações e entregas concluídas</string>
|
||||
<string name="transfer_receivers_pending">%1$d em espera</string>
|
||||
<string name="transfer_receivers_title">Destinatários</string>
|
||||
<string name="transfer_qr_unavailable">O código QR não está disponível para este convite. Utilize Partilhar ou Transferir.</string>
|
||||
<string name="transfer_scan_qr">Leia com o VniDrop para receber esta transferência</string>
|
||||
<string name="transfer_share_description">Código QR, ficheiro de convite e opções por perto</string>
|
||||
<string name="transfer_share_title">Partilhar</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Проверить передачу</string>
|
||||
<string name="receive_title">Получить</string>
|
||||
<string name="receive_unknown_transfer">Передача VniDrop</string>
|
||||
<string name="relay_add_url">Добавить сервер-ретранслятор</string>
|
||||
<string name="relay_apply">Применить настройки сети</string>
|
||||
<string name="relay_applying">Применение…</string>
|
||||
<string name="relay_apply_active_transfers">Остановите все активные передачи и раздачи перед применением настроек сети.</string>
|
||||
<string name="relay_apply_failed">Не удалось применить эти настройки. Предыдущие настройки сети восстановлены.</string>
|
||||
<string name="relay_apply_restart_description">При применении сетевое соединение VniDrop перезапускается. Сначала остановите активные передачи и раздачи. Возможно, существующие приглашения потребуется отправить повторно.</string>
|
||||
<string name="relay_custom_urls_help">Введите по одному HTTPS-адресу ретранслятора в строке. Учётные данные в URL-адресах не поддерживаются. Сертификат TLS должен быть выдан общедоступным доверенным центром сертификации.</string>
|
||||
<string name="relay_custom_urls_label">URL-адреса ретрансляторов</string>
|
||||
<string name="relay_mode_automatic">Автоматически</string>
|
||||
<string name="relay_mode_automatic_description">Использовать стандартную публичную инфраструктуру ретрансляторов VniDrop, если прямое соединение недоступно.</string>
|
||||
<string name="relay_mode_custom">Пользовательский</string>
|
||||
<string name="relay_mode_custom_description">Использовать только указанные ниже серверы-ретрансляторы.</string>
|
||||
<string name="relay_privacy_description">Ретрансляторы передают зашифрованный трафик и не могут читать ваши файлы, но их оператор может видеть метаданные соединения.</string>
|
||||
<string name="relay_remove_url">Удалить сервер-ретранслятор</string>
|
||||
<string name="relay_restore_failed">Не удалось восстановить предыдущие настройки сети. Перезапустите VniDrop и проверьте конфигурацию ретрансляторов.</string>
|
||||
<string name="relay_settings_applied">Настройки сети применены.</string>
|
||||
<string name="relay_strict_warning">Пользовательский режим работает строго: VniDrop не будет переключаться на публичные ретрансляторы или публичное обнаружение. Другие устройства должны иметь доступ к настроенным ретрансляторам.</string>
|
||||
<string name="relay_validation_duplicate_url">URL-адрес ретранслятора в строке %1$d повторяет предыдущую запись.</string>
|
||||
<string name="relay_validation_https_required">URL-адрес ретранслятора в строке %1$d должен начинаться с https://.</string>
|
||||
<string name="relay_validation_invalid_url">URL-адрес ретранслятора в строке %1$d недействителен.</string>
|
||||
<string name="relay_validation_missing_url">Добавьте хотя бы один URL-адрес ретранслятора.</string>
|
||||
<string name="relay_validation_too_many_urls">Можно настроить до %1$d серверов-ретрансляторов.</string>
|
||||
<string name="send_access_anyone">Любой, у кого есть эта передача</string>
|
||||
<string name="send_access_anyone_description">Одобрение не требуется. Используйте только для объектов, которыми вы готовы поделиться.</string>
|
||||
<string name="send_access_anyone_warning">Любой, у кого есть приглашение, может загружать, пока вы не остановите общий доступ. Не используйте это для личных или конфиденциальных объектов.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Передача создана.</string>
|
||||
<string name="send_transfer_details_title">Сведения о передаче</string>
|
||||
<string name="send_transfers_title">Ваши передачи</string>
|
||||
<string name="settings_advanced_title">Дополнительно</string>
|
||||
<string name="settings_network_title">Сеть</string>
|
||||
<string name="settings_subtitle">Ваше имя, место сохранения передач, оформление и уведомления.</string>
|
||||
<string name="settings_title">Настройки</string>
|
||||
<string name="snackbar_dismiss">Закрыть</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Запросы, одобрения и завершённые доставки</string>
|
||||
<string name="transfer_receivers_pending">Ожидают: %1$d</string>
|
||||
<string name="transfer_receivers_title">Получатели</string>
|
||||
<string name="transfer_qr_unavailable">QR-код недоступен для этого приглашения. Используйте «Поделиться» или «Скачать».</string>
|
||||
<string name="transfer_scan_qr">Отсканируйте с помощью VniDrop, чтобы получить эту передачу</string>
|
||||
<string name="transfer_share_description">QR-код, файл приглашения и варианты поблизости</string>
|
||||
<string name="transfer_share_title">Поделиться</string>
|
||||
|
||||
@@ -169,6 +169,28 @@
|
||||
<string name="receive_review_title">Review transfer</string>
|
||||
<string name="receive_title">Receive</string>
|
||||
<string name="receive_unknown_transfer">VniDrop transfer</string>
|
||||
<string name="relay_add_url">Add relay server</string>
|
||||
<string name="relay_apply">Apply network settings</string>
|
||||
<string name="relay_applying">Applying…</string>
|
||||
<string name="relay_apply_active_transfers">Stop all active transfers and shares before applying network settings.</string>
|
||||
<string name="relay_apply_failed">Could not apply these settings. The previous network settings were restored.</string>
|
||||
<string name="relay_apply_restart_description">Applying restarts VniDrop’s network connection. Stop active transfers and shares first. Existing invitations may need to be shared again.</string>
|
||||
<string name="relay_custom_urls_help">Enter one HTTPS relay URL per line. URL credentials are not supported. The TLS certificate must be issued by a publicly trusted certificate authority.</string>
|
||||
<string name="relay_custom_urls_label">Relay URLs</string>
|
||||
<string name="relay_mode_automatic">Automatic</string>
|
||||
<string name="relay_mode_automatic_description">Use VniDrop’s default public relay infrastructure when a direct connection is unavailable.</string>
|
||||
<string name="relay_mode_custom">Custom</string>
|
||||
<string name="relay_mode_custom_description">Use only the relay servers below.</string>
|
||||
<string name="relay_privacy_description">Relays forward encrypted traffic and cannot read your files, but their operator can observe connection metadata.</string>
|
||||
<string name="relay_remove_url">Remove relay server</string>
|
||||
<string name="relay_restore_failed">Could not restore the previous network settings. Restart VniDrop and review your relay configuration.</string>
|
||||
<string name="relay_settings_applied">Network settings applied.</string>
|
||||
<string name="relay_strict_warning">Custom mode is strict: VniDrop will not fall back to public relays or public discovery. Other devices must be able to reach your configured relays.</string>
|
||||
<string name="relay_validation_duplicate_url">Relay URL on line %1$d duplicates an earlier entry.</string>
|
||||
<string name="relay_validation_https_required">Relay URL on line %1$d must start with https://.</string>
|
||||
<string name="relay_validation_invalid_url">Relay URL on line %1$d is not valid.</string>
|
||||
<string name="relay_validation_missing_url">Add at least one relay URL.</string>
|
||||
<string name="relay_validation_too_many_urls">You can configure up to %1$d relay servers.</string>
|
||||
<string name="send_access_anyone">Anyone with this transfer</string>
|
||||
<string name="send_access_anyone_description">No approval is required. Only use this for items you are comfortable sharing.</string>
|
||||
<string name="send_access_anyone_warning">Anyone with the invitation can download until you stop sharing. Do not use this for private or sensitive items.</string>
|
||||
@@ -192,6 +214,8 @@
|
||||
<string name="send_transfer_created">Transfer created.</string>
|
||||
<string name="send_transfer_details_title">Transfer details</string>
|
||||
<string name="send_transfers_title">Your transfers</string>
|
||||
<string name="settings_advanced_title">Advanced</string>
|
||||
<string name="settings_network_title">Network</string>
|
||||
<string name="settings_subtitle">Your name, where transfers are saved, appearance, and notifications.</string>
|
||||
<string name="settings_title">Settings</string>
|
||||
<string name="snackbar_dismiss">Dismiss</string>
|
||||
@@ -250,6 +274,7 @@
|
||||
<string name="transfer_receivers_description">Requests, approvals, and completed deliveries</string>
|
||||
<string name="transfer_receivers_pending">%1$d waiting</string>
|
||||
<string name="transfer_receivers_title">Receivers</string>
|
||||
<string name="transfer_qr_unavailable">QR unavailable for this invitation. Use Share or Download instead.</string>
|
||||
<string name="transfer_scan_qr">Scan with VniDrop to receive this transfer</string>
|
||||
<string name="transfer_share_description">QR code, invitation file, and nearby options</string>
|
||||
<string name="transfer_share_title">Share</string>
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.vnidrop.app.core
|
||||
|
||||
import kotlinx.coroutines.NonCancellable
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
internal class CoreLifecycleBusyException(message: String) : IllegalStateException(message)
|
||||
|
||||
internal class CoreLifecycleGate {
|
||||
private val mutex = Mutex()
|
||||
private var reconfiguring = false
|
||||
private var inFlightCalls = 0
|
||||
|
||||
suspend fun <C, T> withCall(
|
||||
capture: () -> C,
|
||||
block: suspend (C) -> T,
|
||||
): T {
|
||||
val captured = mutex.withLock {
|
||||
if (reconfiguring) throw CoreLifecycleBusyException("Core network configuration is changing")
|
||||
val value = capture()
|
||||
inFlightCalls += 1
|
||||
value
|
||||
}
|
||||
return try {
|
||||
block(captured)
|
||||
} finally {
|
||||
withContext(NonCancellable) {
|
||||
mutex.withLock {
|
||||
check(inFlightCalls > 0)
|
||||
inFlightCalls -= 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun <T> withReconfiguration(block: suspend () -> T): T {
|
||||
mutex.withLock {
|
||||
if (reconfiguring) throw CoreLifecycleBusyException("Core network configuration is already changing")
|
||||
if (inFlightCalls > 0) throw CoreLifecycleBusyException("Core calls are still active")
|
||||
reconfiguring = true
|
||||
}
|
||||
return try {
|
||||
block()
|
||||
} finally {
|
||||
withContext(NonCancellable) {
|
||||
mutex.withLock { reconfiguring = false }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,16 @@ enum class ShareAccessPolicy {
|
||||
AnyoneWithTransfer,
|
||||
}
|
||||
|
||||
enum class RelayMode {
|
||||
Automatic,
|
||||
Custom,
|
||||
}
|
||||
|
||||
data class RelaySettings(
|
||||
val mode: RelayMode = RelayMode.Automatic,
|
||||
val relayUrls: List<String> = emptyList(),
|
||||
)
|
||||
|
||||
enum class TransferDirection {
|
||||
Send,
|
||||
Receive,
|
||||
@@ -142,7 +152,10 @@ interface CoreGateway {
|
||||
val state: StateFlow<CoreState>
|
||||
val signals: SharedFlow<CoreSignal>
|
||||
|
||||
suspend fun initialize(appDataDir: String): Result<Unit>
|
||||
suspend fun initialize(
|
||||
appDataDir: String,
|
||||
relaySettings: RelaySettings = RelaySettings(),
|
||||
): Result<Unit>
|
||||
fun shutdown()
|
||||
suspend fun sharePath(path: String, transferName: String, senderName: String, accessPolicy: ShareAccessPolicy): Result<Share>
|
||||
suspend fun shareFileDescriptor(
|
||||
|
||||
@@ -16,6 +16,8 @@ import kotlinx.coroutines.withContext
|
||||
import kotlin.random.Random
|
||||
import uniffi.vnidrop.CoreEvent
|
||||
import uniffi.vnidrop.CoreEventSink
|
||||
import uniffi.vnidrop.CoreNetworkConfig
|
||||
import uniffi.vnidrop.CoreRelayMode
|
||||
import uniffi.vnidrop.ReceiveOutputSink
|
||||
import uniffi.vnidrop.ReceiveOutputSinkV2
|
||||
import uniffi.vnidrop.ReceiverRequest
|
||||
@@ -28,6 +30,7 @@ import uniffi.vnidrop.TicketInspection
|
||||
import uniffi.vnidrop.TransferMetadata
|
||||
import uniffi.vnidrop.TransferAccessMode
|
||||
import uniffi.vnidrop.VnidropCore
|
||||
import uniffi.vnidrop.defaultCoreNetworkConfig
|
||||
|
||||
class CoreRepository(
|
||||
private val dispatcher: CoroutineDispatcher = Dispatchers.IO,
|
||||
@@ -42,6 +45,7 @@ class CoreRepository(
|
||||
override val signals: SharedFlow<CoreSignal> = _signals.asSharedFlow()
|
||||
|
||||
private var core: VnidropCore? = null
|
||||
private val lifecycleGate = CoreLifecycleGate()
|
||||
|
||||
private val sink = object : CoreEventSink {
|
||||
override fun onEvent(event: CoreEvent) {
|
||||
@@ -60,12 +64,22 @@ class CoreRepository(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun initialize(appDataDir: String): Result<Unit> = runCore {
|
||||
core?.shutdown()
|
||||
core = VnidropCore.initialize(appDataDir, sink)
|
||||
refreshSnapshot()
|
||||
_state.update { it.copy(isInitialized = true) }
|
||||
}
|
||||
override suspend fun initialize(appDataDir: String, relaySettings: RelaySettings): Result<Unit> =
|
||||
runReconfiguration {
|
||||
val previousCore = core
|
||||
if (previousCore != null) {
|
||||
val status = previousCore.status()
|
||||
require(status.activeTransfers == 0UL && status.activeShares == 0UL) {
|
||||
"Stop active transfers and shares before changing relay settings"
|
||||
}
|
||||
}
|
||||
_state.update { it.copy(isInitialized = false, status = null) }
|
||||
previousCore?.shutdown()
|
||||
core = null
|
||||
core = VnidropCore.initializeWithNetworkConfig(appDataDir, sink, relaySettings.toNative())
|
||||
refreshSnapshot(requireCore())
|
||||
_state.update { it.copy(isInitialized = true) }
|
||||
}
|
||||
|
||||
override fun shutdown() {
|
||||
core?.shutdown()
|
||||
@@ -114,37 +128,37 @@ class CoreRepository(
|
||||
accessPolicy = accessPolicy,
|
||||
)
|
||||
|
||||
override suspend fun inspectTicket(ticket: String): Result<TicketInspectionModel> = runCore {
|
||||
requireCore().inspectTicket(ticket).toModel().also { inspection ->
|
||||
override suspend fun inspectTicket(ticket: String): Result<TicketInspectionModel> = runCore { activeCore ->
|
||||
activeCore.inspectTicket(ticket).toModel().also { inspection ->
|
||||
_state.update { it.copy(lastInspection = inspection) }
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun receive(ticket: String, outputDir: String, receiverName: String): Result<Unit> = runCore {
|
||||
requireCore().receive(ticket, outputDir, receiverName.ifBlank { null })
|
||||
refreshSnapshot()
|
||||
override suspend fun receive(ticket: String, outputDir: String, receiverName: String): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.receive(ticket, outputDir, receiverName.ifBlank { null })
|
||||
refreshSnapshot(activeCore)
|
||||
}
|
||||
|
||||
override suspend fun receiveWithOutputSink(
|
||||
ticket: String,
|
||||
outputSink: ReceiveOutputSink,
|
||||
receiverName: String,
|
||||
): Result<Unit> = runCore {
|
||||
requireCore().receiveWithOutputSink(ticket, outputSink, receiverName.ifBlank { null })
|
||||
refreshSnapshot()
|
||||
): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.receiveWithOutputSink(ticket, outputSink, receiverName.ifBlank { null })
|
||||
refreshSnapshot(activeCore)
|
||||
}
|
||||
|
||||
override suspend fun receiveWithOutputSinkV2(
|
||||
ticket: String,
|
||||
outputSink: ReceiveOutputSinkV2,
|
||||
receiverName: String,
|
||||
): Result<Unit> = runCore {
|
||||
requireCore().receiveWithOutputSinkV2(ticket, outputSink, receiverName.ifBlank { null })
|
||||
refreshSnapshot()
|
||||
): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.receiveWithOutputSinkV2(ticket, outputSink, receiverName.ifBlank { null })
|
||||
refreshSnapshot(activeCore)
|
||||
}
|
||||
|
||||
override suspend fun storageUsage(): Result<CoreStorageUsageModel> = runCore {
|
||||
val usage = requireCore().storageUsage()
|
||||
override suspend fun storageUsage(): Result<CoreStorageUsageModel> = runCore { activeCore ->
|
||||
val usage = activeCore.storageUsage()
|
||||
CoreStorageUsageModel(
|
||||
blobStoreBytes = usage.blobStoreBytes,
|
||||
databaseBytes = usage.databaseBytes,
|
||||
@@ -154,8 +168,8 @@ class CoreRepository(
|
||||
)
|
||||
}
|
||||
|
||||
override suspend fun receivedArtifacts(): Result<List<ReceivedArtifactModel>> = runCore {
|
||||
requireCore().listReceivedArtifacts().map { artifact ->
|
||||
override suspend fun receivedArtifacts(): Result<List<ReceivedArtifactModel>> = runCore { activeCore ->
|
||||
activeCore.listReceivedArtifacts().map { artifact ->
|
||||
ReceivedArtifactModel(
|
||||
id = artifact.id,
|
||||
locator = artifact.locator,
|
||||
@@ -165,47 +179,47 @@ class CoreRepository(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun cancel(transferId: ULong): Result<Unit> = runCore {
|
||||
requireCore().cancelTransfer(transferId)
|
||||
refreshSnapshot()
|
||||
override suspend fun cancel(transferId: ULong): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.cancelTransfer(transferId)
|
||||
refreshSnapshot(activeCore)
|
||||
}
|
||||
|
||||
override suspend fun delete(transferId: ULong): Result<Unit> = runCore {
|
||||
requireCore().deleteTransfer(transferId)
|
||||
refreshSnapshot()
|
||||
override suspend fun delete(transferId: ULong): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.deleteTransfer(transferId)
|
||||
refreshSnapshot(activeCore)
|
||||
_signals.tryEmit(CoreSignal.ApprovalChanged(transferId))
|
||||
_signals.tryEmit(CoreSignal.ReceiverHistoryChanged(transferId))
|
||||
}
|
||||
|
||||
override suspend fun clearReceiveHistory(): Result<ULong> = runCore {
|
||||
val deleted = requireCore().deleteReceiveHistory()
|
||||
refreshSnapshot()
|
||||
override suspend fun clearReceiveHistory(): Result<ULong> = runCore { activeCore ->
|
||||
val deleted = activeCore.deleteReceiveHistory()
|
||||
refreshSnapshot(activeCore)
|
||||
deleted
|
||||
}
|
||||
|
||||
override suspend fun receiverRequests(transferId: ULong): Result<List<ReceiverRequestModel>> = runCore {
|
||||
requireCore().listReceiverRequests(transferId).map(ReceiverRequest::toModel)
|
||||
override suspend fun receiverRequests(transferId: ULong): Result<List<ReceiverRequestModel>> = runCore { activeCore ->
|
||||
activeCore.listReceiverRequests(transferId).map(ReceiverRequest::toModel)
|
||||
}
|
||||
|
||||
override suspend fun respondReceiverRequest(
|
||||
requestId: String,
|
||||
accepted: Boolean,
|
||||
reason: String?,
|
||||
): Result<Unit> = runCore {
|
||||
requireCore().respondReceiverRequest(requestId, accepted, reason)
|
||||
): Result<Unit> = runCore { activeCore ->
|
||||
activeCore.respondReceiverRequest(requestId, accepted, reason)
|
||||
}
|
||||
|
||||
override suspend fun refresh(): Result<Unit> = runCore { refreshSnapshot() }
|
||||
override suspend fun refresh(): Result<Unit> = runCore(::refreshSnapshot)
|
||||
|
||||
override suspend fun shareSources(
|
||||
sources: List<ShareSource>,
|
||||
transferName: String,
|
||||
senderName: String,
|
||||
accessPolicy: ShareAccessPolicy,
|
||||
): Result<Share> = runCore {
|
||||
): Result<Share> = runCore { activeCore ->
|
||||
require(sources.isNotEmpty()) { "Select at least one file to share" }
|
||||
withPlatformPathAccess(sources) {
|
||||
requireCore().shareFiles(
|
||||
activeCore.shareFiles(
|
||||
sources = sources,
|
||||
metadata = ShareMetadataInput(
|
||||
transferId = nextTransferId(),
|
||||
@@ -215,7 +229,7 @@ class CoreRepository(
|
||||
),
|
||||
).toModel()
|
||||
}.also { share ->
|
||||
refreshSnapshot()
|
||||
refreshSnapshot(activeCore)
|
||||
_state.update { it.copy(lastShare = share) }
|
||||
}
|
||||
}
|
||||
@@ -232,8 +246,7 @@ class CoreRepository(
|
||||
}
|
||||
}
|
||||
|
||||
private fun refreshSnapshot() {
|
||||
val activeCore = requireCore()
|
||||
private fun refreshSnapshot(activeCore: VnidropCore) {
|
||||
val status = activeCore.status()
|
||||
_state.update {
|
||||
it.copy(
|
||||
@@ -244,10 +257,25 @@ class CoreRepository(
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun <T> runCore(block: suspend () -> T): Result<T> =
|
||||
private suspend fun <T> runCore(block: suspend (VnidropCore) -> T): Result<T> =
|
||||
withContext(dispatcher) {
|
||||
try {
|
||||
Result.success(block())
|
||||
Result.success(
|
||||
lifecycleGate.withCall(
|
||||
capture = ::requireCore,
|
||||
block = block,
|
||||
),
|
||||
)
|
||||
} catch (error: Throwable) {
|
||||
if (error is CancellationException) throw error
|
||||
Result.failure(error)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun <T> runReconfiguration(block: suspend () -> T): Result<T> =
|
||||
withContext(dispatcher) {
|
||||
try {
|
||||
Result.success(lifecycleGate.withReconfiguration(block))
|
||||
} catch (error: Throwable) {
|
||||
if (error is CancellationException) throw error
|
||||
Result.failure(error)
|
||||
@@ -263,6 +291,14 @@ class CoreRepository(
|
||||
}
|
||||
}
|
||||
|
||||
private fun RelaySettings.toNative(): CoreNetworkConfig = when (mode) {
|
||||
RelayMode.Automatic -> defaultCoreNetworkConfig()
|
||||
RelayMode.Custom -> CoreNetworkConfig(
|
||||
mode = CoreRelayMode.CUSTOM,
|
||||
relayUrls = relayUrls,
|
||||
)
|
||||
}
|
||||
|
||||
private fun CoreEvent.toModel(): CoreEventModel = CoreEventModel(
|
||||
id = id,
|
||||
timestamp = timestamp,
|
||||
|
||||
@@ -15,6 +15,7 @@ import com.vnidrop.app.ui.theme.ThemeMode
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@@ -46,7 +47,8 @@ class AppViewModel(
|
||||
AppLogger.info("lifecycle", "app started", mapOf("platform" to environment.name))
|
||||
diagnostics?.record("app_open", mapOf("platform" to environment.name, "version" to environment.appVersion))
|
||||
viewModelScope.launch {
|
||||
repository.initialize(environment.defaultCoreDataDir).onFailure(messages::error)
|
||||
val relaySettings = preferencesRepository.preferences.first().relaySettings
|
||||
repository.initialize(environment.defaultCoreDataDir, relaySettings).onFailure(messages::error)
|
||||
}
|
||||
viewModelScope.launch {
|
||||
preferencesRepository.preferences.collect { preferences ->
|
||||
|
||||
@@ -12,6 +12,7 @@ import com.vnidrop.app.core.CoreState
|
||||
import com.vnidrop.app.core.ReceiverDeliveryStatus
|
||||
import com.vnidrop.app.core.ShareAccessPolicy
|
||||
import com.vnidrop.app.core.TransferDirection
|
||||
import com.vnidrop.app.core.TransferStatus
|
||||
import com.vnidrop.app.ui.components.AdaptiveDrawer
|
||||
import com.vnidrop.app.ui.state.WindowClass
|
||||
|
||||
@@ -96,7 +97,12 @@ fun SendScreen(
|
||||
}
|
||||
}
|
||||
|
||||
if (selectedTransfer != null && state.detailPanel != null) {
|
||||
val canShowDetailPanel = selectedTransfer != null && when (state.detailPanel) {
|
||||
TransferDetailPanel.Share -> selectedTransfer.status in setOf(TransferStatus.Importing, TransferStatus.Sharing)
|
||||
TransferDetailPanel.Activity, TransferDetailPanel.Receivers -> true
|
||||
null -> false
|
||||
}
|
||||
if (selectedTransfer != null && state.detailPanel != null && canShowDetailPanel) {
|
||||
AdaptiveDrawer(windowClass = windowClass, onDismissRequest = onCloseDetailPanel) {
|
||||
when (state.detailPanel) {
|
||||
TransferDetailPanel.Activity -> TransferActivityPanel(coreState.events, selectedTransfer.transferId)
|
||||
|
||||
@@ -209,7 +209,12 @@ class SendViewModel(
|
||||
)
|
||||
}
|
||||
fun openActivity() = _state.update { it.copy(detailPanel = TransferDetailPanel.Activity) }
|
||||
fun openShare() = _state.update { it.copy(detailPanel = TransferDetailPanel.Share) }
|
||||
fun openShare() {
|
||||
val selectedId = _state.value.selectedTransferId ?: return
|
||||
val selected = coreState.value.transfers.firstOrNull { it.transferId == selectedId } ?: return
|
||||
if (selected.status !in setOf(TransferStatus.Importing, TransferStatus.Sharing)) return
|
||||
_state.update { it.copy(detailPanel = TransferDetailPanel.Share) }
|
||||
}
|
||||
fun openReceivers() {
|
||||
val transferId = _state.value.selectedTransferId ?: return
|
||||
_state.update { it.copy(detailPanel = TransferDetailPanel.Receivers) }
|
||||
|
||||
@@ -46,6 +46,7 @@ import com.vnidrop.app.core.ReceiverDeliveryStatus
|
||||
import com.vnidrop.app.core.ReceiverRequestModel
|
||||
import com.vnidrop.app.core.ShareAccessPolicy
|
||||
import com.vnidrop.app.core.Transfer
|
||||
import com.vnidrop.app.core.TransferStatus
|
||||
import com.vnidrop.app.ui.components.AppCard
|
||||
import com.vnidrop.app.ui.components.DestructiveButton
|
||||
import com.vnidrop.app.ui.components.PrimaryButton
|
||||
@@ -60,12 +61,19 @@ import com.vnidrop.app.ui.state.progressForReceiver
|
||||
import com.vnidrop.app.ui.theme.LocalVniDropColors
|
||||
import org.jetbrains.compose.resources.decodeToImageBitmap
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import vnidrop.shared.generated.resources.*
|
||||
|
||||
enum class InvitationAction { Export, Share, Nfc }
|
||||
|
||||
private sealed interface TransferQrRenderState {
|
||||
data object Loading : TransferQrRenderState
|
||||
data object Unavailable : TransferQrRenderState
|
||||
data class Ready(val bitmap: androidx.compose.ui.graphics.ImageBitmap) : TransferQrRenderState
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun TransferDetails(
|
||||
transfer: Transfer,
|
||||
@@ -122,12 +130,29 @@ internal fun TransferDetails(
|
||||
count = pendingReceivers + completedReceivers,
|
||||
onClick = onReceivers,
|
||||
)
|
||||
HorizontalDivider(color = LocalVniDropColors.current.borderDefault)
|
||||
DetailDestination(
|
||||
title = stringResource(Res.string.transfer_share_title),
|
||||
description = stringResource(Res.string.transfer_share_description),
|
||||
onClick = onShare,
|
||||
)
|
||||
when (transfer.status) {
|
||||
TransferStatus.Sharing -> {
|
||||
HorizontalDivider(color = LocalVniDropColors.current.borderDefault)
|
||||
DetailDestination(
|
||||
title = stringResource(Res.string.transfer_share_title),
|
||||
description = stringResource(Res.string.transfer_share_description),
|
||||
onClick = onShare,
|
||||
)
|
||||
}
|
||||
TransferStatus.Importing -> {
|
||||
HorizontalDivider(color = LocalVniDropColors.current.borderDefault)
|
||||
DetailDestination(
|
||||
title = stringResource(Res.string.transfer_share_title),
|
||||
description = stringResource(Res.string.transfer_event_preparing),
|
||||
)
|
||||
}
|
||||
TransferStatus.Receiving,
|
||||
TransferStatus.Done,
|
||||
TransferStatus.Failed,
|
||||
TransferStatus.Cancelled,
|
||||
TransferStatus.Stopped,
|
||||
-> Unit
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,9 +169,12 @@ private fun receiversDescription(pending: Int, completed: Int): String = when {
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun DetailDestination(title: String, description: String, count: Int? = null, onClick: () -> Unit) {
|
||||
private fun DetailDestination(title: String, description: String, count: Int? = null, onClick: (() -> Unit)? = null) {
|
||||
Row(
|
||||
Modifier.fillMaxWidth().clickable(onClick = onClick).padding(16.dp),
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.then(if (onClick == null) Modifier else Modifier.clickable(onClick = onClick))
|
||||
.padding(16.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
||||
@@ -157,7 +185,9 @@ private fun DetailDestination(title: String, description: String, count: Int? =
|
||||
Text(count.toString(), modifier = Modifier.background(LocalVniDropColors.current.backgroundSelection, RoundedCornerShape(20.dp)).padding(horizontal = 9.dp, vertical = 3.dp))
|
||||
Spacer(Modifier.width(8.dp))
|
||||
}
|
||||
PlatformIcon(AppIcon.ChevronRight, null, tint = LocalVniDropColors.current.foregroundLighter, modifier = Modifier.size(18.dp))
|
||||
if (onClick != null) {
|
||||
PlatformIcon(AppIcon.ChevronRight, null, tint = LocalVniDropColors.current.foregroundLighter, modifier = Modifier.size(18.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -240,41 +270,71 @@ internal fun TransferSharePanel(
|
||||
DisposableEffect(actions) { onDispose(actions::cancelNfcWrite) }
|
||||
val ticket = transfer.ticket
|
||||
PanelContainer(stringResource(Res.string.transfer_share_title)) {
|
||||
if (transfer.status == TransferStatus.Importing) {
|
||||
Text(stringResource(Res.string.transfer_event_preparing), color = LocalVniDropColors.current.foregroundLighter)
|
||||
return@PanelContainer
|
||||
}
|
||||
if (transfer.status != TransferStatus.Sharing) return@PanelContainer
|
||||
if (ticket == null) {
|
||||
Text(stringResource(Res.string.transfer_event_preparing), color = LocalVniDropColors.current.foregroundLighter)
|
||||
return@PanelContainer
|
||||
}
|
||||
val renderedBitmap by produceState(qrBitmap, ticket, qrBitmap) {
|
||||
if (value == null) {
|
||||
value = withContext(Dispatchers.Default) {
|
||||
runCatching { buildTransferQrCode(ticket).renderToBytes().decodeToImageBitmap() }.getOrNull()
|
||||
val qrRenderState by produceState<TransferQrRenderState>(
|
||||
initialValue = qrBitmap?.let(TransferQrRenderState::Ready) ?: TransferQrRenderState.Loading,
|
||||
key1 = ticket,
|
||||
key2 = qrBitmap,
|
||||
) {
|
||||
if (qrBitmap != null) {
|
||||
value = TransferQrRenderState.Ready(qrBitmap)
|
||||
return@produceState
|
||||
}
|
||||
value = try {
|
||||
val bitmap = withContext(Dispatchers.Default) {
|
||||
buildTransferQrCode(ticket).renderToBytes().decodeToImageBitmap()
|
||||
}
|
||||
value?.let { onQrRendered(ticket, it) }
|
||||
onQrRendered(ticket, bitmap)
|
||||
TransferQrRenderState.Ready(bitmap)
|
||||
} catch (error: CancellationException) {
|
||||
throw error
|
||||
} catch (_: Throwable) {
|
||||
TransferQrRenderState.Unavailable
|
||||
}
|
||||
}
|
||||
val renderedQr = renderedBitmap
|
||||
Surface(
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally).size(268.dp),
|
||||
shape = RoundedCornerShape(18.dp),
|
||||
color = Color.White,
|
||||
) {
|
||||
if (renderedQr != null) {
|
||||
when (val qrState = qrRenderState) {
|
||||
is TransferQrRenderState.Ready -> Surface(
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally).size(268.dp),
|
||||
shape = RoundedCornerShape(18.dp),
|
||||
color = Color.White,
|
||||
) {
|
||||
Image(
|
||||
bitmap = renderedQr,
|
||||
bitmap = qrState.bitmap,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.padding(14.dp).fillMaxSize(),
|
||||
filterQuality = FilterQuality.None,
|
||||
)
|
||||
} else {
|
||||
}
|
||||
TransferQrRenderState.Loading -> Surface(
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally).size(268.dp),
|
||||
shape = RoundedCornerShape(18.dp),
|
||||
color = Color.White,
|
||||
) {
|
||||
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() }
|
||||
}
|
||||
TransferQrRenderState.Unavailable -> Text(
|
||||
stringResource(Res.string.transfer_qr_unavailable),
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally),
|
||||
color = LocalVniDropColors.current.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
if (qrRenderState is TransferQrRenderState.Ready) {
|
||||
Text(
|
||||
stringResource(Res.string.transfer_scan_qr),
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally),
|
||||
color = LocalVniDropColors.current.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
Text(
|
||||
stringResource(Res.string.transfer_scan_qr),
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally),
|
||||
color = LocalVniDropColors.current.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
if (actions.nfcAvailability != NfcShareAvailability.Hidden) {
|
||||
var writingNfc by remember(ticket) { mutableStateOf(false) }
|
||||
SecondaryButton(
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
package com.vnidrop.app.feature.settings
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.text.selection.SelectionContainer
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.ui.components.Field
|
||||
import com.vnidrop.app.ui.components.PrimaryButton
|
||||
import com.vnidrop.app.ui.icons.AppIcon
|
||||
import com.vnidrop.app.ui.icons.PlatformIcon
|
||||
import com.vnidrop.app.ui.theme.LocalVniDropColors
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import vnidrop.shared.generated.resources.Res
|
||||
import vnidrop.shared.generated.resources.approval_endpoint_id
|
||||
import vnidrop.shared.generated.resources.relay_apply
|
||||
import vnidrop.shared.generated.resources.relay_apply_active_transfers
|
||||
import vnidrop.shared.generated.resources.relay_apply_failed
|
||||
import vnidrop.shared.generated.resources.relay_apply_restart_description
|
||||
import vnidrop.shared.generated.resources.relay_applying
|
||||
import vnidrop.shared.generated.resources.relay_custom_urls_help
|
||||
import vnidrop.shared.generated.resources.relay_custom_urls_label
|
||||
import vnidrop.shared.generated.resources.relay_mode_automatic
|
||||
import vnidrop.shared.generated.resources.relay_mode_automatic_description
|
||||
import vnidrop.shared.generated.resources.relay_mode_custom
|
||||
import vnidrop.shared.generated.resources.relay_mode_custom_description
|
||||
import vnidrop.shared.generated.resources.relay_privacy_description
|
||||
import vnidrop.shared.generated.resources.relay_restore_failed
|
||||
import vnidrop.shared.generated.resources.relay_strict_warning
|
||||
import vnidrop.shared.generated.resources.relay_validation_duplicate_url
|
||||
import vnidrop.shared.generated.resources.relay_validation_https_required
|
||||
import vnidrop.shared.generated.resources.relay_validation_invalid_url
|
||||
import vnidrop.shared.generated.resources.relay_validation_missing_url
|
||||
import vnidrop.shared.generated.resources.relay_validation_too_many_urls
|
||||
import vnidrop.shared.generated.resources.settings_network_title
|
||||
|
||||
@Composable
|
||||
internal fun NetworkSettings(
|
||||
state: SettingsState,
|
||||
onModeChanged: (RelayMode) -> Unit,
|
||||
onUrlsChanged: (String) -> Unit,
|
||||
onApply: () -> Unit,
|
||||
onBack: () -> Unit,
|
||||
showBack: Boolean,
|
||||
) {
|
||||
val colors = LocalVniDropColors.current
|
||||
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
|
||||
SettingsTopBar(stringResource(Res.string.settings_network_title), onBack, showBack)
|
||||
state.endpointId?.takeIf(String::isNotBlank)?.let { endpointId ->
|
||||
SelectionContainer {
|
||||
Text(
|
||||
stringResource(Res.string.approval_endpoint_id, endpointId),
|
||||
color = colors.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
}
|
||||
SettingsGroup {
|
||||
RelayModeRow(
|
||||
icon = AppIcon.Globe,
|
||||
title = stringResource(Res.string.relay_mode_automatic),
|
||||
description = stringResource(Res.string.relay_mode_automatic_description),
|
||||
selected = state.relayMode == RelayMode.Automatic,
|
||||
enabled = !state.isApplyingRelaySettings,
|
||||
onClick = { onModeChanged(RelayMode.Automatic) },
|
||||
)
|
||||
SettingsDivider()
|
||||
RelayModeRow(
|
||||
icon = AppIcon.Radio,
|
||||
title = stringResource(Res.string.relay_mode_custom),
|
||||
description = stringResource(Res.string.relay_mode_custom_description),
|
||||
selected = state.relayMode == RelayMode.Custom,
|
||||
enabled = !state.isApplyingRelaySettings,
|
||||
onClick = { onModeChanged(RelayMode.Custom) },
|
||||
)
|
||||
}
|
||||
if (state.relayMode == RelayMode.Custom) {
|
||||
Field(
|
||||
value = state.relayUrlsText,
|
||||
onValueChange = onUrlsChanged,
|
||||
label = stringResource(Res.string.relay_custom_urls_label),
|
||||
minLines = 3,
|
||||
enabled = !state.isApplyingRelaySettings,
|
||||
)
|
||||
Text(
|
||||
stringResource(Res.string.relay_custom_urls_help),
|
||||
color = colors.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
Text(
|
||||
stringResource(Res.string.relay_strict_warning),
|
||||
color = colors.foregroundLight,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
fontWeight = FontWeight.Medium,
|
||||
)
|
||||
Text(
|
||||
stringResource(Res.string.relay_privacy_description),
|
||||
color = colors.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
relayErrorText(state)?.let { error ->
|
||||
Text(
|
||||
error,
|
||||
color = colors.destructiveDefault,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
fontWeight = FontWeight.Medium,
|
||||
)
|
||||
}
|
||||
Text(
|
||||
stringResource(Res.string.relay_apply_restart_description),
|
||||
color = colors.foregroundLighter,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
PrimaryButton(
|
||||
text = stringResource(
|
||||
if (state.isApplyingRelaySettings) Res.string.relay_applying else Res.string.relay_apply,
|
||||
),
|
||||
onClick = onApply,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
enabled = state.hasRelaySettingsChanges &&
|
||||
!state.isApplyingRelaySettings &&
|
||||
!state.hasActiveNetworkWork,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun RelayModeRow(
|
||||
icon: AppIcon,
|
||||
title: String,
|
||||
description: String,
|
||||
selected: Boolean,
|
||||
enabled: Boolean,
|
||||
onClick: () -> Unit,
|
||||
) {
|
||||
SettingsRow(
|
||||
icon = icon,
|
||||
title = title,
|
||||
subtitle = description,
|
||||
selected = selected,
|
||||
onClick = onClick.takeIf { enabled },
|
||||
showsDisclosure = false,
|
||||
trailing = if (selected) {
|
||||
{
|
||||
PlatformIcon(
|
||||
AppIcon.Check,
|
||||
contentDescription = null,
|
||||
tint = LocalVniDropColors.current.brandLink,
|
||||
modifier = Modifier.size(20.dp),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
null
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun relayErrorText(state: SettingsState): String? {
|
||||
if (state.hasActiveNetworkWork || state.relayApplyError == RelaySettingsApplyError.ActiveTransfers) {
|
||||
return stringResource(Res.string.relay_apply_active_transfers)
|
||||
}
|
||||
state.relayInputError?.let { error ->
|
||||
return when (error) {
|
||||
RelaySettingsInputError.MissingUrl -> stringResource(Res.string.relay_validation_missing_url)
|
||||
is RelaySettingsInputError.TooManyUrls -> stringResource(
|
||||
Res.string.relay_validation_too_many_urls,
|
||||
error.maximum,
|
||||
)
|
||||
is RelaySettingsInputError.HttpsRequired -> stringResource(
|
||||
Res.string.relay_validation_https_required,
|
||||
error.line,
|
||||
)
|
||||
is RelaySettingsInputError.InvalidUrl -> stringResource(
|
||||
Res.string.relay_validation_invalid_url,
|
||||
error.line,
|
||||
)
|
||||
is RelaySettingsInputError.DuplicateUrl -> stringResource(
|
||||
Res.string.relay_validation_duplicate_url,
|
||||
error.line,
|
||||
)
|
||||
}
|
||||
}
|
||||
return when (state.relayApplyError) {
|
||||
RelaySettingsApplyError.ApplyFailed -> stringResource(Res.string.relay_apply_failed)
|
||||
RelaySettingsApplyError.RestoreFailed -> stringResource(Res.string.relay_restore_failed)
|
||||
RelaySettingsApplyError.ActiveTransfers,
|
||||
null,
|
||||
-> null
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,147 @@
|
||||
package com.vnidrop.app.feature.settings
|
||||
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.core.RelaySettings
|
||||
|
||||
sealed interface RelaySettingsInputError {
|
||||
data object MissingUrl : RelaySettingsInputError
|
||||
data class TooManyUrls(val maximum: Int) : RelaySettingsInputError
|
||||
data class HttpsRequired(val line: Int) : RelaySettingsInputError
|
||||
data class InvalidUrl(val line: Int) : RelaySettingsInputError
|
||||
data class DuplicateUrl(val line: Int) : RelaySettingsInputError
|
||||
}
|
||||
|
||||
data class RelaySettingsValidation(
|
||||
val settings: RelaySettings? = null,
|
||||
val error: RelaySettingsInputError? = null,
|
||||
)
|
||||
|
||||
fun validateRelaySettings(
|
||||
mode: RelayMode,
|
||||
urlsText: String,
|
||||
retainedUrls: List<String> = emptyList(),
|
||||
): RelaySettingsValidation {
|
||||
if (mode == RelayMode.Automatic) {
|
||||
return RelaySettingsValidation(RelaySettings(mode, retainedUrls))
|
||||
}
|
||||
val lines = urlsText.lineSequence()
|
||||
.mapIndexedNotNull { index, raw -> raw.trim().takeIf(String::isNotEmpty)?.let { index + 1 to it } }
|
||||
.toList()
|
||||
if (lines.isEmpty()) return RelaySettingsValidation(error = RelaySettingsInputError.MissingUrl)
|
||||
if (lines.size > MaximumRelayUrls) {
|
||||
return RelaySettingsValidation(error = RelaySettingsInputError.TooManyUrls(MaximumRelayUrls))
|
||||
}
|
||||
|
||||
val normalized = mutableListOf<String>()
|
||||
for ((line, raw) in lines) {
|
||||
when (val result = normalizeRelayUrl(raw)) {
|
||||
RelayUrlResult.HttpsRequired -> {
|
||||
return RelaySettingsValidation(error = RelaySettingsInputError.HttpsRequired(line))
|
||||
}
|
||||
RelayUrlResult.Invalid -> {
|
||||
return RelaySettingsValidation(error = RelaySettingsInputError.InvalidUrl(line))
|
||||
}
|
||||
is RelayUrlResult.Valid -> {
|
||||
if (result.url in normalized) {
|
||||
return RelaySettingsValidation(error = RelaySettingsInputError.DuplicateUrl(line))
|
||||
}
|
||||
normalized += result.url
|
||||
}
|
||||
}
|
||||
}
|
||||
return RelaySettingsValidation(RelaySettings(RelayMode.Custom, normalized))
|
||||
}
|
||||
|
||||
private sealed interface RelayUrlResult {
|
||||
data object HttpsRequired : RelayUrlResult
|
||||
data object Invalid : RelayUrlResult
|
||||
data class Valid(val url: String) : RelayUrlResult
|
||||
}
|
||||
|
||||
private fun normalizeRelayUrl(raw: String): RelayUrlResult {
|
||||
if (!raw.startsWith(HttpsPrefix, ignoreCase = true)) return RelayUrlResult.HttpsRequired
|
||||
if (raw.encodeToByteArray().size > MaximumRelayUrlLength || raw.any { it.isWhitespace() || it.isISOControl() }) {
|
||||
return RelayUrlResult.Invalid
|
||||
}
|
||||
val remainder = raw.substring(HttpsPrefix.length)
|
||||
if (remainder.isEmpty() || '?' in remainder || '#' in remainder) return RelayUrlResult.Invalid
|
||||
val authority = remainder.substringBefore('/')
|
||||
val path = remainder.removePrefix(authority)
|
||||
if (!isValidAuthority(authority) || path !in setOf("", "/")) return RelayUrlResult.Invalid
|
||||
|
||||
val normalizedAuthority = if (authority.startsWith('[')) {
|
||||
val closingBracket = authority.indexOf(']')
|
||||
authority.substring(0, closingBracket + 1).lowercase() + authority.substring(closingBracket + 1)
|
||||
} else {
|
||||
val portSeparator = authority.lastIndexOf(':').takeIf { authority.count { char -> char == ':' } == 1 }
|
||||
if (portSeparator == null) authority.lowercase()
|
||||
else authority.substring(0, portSeparator).lowercase() + authority.substring(portSeparator)
|
||||
}
|
||||
return RelayUrlResult.Valid("$HttpsPrefix${normalizedAuthority.removeSuffix(":443")}")
|
||||
}
|
||||
|
||||
private fun isValidAuthority(authority: String): Boolean {
|
||||
if (authority.isBlank() || '@' in authority) return false
|
||||
if (authority.startsWith('[')) {
|
||||
val closingBracket = authority.indexOf(']')
|
||||
if (closingBracket <= 1) return false
|
||||
val address = authority.substring(1, closingBracket)
|
||||
if (!isValidIpv6Address(address)) return false
|
||||
return isValidPortSuffix(authority.substring(closingBracket + 1))
|
||||
}
|
||||
if (authority.count { it == ':' } > 1) return false
|
||||
val host = authority.substringBeforeLast(':', authority)
|
||||
val portSuffix = authority.removePrefix(host)
|
||||
if (host.isBlank() || host.startsWith('.') || host.endsWith('.') || host.startsWith('-') || host.endsWith('-')) return false
|
||||
if (host.any { !it.isLetterOrDigit() && it != '.' && it != '-' }) return false
|
||||
return isValidPortSuffix(portSuffix)
|
||||
}
|
||||
|
||||
private fun isValidIpv6Address(address: String): Boolean {
|
||||
if (address.isEmpty() || ":::" in address) return false
|
||||
val compressionIndex = address.indexOf("::")
|
||||
val hasCompression = compressionIndex >= 0
|
||||
if (hasCompression && address.indexOf("::", compressionIndex + 2) >= 0) return false
|
||||
if (!hasCompression && (address.startsWith(':') || address.endsWith(':'))) return false
|
||||
|
||||
val left = if (hasCompression) address.substring(0, compressionIndex) else address
|
||||
val right = if (hasCompression) address.substring(compressionIndex + 2) else ""
|
||||
val segments = buildList {
|
||||
if (left.isNotEmpty()) addAll(left.split(':'))
|
||||
if (right.isNotEmpty()) addAll(right.split(':'))
|
||||
}
|
||||
if (segments.any(String::isEmpty)) return false
|
||||
|
||||
var addressUnits = 0
|
||||
for ((index, segment) in segments.withIndex()) {
|
||||
if ('.' in segment) {
|
||||
if (index != segments.lastIndex || !isValidIpv4Tail(segment)) return false
|
||||
addressUnits += 2
|
||||
} else {
|
||||
if (segment.length !in 1..4 || segment.any { !it.isHexDigit() }) return false
|
||||
addressUnits += 1
|
||||
}
|
||||
}
|
||||
return if (hasCompression) addressUnits < 8 else addressUnits == 8
|
||||
}
|
||||
|
||||
private fun isValidIpv4Tail(address: String): Boolean {
|
||||
val octets = address.split('.')
|
||||
return octets.size == 4 && octets.all { octet ->
|
||||
octet.isNotEmpty() && octet.all(Char::isDigit) && octet.toIntOrNull() in 0..255
|
||||
}
|
||||
}
|
||||
|
||||
private fun Char.isHexDigit(): Boolean =
|
||||
this in '0'..'9' || lowercaseChar() in 'a'..'f'
|
||||
|
||||
private fun isValidPortSuffix(suffix: String): Boolean {
|
||||
if (suffix.isEmpty()) return true
|
||||
if (!suffix.startsWith(':')) return false
|
||||
val port = suffix.drop(1).toIntOrNull() ?: return false
|
||||
return port in 1..65535
|
||||
}
|
||||
|
||||
private const val HttpsPrefix = "https://"
|
||||
private const val MaximumRelayUrls = 8
|
||||
private const val MaximumRelayUrlLength = 2_048
|
||||
@@ -7,6 +7,7 @@ import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.ui.icons.AppIcon
|
||||
import com.vnidrop.app.ui.theme.ThemeMode
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
@@ -18,7 +19,10 @@ import vnidrop.shared.generated.resources.appearance_system_mode
|
||||
import vnidrop.shared.generated.resources.appearance_title
|
||||
import vnidrop.shared.generated.resources.notifications_title
|
||||
import vnidrop.shared.generated.resources.preferences_title
|
||||
import vnidrop.shared.generated.resources.relay_mode_automatic
|
||||
import vnidrop.shared.generated.resources.relay_mode_custom
|
||||
import vnidrop.shared.generated.resources.settings_title
|
||||
import vnidrop.shared.generated.resources.settings_network_title
|
||||
import vnidrop.shared.generated.resources.storage_title
|
||||
|
||||
@Composable
|
||||
@@ -34,6 +38,14 @@ internal fun SettingsOverview(
|
||||
fontWeight = FontWeight.Bold,
|
||||
)
|
||||
SettingsGroup {
|
||||
SettingsRow(
|
||||
icon = AppIcon.Globe,
|
||||
title = stringResource(Res.string.settings_network_title),
|
||||
value = relayModeLabel(state.savedRelaySettings.mode),
|
||||
selected = state.selectedSection == SettingsSection.Network,
|
||||
onClick = { onSectionSelected(SettingsSection.Network) },
|
||||
)
|
||||
SettingsDivider()
|
||||
SettingsRow(
|
||||
icon = AppIcon.User,
|
||||
title = stringResource(Res.string.preferences_title),
|
||||
@@ -76,6 +88,12 @@ internal fun SettingsOverview(
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun relayModeLabel(mode: RelayMode): String = when (mode) {
|
||||
RelayMode.Automatic -> stringResource(Res.string.relay_mode_automatic)
|
||||
RelayMode.Custom -> stringResource(Res.string.relay_mode_custom)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun themeModeLabel(mode: ThemeMode): String = when (mode) {
|
||||
ThemeMode.System -> stringResource(Res.string.appearance_system_mode)
|
||||
|
||||
@@ -24,6 +24,9 @@ fun SettingsRoute(viewModel: SettingsViewModel, windowClass: WindowClass) {
|
||||
onSectionSelected = viewModel::selectSection,
|
||||
onUsernameChanged = viewModel::setUsername,
|
||||
onThemeModeChanged = viewModel::setThemeMode,
|
||||
onRelayModeChanged = viewModel::setRelayMode,
|
||||
onRelayUrlsChanged = viewModel::setRelayUrlsText,
|
||||
onApplyRelaySettings = viewModel::applyRelaySettings,
|
||||
onChooseFolder = viewModel::chooseReceiveFolder,
|
||||
onResetFolder = viewModel::resetReceiveFolder,
|
||||
onNotificationsChanged = viewModel::setNotificationsEnabled,
|
||||
|
||||
@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.vnidrop.app.ui.state.WindowClass
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.ui.theme.ThemeMode
|
||||
|
||||
@Composable
|
||||
@@ -30,6 +31,9 @@ fun SettingsScreen(
|
||||
onBugIncludeLogsChanged: (Boolean) -> Unit,
|
||||
onSubmitBugReport: () -> Unit,
|
||||
onDeleteAllTransfers: () -> Unit = {},
|
||||
onRelayModeChanged: (RelayMode) -> Unit = {},
|
||||
onRelayUrlsChanged: (String) -> Unit = {},
|
||||
onApplyRelaySettings: () -> Unit = {},
|
||||
) {
|
||||
if (windowClass == WindowClass.Desktop) {
|
||||
Row(
|
||||
@@ -60,6 +64,9 @@ fun SettingsScreen(
|
||||
onBugIncludeLogsChanged = onBugIncludeLogsChanged,
|
||||
onSubmitBugReport = onSubmitBugReport,
|
||||
onDeleteAllTransfers = onDeleteAllTransfers,
|
||||
onRelayModeChanged = onRelayModeChanged,
|
||||
onRelayUrlsChanged = onRelayUrlsChanged,
|
||||
onApplyRelaySettings = onApplyRelaySettings,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -94,6 +101,9 @@ fun SettingsScreen(
|
||||
onBugIncludeLogsChanged = onBugIncludeLogsChanged,
|
||||
onSubmitBugReport = onSubmitBugReport,
|
||||
onDeleteAllTransfers = onDeleteAllTransfers,
|
||||
onRelayModeChanged = onRelayModeChanged,
|
||||
onRelayUrlsChanged = onRelayUrlsChanged,
|
||||
onApplyRelaySettings = onApplyRelaySettings,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -120,11 +130,22 @@ private fun SettingsSectionContent(
|
||||
onBugIncludeLogsChanged: (Boolean) -> Unit,
|
||||
onSubmitBugReport: () -> Unit,
|
||||
onDeleteAllTransfers: () -> Unit,
|
||||
onRelayModeChanged: (RelayMode) -> Unit,
|
||||
onRelayUrlsChanged: (String) -> Unit,
|
||||
onApplyRelaySettings: () -> Unit,
|
||||
) {
|
||||
when (section) {
|
||||
SettingsSection.Overview -> Unit
|
||||
SettingsSection.Preferences -> PreferencesSettings(state, onUsernameChanged, onChooseFolder, onResetFolder, onBack, showBack)
|
||||
SettingsSection.Appearance -> AppearanceSettings(state.themeMode, onThemeModeChanged, onBack, showBack)
|
||||
SettingsSection.Network -> NetworkSettings(
|
||||
state = state,
|
||||
onModeChanged = onRelayModeChanged,
|
||||
onUrlsChanged = onRelayUrlsChanged,
|
||||
onApply = onApplyRelaySettings,
|
||||
onBack = onBack,
|
||||
showBack = showBack,
|
||||
)
|
||||
SettingsSection.Notifications -> NotificationSettings(state, onNotificationsChanged, onOpenNotificationSettings, onBack, showBack)
|
||||
SettingsSection.Storage -> StorageSettings(state, onDeleteAllTransfers, onBack, showBack)
|
||||
SettingsSection.About -> AboutSettings(
|
||||
|
||||
@@ -7,8 +7,12 @@ import com.vnidrop.app.DeviceInfoProvider
|
||||
import com.vnidrop.app.PlatformEnvironment
|
||||
import com.vnidrop.app.core.FileSystemService
|
||||
import com.vnidrop.app.core.CoreGateway
|
||||
import com.vnidrop.app.core.CoreLifecycleBusyException
|
||||
import com.vnidrop.app.core.FolderAccessStatus
|
||||
import com.vnidrop.app.core.ReceiveFolder
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.core.RelaySettings
|
||||
import com.vnidrop.app.core.TransferStatus
|
||||
import com.vnidrop.app.diagnostics.BugReportDraft
|
||||
import com.vnidrop.app.diagnostics.BugReportService
|
||||
import com.vnidrop.app.diagnostics.DiagnosticsBuildConfig
|
||||
@@ -43,17 +47,25 @@ import vnidrop.shared.generated.resources.notifications_enabled_message
|
||||
import vnidrop.shared.generated.resources.notifications_permission_denied
|
||||
import vnidrop.shared.generated.resources.notifications_settings_open_failed
|
||||
import vnidrop.shared.generated.resources.notifications_unsupported
|
||||
import vnidrop.shared.generated.resources.relay_settings_applied
|
||||
|
||||
enum class SettingsSection {
|
||||
Overview,
|
||||
Preferences,
|
||||
Appearance,
|
||||
Network,
|
||||
Notifications,
|
||||
Storage,
|
||||
About,
|
||||
BugReport,
|
||||
}
|
||||
|
||||
enum class RelaySettingsApplyError {
|
||||
ActiveTransfers,
|
||||
ApplyFailed,
|
||||
RestoreFailed,
|
||||
}
|
||||
|
||||
data class StorageBreakdown(
|
||||
val transferCacheBytes: ULong,
|
||||
val appDataBytes: ULong,
|
||||
@@ -74,6 +86,14 @@ data class SettingsState(
|
||||
val isValidatingFolder: Boolean = false,
|
||||
val supportsCustomReceiveFolders: Boolean = true,
|
||||
val themeMode: ThemeMode = ThemeMode.System,
|
||||
val savedRelaySettings: RelaySettings = RelaySettings(),
|
||||
val relayMode: RelayMode = RelayMode.Automatic,
|
||||
val relayUrlsText: String = "",
|
||||
val relayInputError: RelaySettingsInputError? = null,
|
||||
val relayApplyError: RelaySettingsApplyError? = null,
|
||||
val isApplyingRelaySettings: Boolean = false,
|
||||
val hasActiveNetworkWork: Boolean = false,
|
||||
val endpointId: String? = null,
|
||||
val notificationsEnabled: Boolean = false,
|
||||
val notificationPermission: NotificationPermission = NotificationPermission.NotDetermined,
|
||||
val diagnosticsEnabled: Boolean = false,
|
||||
@@ -90,7 +110,11 @@ data class SettingsState(
|
||||
val storage: StorageBreakdown? = null,
|
||||
val isCalculatingStorage: Boolean = false,
|
||||
val isDeletingTransfers: Boolean = false,
|
||||
)
|
||||
) {
|
||||
val hasRelaySettingsChanges: Boolean
|
||||
get() = relayMode != savedRelaySettings.mode ||
|
||||
(relayMode == RelayMode.Custom && relayUrlsText != savedRelaySettings.relayUrls.joinToString("\n"))
|
||||
}
|
||||
|
||||
sealed interface SettingsEffect {
|
||||
data object OpenReceiveFolderPicker : SettingsEffect
|
||||
@@ -121,6 +145,7 @@ class SettingsViewModel(
|
||||
private var enableNotificationsAfterSettings = false
|
||||
private var usernamePersistJob: Job? = null
|
||||
private var hasLocalUsernameDraft = false
|
||||
private var hasLocalRelayDraft = false
|
||||
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
@@ -134,6 +159,13 @@ class SettingsViewModel(
|
||||
themeMode = preferences.themeMode,
|
||||
notificationsEnabled = preferences.notificationsEnabled,
|
||||
diagnosticsEnabled = preferences.diagnosticsEnabled,
|
||||
savedRelaySettings = preferences.relaySettings,
|
||||
relayMode = if (hasLocalRelayDraft) current.relayMode else preferences.relaySettings.mode,
|
||||
relayUrlsText = if (hasLocalRelayDraft) {
|
||||
current.relayUrlsText
|
||||
} else {
|
||||
preferences.relaySettings.relayUrls.joinToString("\n")
|
||||
},
|
||||
)
|
||||
}
|
||||
if (receiveFolder != previousFolder) {
|
||||
@@ -141,6 +173,19 @@ class SettingsViewModel(
|
||||
}
|
||||
}
|
||||
}
|
||||
viewModelScope.launch {
|
||||
repository.state.collect { coreState ->
|
||||
val status = coreState.status
|
||||
val hasActiveWork = status?.let { it.activeTransfers > 0UL || it.activeShares > 0UL } == true ||
|
||||
coreState.transfers.any { it.status in ActiveTransferStatuses }
|
||||
_state.update {
|
||||
it.copy(
|
||||
hasActiveNetworkWork = hasActiveWork,
|
||||
endpointId = coreState.status?.endpointId,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
refreshNotificationPermission()
|
||||
loadDeviceInfo()
|
||||
}
|
||||
@@ -218,6 +263,103 @@ class SettingsViewModel(
|
||||
viewModelScope.launch { preferencesRepository.setThemeMode(mode) }
|
||||
}
|
||||
|
||||
fun setRelayMode(mode: RelayMode) {
|
||||
hasLocalRelayDraft = true
|
||||
_state.update {
|
||||
it.copy(
|
||||
relayMode = mode,
|
||||
relayInputError = null,
|
||||
relayApplyError = null,
|
||||
)
|
||||
}
|
||||
hasLocalRelayDraft = _state.value.hasRelaySettingsChanges
|
||||
}
|
||||
|
||||
fun setRelayUrlsText(value: String) {
|
||||
hasLocalRelayDraft = true
|
||||
_state.update {
|
||||
it.copy(
|
||||
relayUrlsText = value,
|
||||
relayInputError = null,
|
||||
relayApplyError = null,
|
||||
)
|
||||
}
|
||||
hasLocalRelayDraft = _state.value.hasRelaySettingsChanges
|
||||
}
|
||||
|
||||
fun applyRelaySettings() {
|
||||
val snapshot = _state.value
|
||||
if (snapshot.isApplyingRelaySettings || !snapshot.hasRelaySettingsChanges) return
|
||||
val validation = validateRelaySettings(
|
||||
mode = snapshot.relayMode,
|
||||
urlsText = snapshot.relayUrlsText,
|
||||
retainedUrls = snapshot.savedRelaySettings.relayUrls,
|
||||
)
|
||||
val desired = validation.settings
|
||||
if (desired == null) {
|
||||
_state.update { it.copy(relayInputError = validation.error, relayApplyError = null) }
|
||||
return
|
||||
}
|
||||
if (snapshot.hasActiveNetworkWork) {
|
||||
_state.update {
|
||||
it.copy(relayInputError = null, relayApplyError = RelaySettingsApplyError.ActiveTransfers)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
_state.update {
|
||||
it.copy(
|
||||
isApplyingRelaySettings = true,
|
||||
relayInputError = null,
|
||||
relayApplyError = null,
|
||||
)
|
||||
}
|
||||
viewModelScope.launch {
|
||||
val previous = snapshot.savedRelaySettings
|
||||
val applied = repository.initialize(environment.defaultCoreDataDir, desired)
|
||||
if (applied.isFailure) {
|
||||
val busy = applied.exceptionOrNull() is CoreLifecycleBusyException
|
||||
if (busy || repository.state.value.isInitialized) {
|
||||
_state.update {
|
||||
it.copy(
|
||||
isApplyingRelaySettings = false,
|
||||
relayApplyError = if (repository.state.value.isInitialized) {
|
||||
RelaySettingsApplyError.ActiveTransfers
|
||||
} else {
|
||||
RelaySettingsApplyError.ApplyFailed
|
||||
},
|
||||
)
|
||||
}
|
||||
} else {
|
||||
finishFailedRelayApply(previous)
|
||||
}
|
||||
return@launch
|
||||
}
|
||||
try {
|
||||
preferencesRepository.setRelaySettings(desired)
|
||||
} catch (error: CancellationException) {
|
||||
throw error
|
||||
} catch (_: Throwable) {
|
||||
finishFailedRelayApply(previous)
|
||||
return@launch
|
||||
}
|
||||
hasLocalRelayDraft = false
|
||||
_state.update {
|
||||
it.copy(
|
||||
savedRelaySettings = desired,
|
||||
relayMode = desired.mode,
|
||||
relayUrlsText = desired.relayUrls.joinToString("\n"),
|
||||
isApplyingRelaySettings = false,
|
||||
relayInputError = null,
|
||||
relayApplyError = null,
|
||||
)
|
||||
}
|
||||
messages.show(
|
||||
UiMessage(UiText.Resource(Res.string.relay_settings_applied), UiMessageTone.Success),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun chooseReceiveFolder() {
|
||||
if (!fileSystemService.supportsCustomReceiveFolders) return
|
||||
viewModelScope.launch { effects.send(SettingsEffect.OpenReceiveFolderPicker) }
|
||||
@@ -417,7 +559,22 @@ class SettingsViewModel(
|
||||
_state.update { it.copy(folderAccessStatus = status, isValidatingFolder = false) }
|
||||
}
|
||||
|
||||
private suspend fun finishFailedRelayApply(previous: RelaySettings) {
|
||||
val restored = repository.initialize(environment.defaultCoreDataDir, previous).isSuccess
|
||||
_state.update {
|
||||
it.copy(
|
||||
isApplyingRelaySettings = false,
|
||||
relayApplyError = if (restored) {
|
||||
RelaySettingsApplyError.ApplyFailed
|
||||
} else {
|
||||
RelaySettingsApplyError.RestoreFailed
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val UsernamePersistDebounceMs = 350L
|
||||
val ActiveTransferStatuses = setOf(TransferStatus.Importing, TransferStatus.Sharing, TransferStatus.Receiving)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,14 @@ package com.vnidrop.app.preferences
|
||||
import androidx.datastore.core.DataStore
|
||||
import androidx.datastore.preferences.core.Preferences
|
||||
import androidx.datastore.preferences.core.PreferenceDataStoreFactory
|
||||
import androidx.datastore.preferences.core.edit
|
||||
import androidx.datastore.preferences.core.emptyPreferences
|
||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||
import androidx.datastore.preferences.core.edit
|
||||
import androidx.datastore.preferences.core.preferencesOf
|
||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||
import com.vnidrop.app.core.ReceiveFolder
|
||||
import com.vnidrop.app.core.ReceiveFolderKind
|
||||
import com.vnidrop.app.core.RelayMode
|
||||
import com.vnidrop.app.core.RelaySettings
|
||||
import com.vnidrop.app.ui.theme.ThemeMode
|
||||
import com.vnidrop.app.util.randomUuidString
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
@@ -26,6 +28,7 @@ data class AppPreferences(
|
||||
val diagnosticsEnabled: Boolean = false,
|
||||
/** Stable anonymous install id; never an account or advertising id. */
|
||||
val diagnosticsInstallId: String = "",
|
||||
val relaySettings: RelaySettings = RelaySettings(),
|
||||
)
|
||||
|
||||
class AppPreferencesDefaults(
|
||||
@@ -44,6 +47,7 @@ interface PreferencesRepository {
|
||||
suspend fun setThemeMode(mode: ThemeMode)
|
||||
suspend fun setNotificationsEnabled(enabled: Boolean)
|
||||
suspend fun setDiagnosticsEnabled(enabled: Boolean)
|
||||
suspend fun setRelaySettings(settings: RelaySettings)
|
||||
/** Ensures a durable install id exists and returns it. */
|
||||
suspend fun ensureDiagnosticsInstallId(): String
|
||||
}
|
||||
@@ -53,8 +57,27 @@ class AppPreferencesRepository(
|
||||
private val defaults: AppPreferencesDefaults,
|
||||
) : PreferencesRepository {
|
||||
override val preferences: Flow<AppPreferences> = dataStore.data
|
||||
.catch { emit(emptyPreferences()) }
|
||||
.catch {
|
||||
emit(preferencesOf(PreferenceKeys.RelayMode to RelayMode.Custom.name))
|
||||
}
|
||||
.map { prefs ->
|
||||
val storedRelayMode = prefs[PreferenceKeys.RelayMode]
|
||||
val parsedRelayMode = storedRelayMode?.let(::relayModeOrNull)
|
||||
val relayMode = when (storedRelayMode) {
|
||||
null -> RelayMode.Automatic
|
||||
else -> parsedRelayMode ?: RelayMode.Custom
|
||||
}
|
||||
val relayUrls = if (storedRelayMode != null && parsedRelayMode == null) {
|
||||
emptyList()
|
||||
} else {
|
||||
prefs[PreferenceKeys.RelayUrls]
|
||||
.orEmpty()
|
||||
.lineSequence()
|
||||
.map(String::trim)
|
||||
.filter(String::isNotEmpty)
|
||||
.distinct()
|
||||
.toList()
|
||||
}
|
||||
AppPreferences(
|
||||
username = prefs[PreferenceKeys.Username]?.takeIf { it.isNotBlank() } ?: defaults.username,
|
||||
receiveFolder = resolveReceiveFolder(prefs, defaults.receiveFolder),
|
||||
@@ -62,6 +85,10 @@ class AppPreferencesRepository(
|
||||
notificationsEnabled = prefs[PreferenceKeys.NotificationsEnabled] ?: defaults.notificationsEnabled,
|
||||
diagnosticsEnabled = prefs[PreferenceKeys.DiagnosticsEnabled] ?: defaults.diagnosticsEnabled,
|
||||
diagnosticsInstallId = prefs[PreferenceKeys.DiagnosticsInstallId].orEmpty(),
|
||||
relaySettings = RelaySettings(
|
||||
mode = relayMode,
|
||||
relayUrls = relayUrls,
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -101,6 +128,13 @@ class AppPreferencesRepository(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun setRelaySettings(settings: RelaySettings) {
|
||||
dataStore.edit { prefs ->
|
||||
prefs[PreferenceKeys.RelayMode] = settings.mode.name
|
||||
prefs[PreferenceKeys.RelayUrls] = settings.relayUrls.joinToString("\n")
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun ensureDiagnosticsInstallId(): String {
|
||||
val existing = preferences.first().diagnosticsInstallId
|
||||
if (existing.isNotBlank()) return existing
|
||||
@@ -128,6 +162,8 @@ private object PreferenceKeys {
|
||||
val NotificationsEnabled = booleanPreferencesKey("notifications_enabled")
|
||||
val DiagnosticsEnabled = booleanPreferencesKey("diagnostics_enabled")
|
||||
val DiagnosticsInstallId = stringPreferencesKey("diagnostics_install_id")
|
||||
val RelayMode = stringPreferencesKey("relay_mode")
|
||||
val RelayUrls = stringPreferencesKey("relay_urls")
|
||||
}
|
||||
|
||||
private fun resolveReceiveFolder(prefs: Preferences, defaults: ReceiveFolder): ReceiveFolder {
|
||||
@@ -162,4 +198,7 @@ private fun receiveFolderKindOrNull(raw: String): ReceiveFolderKind? =
|
||||
private fun themeModeOrNull(raw: String): ThemeMode? =
|
||||
runCatching { ThemeMode.valueOf(raw) }.getOrNull()
|
||||
|
||||
private fun relayModeOrNull(raw: String): RelayMode? =
|
||||
runCatching { RelayMode.valueOf(raw) }.getOrNull()
|
||||
|
||||
private const val AppPreferencesFileName = "app_preferences.preferences_pb"
|
||||
|
||||
Reference in New Issue
Block a user