mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed auto-export media, won't work with auto download

Browse source
This commit is contained in:
Sylvain Berfini 2024-06-04 14:05:13 +02:00
parent 87bfe5b6c4
commit f9f25b2b15
5 changed files with 0 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -109,16 +109,6 @@ class CorePreferences @UiThread constructor(private val context: Context) {
config.setBool("app", "show_confirmation_dialog_zrtp_trust_call", value)
}
// Conversation settings
@get:WorkerThread @set:WorkerThread
var exportMediaToNativeGallery: Boolean // TODO: use it!
// Keep old name for backward compatibility
get() = config.getBool("app", "make_downloaded_images_public_in_gallery", true)
set(value) {
config.setBool("app", "make_downloaded_images_public_in_gallery", value)
}
/* Voice Recordings */
@get:WorkerThread @set:WorkerThread

10
app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
View file

@ -239,7 +239,6 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
useWifiOnly.postValue(core.isWifiOnlyEnabled)
autoDownloadEnabled.postValue(core.maxSizeForAutoDownloadIncomingFiles == 0)
exportMediaEnabled.postValue(corePreferences.exportMediaToNativeGallery)
defaultLayout.postValue(core.defaultConferenceLayout.toInt())
@ -370,15 +369,6 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
}
}
@UiThread
fun toggleExportMedia() {
val newValue = exportMediaEnabled.value == false
coreContext.postOnCoreThread {
corePreferences.exportMediaToNativeGallery = newValue
exportMediaEnabled.postValue(newValue)
}
}
@UiThread
fun toggleContactsExpand() {
expandContacts.value = expandContacts.value == false

42
app/src/main/res/layout/settings_chat.xml
View file

@ -44,48 +44,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleExportMedia()}"
android:id="@+id/export_media_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_conversations_export_media_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/export_media_switch"
app:layout_constraintBottom_toTopOf="@id/export_media_subtitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/export_media_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_subtitle_style"
android:onClick="@{() -> viewModel.toggleExportMedia()}"
android:id="@+id/export_media_subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_conversations_export_media_subtitle"
app:layout_constraintTop_toBottomOf="@id/export_media_title"
app:layout_constraintBottom_toBottomOf="@id/export_media_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/export_media_switch"/>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/material_switch_style"
android:id="@+id/export_media_switch"
android:onClick="@{() -> viewModel.toggleExportMedia()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.exportMediaEnabled}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/auto_download_switch" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

2
app/src/main/res/values-fr/strings.xml
View file

@ -227,8 +227,6 @@
<string name="settings_calls_auto_record_title">Démarrer l\'enregistrement des appels automatiquement</string>
<string name="settings_conversations_title">Conversations</string>
<string name="settings_conversations_auto_download_title">Télécharger automatiquement les fichiers</string>
<string name="settings_conversations_export_media_title">Exporter les médias dans la gallerie</string>
<string name="settings_conversations_export_media_subtitle">Les médias des messages éphémères ne seront jamais exportés</string>
<string name="settings_contacts_title">Contacts</string>
<string name="settings_contacts_add_ldap_server_title">Ajouter un serveur LDAP</string>
<string name="settings_contacts_edit_ldap_server_title">Editer le serveur LDAP</string>

2
app/src/main/res/values/strings.xml
View file

@ -262,8 +262,6 @@
<string name="settings_calls_auto_record_title">Automatically start recording calls</string>
<string name="settings_conversations_title">Conversations</string>
<string name="settings_conversations_auto_download_title">Auto-download files</string>
<string name="settings_conversations_export_media_title">Export media in native gallery</string>
<string name="settings_conversations_export_media_subtitle">Media from ephemeral messages will never be exported</string>
<string name="settings_contacts_title">Contacts</string>
<string name="settings_contacts_add_ldap_server_title">Add LDAP server</string>
<string name="settings_contacts_edit_ldap_server_title">Edit LDAP server</string>