diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt index c8eaccb572..6937cc7f1e 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt @@ -153,8 +153,6 @@ class AppPreferences(val context: Context) { val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null) - val xftpSendEnabled = mkBoolPreference(SHARED_PREFS_XFTP_SEND_ENABLED, false) - private fun mkIntPreference(prefName: String, default: Int) = SharedPreference( get = fun() = sharedPreferences.getInt(prefName, default), @@ -264,7 +262,6 @@ class AppPreferences(val context: Context) { private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme" private const val SHARED_PREFS_PRIMARY_COLOR = "PrimaryColor" private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion" - private const val SHARED_PREFS_XFTP_SEND_ENABLED = "XFTPSendEnabled" } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt index 9d3d674724..560e9525c4 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt @@ -179,8 +179,7 @@ fun ComposeView( val pendingLinkUrl = rememberSaveable { mutableStateOf(null) } val cancelledLinks = rememberSaveable { mutableSetOf() } val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get() - val xftpSendEnabled = chatModel.controller.appPrefs.xftpSendEnabled.get() - val maxFileSize = getMaxFileSize(fileProtocol = if (xftpSendEnabled) FileProtocol.XFTP else FileProtocol.SMP) + val maxFileSize = getMaxFileSize(FileProtocol.XFTP) val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground) val textStyle = remember { mutableStateOf(smallFont) } val cameraLauncher = rememberCameraLauncher { uri: Uri? -> @@ -279,7 +278,7 @@ fun ComposeView( attachmentOption.value = null } AttachmentOption.PickMedia -> { - mediaLauncherWithFiles.launch(if (xftpSendEnabled) "image/*;video/*" else "image/*") + mediaLauncherWithFiles.launch("image/*;video/*") attachmentOption.value = null } AttachmentOption.PickFile -> { diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt index bad5145763..1310288ec9 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt @@ -43,16 +43,5 @@ fun DeveloperView( generalGetString(R.string.developer_options) ) SectionSpacer() - -// val xftpSendEnabled = m.controller.appPrefs.xftpSendEnabled -// val xftpEnabled = remember { mutableStateOf(xftpSendEnabled.get()) } -// SectionView(generalGetString(R.string.settings_section_title_experimenta)) { -// SettingsPreferenceItem(Icons.Outlined.UploadFile, stringResource(R.string.settings_send_files_via_xftp), xftpSendEnabled, xftpEnabled) { -// withApi { m.controller.apiSetXFTPConfig(m.controller.getXFTPCfg()) } -// } -// } -// if (xftpEnabled.value) { -// SectionTextFooter(generalGetString(R.string.xftp_requires_v461)) -// } } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt deleted file mode 100644 index 637bda9ebf..0000000000 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt +++ /dev/null @@ -1,37 +0,0 @@ -package chat.simplex.app.views.usersettings - -import SectionView -import androidx.compose.foundation.layout.* -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.UploadFile -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import chat.simplex.app.R -import chat.simplex.app.model.ChatModel -import chat.simplex.app.views.helpers.withApi - -@Composable -fun ExperimentalFeaturesView(chatModel: ChatModel) { - Column( - Modifier.fillMaxWidth(), - horizontalAlignment = Alignment.Start - ) { - Text( - stringResource(R.string.settings_experimental_features), - style = MaterialTheme.typography.h1, - modifier = Modifier.padding(start = 16.dp, bottom = 24.dp) - ) - SectionView("") { - SettingsPreferenceItem(Icons.Outlined.UploadFile, stringResource(R.string.settings_send_files_via_xftp), chatModel.controller.appPrefs.xftpSendEnabled) { - withApi { - chatModel.controller.apiSetXFTPConfig(chatModel.controller.getXFTPCfg()) - } - } - } - } -} diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt index b59ed8f2de..6af1b107e9 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt @@ -48,7 +48,6 @@ fun NetworkAndServersView( NetworkAndServersLayout( developerTools = developerTools, - xftpSendEnabled = remember { chatModel.controller.appPrefs.xftpSendEnabled.state }, networkUseSocksProxy = networkUseSocksProxy, onionHosts = onionHosts, sessionMode = sessionMode, @@ -145,7 +144,6 @@ fun NetworkAndServersView( @Composable fun NetworkAndServersLayout( developerTools: Boolean, - xftpSendEnabled: State, networkUseSocksProxy: MutableState, onionHosts: MutableState, sessionMode: MutableState, @@ -167,10 +165,8 @@ fun NetworkAndServersView( SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showCustomModal { m, close -> ProtocolServersView(m, ServerProtocol.SMP, close) }) SectionDivider() - if (xftpSendEnabled.value) { - SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, ServerProtocol.XFTP, close) }) - SectionDivider() - } + SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, ServerProtocol.XFTP, close) }) + SectionDivider() SectionItemView { UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showSettingsModal) @@ -434,7 +430,6 @@ fun PreviewNetworkAndServersLayout() { SimpleXTheme { NetworkAndServersLayout( developerTools = true, - xftpSendEnabled = remember { mutableStateOf(true) }, networkUseSocksProxy = remember { mutableStateOf(true) }, proxyPort = remember { mutableStateOf(9050) }, showModal = { {} }, diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt index ca03fbf388..5d84a78f75 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt @@ -207,8 +207,6 @@ fun SettingsLayout( SectionView(stringResource(R.string.settings_section_title_develop)) { SettingsActionItem(Icons.Outlined.Code, stringResource(R.string.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) }) SectionDivider() -// SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it) }) -// SectionDivider() AppVersionItem(showVersion) } } diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/android/app/src/main/res/values-cs/strings.xml index c69672b30c..d24300a0ed 100644 --- a/apps/android/app/src/main/res/values-cs/strings.xml +++ b/apps/android/app/src/main/res/values-cs/strings.xml @@ -1019,7 +1019,6 @@ Stále budete přijímat volání a upozornění od umlčených profilů pokud budou aktivní. Můžete skrýt nebo ztlumit uživatelský profil - Podržte pro menu. Odkrýt - Poslat videa a soubory přes XFTP Aktualizace databáze Upozornění: můžete ztratit nějaká data! Potvrdit aktualizaci databáze @@ -1034,7 +1033,6 @@ Skrýt: Zobrazit možnosti vývojáře POKUSNÝ - Pro příjem přes XFTP je vyžadována verze 4.6.1+. Obrázek bude přijat, až kontakt dokončí jeho nahrání. Zobrazit: ID databáze a možnost Izolace přenosu. diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml index e3d51b4acd..ae6404f0cd 100644 --- a/apps/android/app/src/main/res/values-de/strings.xml +++ b/apps/android/app/src/main/res/values-de/strings.xml @@ -1098,7 +1098,6 @@ Begrüßungsmeldung Sie können ein Benutzerprofil verbergen oder stummschalten - für das Menü gedrückt halten. Geben Sie ein vollständiges Passwort in das Suchfeld auf der Seite \"Meine Chat-Profile\" ein, um Ihr verborgenes Profil zu sehen. - Videos und Dateien per XFTP versenden Migrations-Bestätigung ungültig Aktualisieren und den Chat öffnen Datenbank-Aktualisierungen bestätigen @@ -1115,7 +1114,6 @@ Die Datenbank-Version ist neuer als die App, keine Abwärts-Migration für: %s Verberge: Migrationen: %s - Für den Empfang per XFTP wird v4.6.1 oder neuer benötigt. Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist. Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist. Dateitransfer abbrechen\? diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml index c4d32a683a..00183ab27a 100644 --- a/apps/android/app/src/main/res/values-es/strings.xml +++ b/apps/android/app/src/main/res/values-es/strings.xml @@ -1020,7 +1020,6 @@ \n- borrar mensajes de los miembros. \n- desactivar el rol a miembros (a rol \"observador\") Para hacer visible tu perfil oculto, introduce la contraseña completa en el campo de búsqueda de la página Tus perfiles Chat. - Enviar vídeos y archivos mediante XFTP Actualización de la base de datos Volviendo a versión anterior de la base de datos Confirmación de migración no válida @@ -1036,7 +1035,6 @@ ID de base de datos y opción de aislamiento de transporte. El archivo se recibirá cuando tu contacto termine de subirlo. La imagen se recibirá cuando tu contacto termine de subirla. - Se requiere v4.6.1+ para recibir vía XFTP. Mostrar opciones de desarrollador Ocultar: Mostrar: diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/android/app/src/main/res/values-fr/strings.xml index cebe80ebe9..ab3fa09c33 100644 --- a/apps/android/app/src/main/res/values-fr/strings.xml +++ b/apps/android/app/src/main/res/values-fr/strings.xml @@ -1019,7 +1019,6 @@ Message d\'accueil Vous pouvez masquer ou mettre en sourdine un profil d\'utilisateur - maintenez-le enfoncé pour accéder au menu. Vous continuerez à recevoir des appels et des notifications des profils mis en sourdine lorsqu\'ils sont actifs. - Envoi de vidéos et de fichiers via XFTP Rétrogradation de la base de données Mise à niveau de la base de données Version de la base de données incompatible @@ -1035,7 +1034,6 @@ Afficher : Afficher les options pour les développeurs Le fichier sera reçu lorsque votre contact aura terminé de le mettre en ligne. - v4.6.1+ nécessaire pour la réception via XFTP. IDs de base de données et option d\'isolation du transport. EXPÉRIMENTALE Cacher : diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml index afff1a27fb..fba2709deb 100644 --- a/apps/android/app/src/main/res/values-it/strings.xml +++ b/apps/android/app/src/main/res/values-it/strings.xml @@ -1019,7 +1019,6 @@ Nascondi Imposta il messaggio mostrato ai nuovi membri! Riattiva audio - Invia video e file via XFTP Downgrade del database Aggiornamento del database Versione del database incompatibile @@ -1028,7 +1027,6 @@ Nascondi: Mostra: Mostra opzioni sviluppatore - v4.6.1+ necessaria per ricevere via XFTP. Esegui downgrade e apri chat Migrazioni: %s Attenzione: potresti perdere alcuni dati! diff --git a/apps/android/app/src/main/res/values-ko/strings.xml b/apps/android/app/src/main/res/values-ko/strings.xml index 5a0117a39a..603bb40575 100644 --- a/apps/android/app/src/main/res/values-ko/strings.xml +++ b/apps/android/app/src/main/res/values-ko/strings.xml @@ -841,7 +841,6 @@ 연락처 선택 멤버 초대 건너뛰기 다음을 통해 보내기 - XFTP로 동영상 및 파일 보내기 멈추기 %s의 역할을 %s로 변경했어요. 콘솔용 diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml index 4a76436341..3679f8f89d 100644 --- a/apps/android/app/src/main/res/values-nl/strings.xml +++ b/apps/android/app/src/main/res/values-nl/strings.xml @@ -1018,7 +1018,6 @@ Om uw verborgen profiel te onthullen, voert u een volledig wachtwoord in een zoekveld in op de pagina Uw chat profielen. Welkomst bericht U ontvangt nog steeds oproepen en meldingen van gedempte profielen wanneer deze actief zijn. - Verzend video\'s en bestanden via XFTP Database downgraden Ongeldige migratie bevestiging Upgrade en open chat @@ -1037,7 +1036,6 @@ Verbergen: Ontwikkelaars opties tonen EXPERIMENTEEL - v4.6.1+ is vereist om te ontvangen via XFTP. Bestand overdracht annuleren\? Bestand overdracht wordt geannuleerd. Als het bezig is, wordt het gestopt. Verwijder profiel diff --git a/apps/android/app/src/main/res/values-pl/strings.xml b/apps/android/app/src/main/res/values-pl/strings.xml index 000627cda6..282bd5b01d 100644 --- a/apps/android/app/src/main/res/values-pl/strings.xml +++ b/apps/android/app/src/main/res/values-pl/strings.xml @@ -539,13 +539,11 @@ Chroń ekran aplikacji URUCHOM CZAT Wyślij podgląd linku - Wysyłaj filmy i pliki przez XFTP USTAWIENIA PROXY SOCKS Zatrzymać czat\? WSPIERAJ SIMPLEX CHAT MOTYWY - v4.6.1+ jest wymagany do odbierania przez XFTP. TY Twoja baza danych czatu Ustaw hasło do eksportu diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml index 463d9c831f..caa0fd137a 100644 --- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml @@ -699,7 +699,6 @@ convidado Selecionar contatos %d contato(s) selecionado(s) - Envie vídeos e arquivos via XFTP Esta ação não pode ser desfeita - seu perfil, contatos, mensagens e arquivos serão irreversivelmente perdidos. Remover Senha do banco de dados incorreta @@ -1010,7 +1009,6 @@ aguardando confirmação… Não armazenamos nenhum dos seus contatos ou mensagens (uma vez entregues) nos servidores. Mensagens ignoradas - v4.6.1+ é necessário receber via XFTP. Toque para ativar o perfil. Mostrar perfil de chat Mostrar perfil diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml index 6798ead6ca..afa9b408bb 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -1102,7 +1102,6 @@ Благодаря пользователям – добавьте переводы через Weblate! Вы все равно получите звонки и уведомления в профилях без звука, когда они активные. Вы можете скрыть профиль или выключить уведомления - подержите, чтобы увидеть меню. - Отправлять видео и файлы через XFTP Изображение будет принято когда Ваш контакт его загрузит. Файл будет принят когда Ваш контакт загрузит его. Обновление базы данных @@ -1124,7 +1123,6 @@ Удалить профиль чата Удалить профиль Пароль профиля - v4.6.1+ необходима для приема файлов через XFTP. Слишком много видео! Запросил прием видео Видео diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml index 22358c0841..a73b7af973 100644 --- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml @@ -1019,7 +1019,6 @@ 当静音配置文件处于活动状态时,您仍会收到来自静音配置文件的电话和通知。 您可以隐藏或静音用户配置文件——长按以显示菜单。 欢迎信息 - 通过 XFTP 发送视频和文件 确认数据库升级 实验性 数据库升级 @@ -1034,7 +1033,6 @@ 迁移:%s 图片将在您的联系人完成上传后收到。 显示开发者选项 - 通过 XFTP 接收需要 v4.6.1 以上版本。 升级并打开聊天 警告:您可能会丢失部分数据! 迁移确认无效 diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml index c2a37deb32..fcea69d460 100644 --- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml @@ -1025,7 +1025,6 @@ 取消靜音 當靜音配置檔案處於活動狀態時,你仍會收到來自靜音配置檔案的通話和通知。 取消隱藏 - 通過 XFTP 傳送影片和檔案 影片將會在你的聯絡人在線時接收,請你等等或者稍後再檢查! 確認數據庫更新 數據庫版本不相容 @@ -1039,7 +1038,6 @@ 圖片將會在你的聯絡人完成上傳後接收。 檔案將會在你的聯絡人完成上傳後接收。 實驗性 - 通過 XFTP 去接收需要 v4.6.1 以上的版本。 升級和開始對話 取消傳輸檔案? 檔案傳遞將會取消。若是在傳遞檔案中,亦會暫停。 diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml index e0fd08b380..3717e8224a 100644 --- a/apps/android/app/src/main/res/values/strings.xml +++ b/apps/android/app/src/main/res/values/strings.xml @@ -802,8 +802,6 @@ CALLS Incognito mode EXPERIMENTAL - Send videos and files via XFTP - v4.6.1+ is required to receive via XFTP. Your chat database diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift index 43a82b91b0..3f4ce79905 100644 --- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift +++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift @@ -241,8 +241,6 @@ struct ComposeView: View { @State var pendingLinkUrl: URL? = nil @State var cancelledLinks: Set = [] - @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) private var xftpSendEnabled = false - @State private var showChooseSource = false @State private var showMediaPicker = false @State private var showTakePhoto = false @@ -462,8 +460,7 @@ struct ComposeView: View { } private var maxFileSize: Int64 { - let fileProtocol: FileProtocol = xftpSendEnabled ? .xftp : .smp - return getMaxFileSize(fileProtocol) + getMaxFileSize(.xftp) } private func sendLiveMessage() async { diff --git a/apps/ios/Shared/Views/Helpers/ImagePicker.swift b/apps/ios/Shared/Views/Helpers/ImagePicker.swift index 5cbe96f82f..21b968fde9 100644 --- a/apps/ios/Shared/Views/Helpers/ImagePicker.swift +++ b/apps/ios/Shared/Views/Helpers/ImagePicker.swift @@ -28,7 +28,6 @@ struct LibraryImagePicker: View { struct LibraryMediaListPicker: UIViewControllerRepresentable { typealias UIViewControllerType = PHPickerViewController - @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) var xftpSendEnabled = false @Binding var media: [UploadContent] var selectionLimit: Int var didFinishPicking: (_ didSelectItems: Bool) -> Void @@ -131,12 +130,7 @@ struct LibraryMediaListPicker: UIViewControllerRepresentable { func makeUIViewController(context: Context) -> PHPickerViewController { var config = PHPickerConfiguration() - let allowVideoAttachment = xftpSendEnabled - if allowVideoAttachment { - config.filter = .any(of: [.images, .videos]) - } else { - config.filter = .images - } + config.filter = .any(of: [.images, .videos]) config.selectionLimit = selectionLimit config.selection = .ordered //config.preferredAssetRepresentationMode = .current diff --git a/apps/ios/Shared/Views/UserSettings/DeveloperView.swift b/apps/ios/Shared/Views/UserSettings/DeveloperView.swift index a6bd3bda74..e99c6e3301 100644 --- a/apps/ios/Shared/Views/UserSettings/DeveloperView.swift +++ b/apps/ios/Shared/Views/UserSettings/DeveloperView.swift @@ -12,7 +12,6 @@ import SimpleXChat struct DeveloperView: View { @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false @AppStorage(GROUP_DEFAULT_CONFIRM_DB_UPGRADES, store: groupDefaults) private var confirmDatabaseUpgrades = false - @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) private var xftpSendEnabled = false @Environment(\.colorScheme) var colorScheme var body: some View { diff --git a/apps/ios/Shared/Views/UserSettings/ExperimentalFeaturesView.swift b/apps/ios/Shared/Views/UserSettings/ExperimentalFeaturesView.swift deleted file mode 100644 index 8f51e42166..0000000000 --- a/apps/ios/Shared/Views/UserSettings/ExperimentalFeaturesView.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// ExperimentalFeaturesView.swift -// SimpleX (iOS) -// -// Created by Evgeny on 30/05/2022. -// Copyright © 2022 SimpleX Chat. All rights reserved. -// - -import SwiftUI -import SimpleXChat - -struct ExperimentalFeaturesView: View { - @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) private var xftpSendEnabled = false - - var body: some View { - List { - Section("") { - settingsRow("arrow.up.doc") { - Toggle("Send videos and files via XFTP", isOn: $xftpSendEnabled) - .onChange(of: xftpSendEnabled) { _ in - do { - try setXFTPConfig(getXFTPCfg()) - } catch { - logger.error("setXFTPConfig: cannot set XFTP config \(responseError(error))") - } - } - } - } - } - } -} - -struct ExperimentalFeaturesView_Previews: PreviewProvider { - static var previews: some View { - ExperimentalFeaturesView() - } -} diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift index 77f043711b..d721cfad50 100644 --- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift +++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift @@ -25,7 +25,6 @@ private enum NetworkAlert: Identifiable { struct NetworkAndServers: View { @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false - @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) private var xftpSendEnabled = false @State private var cfgLoaded = false @State private var currentNetCfg = NetCfg.defaults @State private var netCfg = NetCfg.defaults @@ -44,13 +43,11 @@ struct NetworkAndServers: View { Text("SMP servers") } - if xftpSendEnabled { - NavigationLink { - ProtocolServersView(serverProtocol: .xftp) - .navigationTitle("Your XFTP servers") - } label: { - Text("XFTP servers") - } + NavigationLink { + ProtocolServersView(serverProtocol: .xftp) + .navigationTitle("Your XFTP servers") + } label: { + Text("XFTP servers") } Picker("Use .onion hosts", selection: $onionHosts) { diff --git a/apps/ios/Shared/Views/UserSettings/SettingsView.swift b/apps/ios/Shared/Views/UserSettings/SettingsView.swift index a062691835..d25ea45f49 100644 --- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift +++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift @@ -232,14 +232,6 @@ struct SettingsView: View { } label: { settingsRow("info") { Text("About SimpleX Chat") } } -// NavigationLink { -// MarkdownHelp() -// .padding() -// .navigationTitle("How to use markdown") -// .frame(maxHeight: .infinity, alignment: .top) -// } label: { -// settingsRow("textformat") { Text("Markdown in messages") } -// } settingsRow("number") { Button("Send questions and ideas") { showSettings = false @@ -278,12 +270,6 @@ struct SettingsView: View { } label: { settingsRow("chevron.left.forwardslash.chevron.right") { Text("Developer tools") } } -// NavigationLink { -// ExperimentalFeaturesView() -// .navigationTitle("Experimental features") -// } label: { -// settingsRow("gauge") { Text("Experimental features") } -// } NavigationLink { VersionView() .navigationBarTitle("App version") diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff index 392e01dfda..4ba2101119 100644 --- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff +++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff @@ -3357,11 +3357,6 @@ Available in v5.1 Odeslat je z galerie nebo vlastní klávesnice. No comment provided by engineer. - - Send videos and files via XFTP - Odeslat soubory přes XFTP - No comment provided by engineer. - Sender cancelled file transfer. Odesílatel zrušil přenos souboru. diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff index bdc48d3636..5dac1061c2 100644 --- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff +++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff @@ -3357,11 +3357,6 @@ Available in v5.1 Senden Sie diese aus dem Fotoalbum oder von individuellen Tastaturen. No comment provided by engineer. - - Send videos and files via XFTP - Dateien per XFTP versenden - No comment provided by engineer. - Sender cancelled file transfer. Der Absender hat die Dateiübertragung abgebrochen. diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff index 1d7e58f25d..c0a0c7cfc1 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -3377,11 +3377,6 @@ Available in v5.1 Send them from gallery or custom keyboards. No comment provided by engineer. - - Send videos and files via XFTP - Send videos and files via XFTP - No comment provided by engineer. - Sender cancelled file transfer. Sender cancelled file transfer. diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff index 792f672d2a..813b8eb09b 100644 --- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff +++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff @@ -3357,11 +3357,6 @@ Available in v5.1 Envíalos desde la galería o desde teclados personalizados. No comment provided by engineer. - - Send videos and files via XFTP - Enviar archivos vía XFTP - No comment provided by engineer. - Sender cancelled file transfer. El remitente ha cancelado la transferencia de archivos. diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff index 8f9f063606..68268a4f3e 100644 --- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff +++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff @@ -3370,11 +3370,6 @@ Available in v5.1 Envoyez-les depuis la phototèque ou des claviers personnalisés. No comment provided by engineer. - - Send videos and files via XFTP - Envoi de fichiers via XFTP - No comment provided by engineer. - Sender cancelled file transfer. L'expéditeur a annulé le transfert de fichiers. diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff index 0f6c0817eb..75ee188bbd 100644 --- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff +++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff @@ -3370,11 +3370,6 @@ Available in v5.1 Inviali dalla galleria o dalle tastiere personalizzate. No comment provided by engineer. - - Send videos and files via XFTP - Invia file tramite XFTP - No comment provided by engineer. - Sender cancelled file transfer. Il mittente ha annullato il trasferimento del file. diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff index b815d2becf..a144792be3 100644 --- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff +++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff @@ -3377,11 +3377,6 @@ Beschikbaar in v5.1 Stuur ze vanuit de galerij of aangepaste toetsenborden. No comment provided by engineer. - - Send videos and files via XFTP - Bestanden verzenden via XFTP - No comment provided by engineer. - Sender cancelled file transfer. Afzender heeft bestandsoverdracht geannuleerd. diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff index 13644ea600..78156e1239 100644 --- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff +++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff @@ -3377,11 +3377,6 @@ Dostępny w v5.1 Wyślij je z galerii lub niestandardowych klawiatur. No comment provided by engineer. - - Send videos and files via XFTP - Wysyłaj filmy i pliki przez XFTP - No comment provided by engineer. - Sender cancelled file transfer. Nadawca anulował transfer pliku. diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff index 6184b69528..6bb8229a32 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -3377,11 +3377,6 @@ Available in v5.1 Отправьте из галереи или из дополнительных клавиатур. No comment provided by engineer. - - Send videos and files via XFTP - Отправлять видео и файлы через XFTP - No comment provided by engineer. - Sender cancelled file transfer. Отправитель отменил передачу файла. diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff index baf6df031a..c400f08445 100644 --- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff +++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff @@ -3357,11 +3357,6 @@ Available in v5.1 发送它们来自图库或自定义键盘。 No comment provided by engineer. - - Send videos and files via XFTP - 通过 XFTP 发送文件 - No comment provided by engineer. - Sender cancelled file transfer. 发送人已取消文件传输。 diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index f348027f12..c6e0ca9c2a 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ 5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; }; 5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; }; 5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */; }; - 5C3F1D5A2844B4DE00EC8A82 /* ExperimentalFeaturesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D592844B4DE00EC8A82 /* ExperimentalFeaturesView.swift */; }; 5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B3B09285FB130003915F2 /* DatabaseView.swift */; }; 5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5346A727B59A6A004DF848 /* ChatHelp.swift */; }; 5C55A91F283AD0E400C4E99E /* CallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A91E283AD0E400C4E99E /* CallManager.swift */; }; @@ -276,7 +275,6 @@ 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = ""; }; 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrityErrorItemView.swift; sourceTree = ""; }; 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacySettings.swift; sourceTree = ""; }; - 5C3F1D592844B4DE00EC8A82 /* ExperimentalFeaturesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExperimentalFeaturesView.swift; sourceTree = ""; }; 5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = ""; }; 5C4B3B09285FB130003915F2 /* DatabaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseView.swift; sourceTree = ""; }; 5C5346A727B59A6A004DF848 /* ChatHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHelp.swift; sourceTree = ""; }; @@ -720,7 +718,6 @@ 5C93293029239BED0090FFF9 /* ProtocolServerView.swift */, 5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */, 5CB2084E28DA4B4800D024EC /* RTCServers.swift */, - 5C3F1D592844B4DE00EC8A82 /* ExperimentalFeaturesView.swift */, 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */, 18415845648CA4F5A8BCA272 /* UserProfilesView.swift */, 5C65F341297D3F3600B67AF3 /* VersionView.swift */, @@ -1165,7 +1162,6 @@ 5C93293F2928E0FD0090FFF9 /* AudioRecPlay.swift in Sources */, 5C029EA82837DBB3004A9677 /* CICallItemView.swift in Sources */, 5CE4407227ADB1D0007B033A /* Emoji.swift in Sources */, - 5C3F1D5A2844B4DE00EC8A82 /* ExperimentalFeaturesView.swift in Sources */, 5CB2085328DB7CAF00D024EC /* ConnectViaLinkView.swift in Sources */, 5C9CC7A928C532AB00BEF955 /* DatabaseErrorView.swift in Sources */, 5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */, diff --git a/apps/ios/SimpleXChat/AppGroup.swift b/apps/ios/SimpleXChat/AppGroup.swift index b69411a75d..0b73e674ce 100644 --- a/apps/ios/SimpleXChat/AppGroup.swift +++ b/apps/ios/SimpleXChat/AppGroup.swift @@ -31,7 +31,6 @@ let GROUP_DEFAULT_STORE_DB_PASSPHRASE = "storeDBPassphrase" let GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE = "initialRandomDBPassphrase" public let GROUP_DEFAULT_CONFIRM_DB_UPGRADES = "confirmDBUpgrades" public let GROUP_DEFAULT_CALL_KIT_ENABLED = "callKitEnabled" -public let GROUP_DEFAULT_XFTP_SEND_ENABLED = "xftpSendEnabled" public let APP_GROUP_NAME = "group.chat.simplex.app" @@ -56,7 +55,6 @@ public func registerGroupDefaults() { GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false, GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false, GROUP_DEFAULT_CALL_KIT_ENABLED: true, - GROUP_DEFAULT_XFTP_SEND_ENABLED: false, ]) } @@ -129,8 +127,6 @@ public let confirmDBUpgradesGroupDefault = BoolDefault(defaults: groupDefaults, public let callKitEnabledGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CALL_KIT_ENABLED) -public let xftpSendEnabledGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_XFTP_SEND_ENABLED) - public class DateDefault { var defaults: UserDefaults var key: String diff --git a/apps/ios/cs.lproj/Localizable.strings b/apps/ios/cs.lproj/Localizable.strings index f60911e517..7b9118cd1c 100644 --- a/apps/ios/cs.lproj/Localizable.strings +++ b/apps/ios/cs.lproj/Localizable.strings @@ -2244,9 +2244,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Odeslat je z galerie nebo vlastní klávesnice."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Odeslat soubory přes XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Odesílatel zrušil přenos souboru."; diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings index 883be89ac2..db9102dd8c 100644 --- a/apps/ios/de.lproj/Localizable.strings +++ b/apps/ios/de.lproj/Localizable.strings @@ -2244,9 +2244,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Senden Sie diese aus dem Fotoalbum oder von individuellen Tastaturen."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Dateien per XFTP versenden"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Der Absender hat die Dateiübertragung abgebrochen."; diff --git a/apps/ios/es.lproj/Localizable.strings b/apps/ios/es.lproj/Localizable.strings index 5da00f7661..d3808d829c 100644 --- a/apps/ios/es.lproj/Localizable.strings +++ b/apps/ios/es.lproj/Localizable.strings @@ -2244,9 +2244,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Envíalos desde la galería o desde teclados personalizados."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Enviar archivos vía XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "El remitente ha cancelado la transferencia de archivos."; diff --git a/apps/ios/fr.lproj/Localizable.strings b/apps/ios/fr.lproj/Localizable.strings index b830afa97c..aff567f344 100644 --- a/apps/ios/fr.lproj/Localizable.strings +++ b/apps/ios/fr.lproj/Localizable.strings @@ -2283,9 +2283,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Envoyez-les depuis la phototèque ou des claviers personnalisés."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Envoi de fichiers via XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "L'expéditeur a annulé le transfert de fichiers."; diff --git a/apps/ios/it.lproj/Localizable.strings b/apps/ios/it.lproj/Localizable.strings index a6b291eb46..b0efb9128e 100644 --- a/apps/ios/it.lproj/Localizable.strings +++ b/apps/ios/it.lproj/Localizable.strings @@ -2283,9 +2283,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Inviali dalla galleria o dalle tastiere personalizzate."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Invia file tramite XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Il mittente ha annullato il trasferimento del file."; diff --git a/apps/ios/nl.lproj/Localizable.strings b/apps/ios/nl.lproj/Localizable.strings index 507d7198b0..e001c25e97 100644 --- a/apps/ios/nl.lproj/Localizable.strings +++ b/apps/ios/nl.lproj/Localizable.strings @@ -2301,9 +2301,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Stuur ze vanuit de galerij of aangepaste toetsenborden."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Bestanden verzenden via XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Afzender heeft bestandsoverdracht geannuleerd."; diff --git a/apps/ios/pl.lproj/Localizable.strings b/apps/ios/pl.lproj/Localizable.strings index a58db2593b..1aab827e0d 100644 --- a/apps/ios/pl.lproj/Localizable.strings +++ b/apps/ios/pl.lproj/Localizable.strings @@ -2301,9 +2301,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Wyślij je z galerii lub niestandardowych klawiatur."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Wysyłaj filmy i pliki przez XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Nadawca anulował transfer pliku."; diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings index 74409510c6..ca6a91282d 100644 --- a/apps/ios/ru.lproj/Localizable.strings +++ b/apps/ios/ru.lproj/Localizable.strings @@ -2301,9 +2301,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "Отправьте из галереи или из дополнительных клавиатур."; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "Отправлять видео и файлы через XFTP"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "Отправитель отменил передачу файла."; diff --git a/apps/ios/zh-Hans.lproj/Localizable.strings b/apps/ios/zh-Hans.lproj/Localizable.strings index af21702f8a..78e1519cb2 100644 --- a/apps/ios/zh-Hans.lproj/Localizable.strings +++ b/apps/ios/zh-Hans.lproj/Localizable.strings @@ -2244,9 +2244,6 @@ /* No comment provided by engineer. */ "Send them from gallery or custom keyboards." = "发送它们来自图库或自定义键盘。"; -/* No comment provided by engineer. */ -"Send videos and files via XFTP" = "通过 XFTP 发送文件"; - /* No comment provided by engineer. */ "Sender cancelled file transfer." = "发送人已取消文件传输。";