Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed & improved text for making media files public + disable when auto download is enabled as it doesn't work yet

Browse source
This commit is contained in:
Sylvain Berfini 2020-07-15 17:21:52 +02:00
parent 6e60627ce4
commit fbe68d5bb8
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt
View file

@ -81,7 +81,7 @@ class ChatMessageViewModel(
// It will even cause the app to crash if updateContentsList is not call right after
updateContentsList()
if (!message.isEphemeral && corePreferences.makePublicDownloadedImages) {
if (!message.isEphemeral && corePreferences.makePublicMediaFilesDownloaded) {
if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10) || PermissionHelper.get().hasWriteExternalStorage()) {
for (content in message.contents) {
if (content.isFile && content.filePath != null && content.userData == null) {

13
app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
View file

@ -42,6 +42,11 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
core.maxSizeForAutoDownloadIncomingFiles = maxSize
autoDownloadMaxSize.value = maxSize
updateAutoDownloadIndexFromMaxSize(maxSize)
// Auto download isn't compatible with making downloaded images public
if (position > 0 && downloadedMediaPublic.value == true) {
downloadedMediaPublic.value = false
}
}
}
val autoDownloadIndex = MutableLiveData<Int>()
@ -58,12 +63,12 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
}
val autoDownloadMaxSize = MutableLiveData<Int>()
val downloadedImagesPublicListener = object : SettingListenerStub() {
val downloadedMediaPublicListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
prefs.makePublicDownloadedImages = newValue
downloadedMediaPublic.value = newValue
}
}
val downloadedImagesPublic = MutableLiveData<Boolean>()
val downloadedMediaPublic = MutableLiveData<Boolean>()
val launcherShortcutsListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
@ -96,7 +101,7 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
val goToAndroidNotificationSettingsEvent = MutableLiveData<Event<Boolean>>()
init {
downloadedImagesPublic.value = prefs.makePublicDownloadedImages
downloadedMediaPublic.value = prefs.makePublicMediaFilesDownloaded
initAutoDownloadList()
launcherShortcuts.value = prefs.chatRoomShortcuts
hideEmptyRooms.value = prefs.hideEmptyRooms

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

@ -88,7 +88,8 @@ class CorePreferences constructor(private val context: Context) {
/* Chat */
var makePublicDownloadedImages: Boolean
var makePublicMediaFilesDownloaded: Boolean
// 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)

9
app/src/main/res/layout/settings_chat_fragment.xml
View file

@ -93,10 +93,11 @@
<include
layout="@layout/settings_widget_switch"
linphone:title="@{@string/chat_settings_downloaded_images_public_title}"
linphone:subtitle="@{@string/chat_settings_downloaded_images_public_summary}"
linphone:listener="@{viewModel.downloadedImagesPublicListener}"
linphone:checked="@={viewModel.downloadedImagesPublic}"/>
linphone:title="@{@string/chat_settings_downloaded_media_public_title}"
linphone:enabled="@{viewModel.autoDownloadIndex == 0}"
linphone:subtitle="@{@string/chat_settings_downloaded_media_public_summary}"
linphone:listener="@{viewModel.downloadedMediaPublicListener}"
linphone:checked="@={viewModel.downloadedMediaPublic}"/>
<include
layout="@layout/settings_widget_switch"

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

@ -404,8 +404,8 @@
<string name="chat_settings_auto_download_under_size">If lighter than given maximum size</string>
<string name="chat_settings_auto_download_max_size_title">Max size</string>
<string name="chat_settings_auto_download_max_size_summary">in bytes</string>
<string name="chat_settings_downloaded_images_public_title">Make downloaded images visible in native gallery</string>
<string name="chat_settings_downloaded_images_public_summary">Images in ephemeral messages won\'t be</string>
<string name="chat_settings_downloaded_media_public_title">Make downloaded media public</string>
<string name="chat_settings_downloaded_media_public_summary">Files in ephemeral messages won\'t be, doesn\'t work with auto download feature</string>
<string name="chat_settings_launcher_shortcuts_title">Create shortcuts to chat rooms in launcher</string>
<string name="chat_settings_launcher_shortcuts_summary">Will be replaced by contacts shortcuts if enabled</string>
<string name="chat_settings_hide_empty_rooms_title">Hide empty chat rooms</string>