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

Added file sharing server URL in advanced settings

Browse source
This commit is contained in:
Sylvain Berfini 2024-12-04 13:49:11 +01:00
parent 877565e516
commit a5f846a26d
5 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
View file

@ -109,6 +109,7 @@ class SettingsAdvancedFragment : GenericMainFragment() {
override fun onPause() {
viewModel.updateDeviceName()
viewModel.updateFileSharingServerUrl()
viewModel.updateRemoteProvisioningUrl()
super.onPause()

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

@ -178,6 +178,7 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
val keepAliveThirdPartyAccountsService = MutableLiveData<Boolean>()
val deviceName = MutableLiveData<String>()
val fileSharingServerUrl = MutableLiveData<String>()
val remoteProvisioningUrl = MutableLiveData<String>()
val mediaEncryptionIndex = MutableLiveData<Int>()
@ -295,6 +296,7 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
keepAliveThirdPartyAccountsService.postValue(corePreferences.keepServiceAlive)
deviceName.postValue(corePreferences.deviceName)
fileSharingServerUrl.postValue(core.fileTransferServer)
remoteProvisioningUrl.postValue(core.provisioningUri)
setupMediaEncryption()
@ -706,6 +708,17 @@ class SettingsViewModel @UiThread constructor() : GenericViewModel() {
}
}
@UiThread
fun updateFileSharingServerUrl() {
coreContext.postOnCoreThread { core ->
val newFileSharingServerUrl = fileSharingServerUrl.value.orEmpty().trim()
if (newFileSharingServerUrl.isNotEmpty()) {
Log.i("$TAG Updated file sharing server URL to [$newFileSharingServerUrl]")
core.fileTransferServer = newFileSharingServerUrl
}
}
}
@UiThread
fun updateRemoteProvisioningUrl() {
coreContext.postOnCoreThread { core ->

36
app/src/main/res/layout/settings_advanced_fragment.xml
View file

@ -222,6 +222,40 @@
app:layout_constraintStart_toStartOf="@id/device_id_label"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/upload_server_url_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/settings_advanced_upload_server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/device_id"/>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
android:id="@+id/upload_server_url"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.fileSharingServerUrl}"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:maxLines="1"
android:background="@drawable/edit_text_background"
android:inputType="text|textUri"
android:hint="@string/settings_advanced_upload_server_url"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintWidth_max="@dimen/text_input_max_width"
app:layout_constraintTop_toBottomOf="@id/upload_server_url_label"
app:layout_constraintStart_toStartOf="@id/upload_server_url_label"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/remote_provisioning_label"
@ -233,7 +267,7 @@
android:paddingBottom="8dp"
android:text="@string/settings_advanced_remote_provisioning_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/device_id"/>
app:layout_constraintTop_toBottomOf="@id/upload_server_url"/>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"

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

@ -256,6 +256,7 @@
<string name="settings_advanced_keep_alive_service_title">Garder l\'app en vie via un Service</string>
<string name="settings_advanced_device_id">Nom du périphérique</string>
<string name="settings_advanced_device_id_hint">Caractères alpha-numériques uniquement</string>
<string name="settings_advanced_upload_server_url">URL du serveur de partage de fichier</string>
<string name="settings_advanced_media_encryption_title">Chiffrement du média</string>
<string name="settings_advanced_media_encryption_mandatory_title">Rendre le chiffrement du média obligatoire</string>
<string name="settings_advanced_remote_provisioning_url">URL de configuration distante</string>

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

@ -293,6 +293,7 @@
<string name="settings_advanced_keep_alive_service_title">Keep app alive using Service</string>
<string name="settings_advanced_device_id">Device ID</string>
<string name="settings_advanced_device_id_hint">Alpha-numerical characters only</string>
<string name="settings_advanced_upload_server_url">File sharing server URL</string>
<string name="settings_advanced_media_encryption_title">Media encryption</string>
<string name="settings_advanced_media_encryption_mandatory_title">Media encryption mandatory</string>
<string name="settings_advanced_remote_provisioning_url">Remote provisioning URL</string>