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

Set conference chat room without any participant as read-only + replaced deprecated function

Browse source
This commit is contained in:
Sylvain Berfini 2022-06-14 10:38:50 +02:00
parent a437c1f5ef
commit df396f5abd
7 changed files with 11 additions and 11 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/data/ChatMessageContentData.kt
View file

@ -233,7 +233,7 @@ class ChatMessageContentData(
if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) { if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) {
val path = if (isFileEncrypted) { val path = if (isFileEncrypted) {
Log.i("[Content] Content is encrypted, requesting plain file path") Log.i("[Content] Content is encrypted, requesting plain file path")
content.plainFilePath content.exportPlainFile()
} else { } else {
content.filePath ?: "" content.filePath ?: ""
} }

2
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -1107,7 +1107,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
dialog.dismiss() dialog.dismiss()
lifecycleScope.launch { lifecycleScope.launch {
Log.w("[Chat Room] Content is encrypted, requesting plain file path") Log.w("[Chat Room] Content is encrypted, requesting plain file path")
val plainFilePath = content.plainFilePath val plainFilePath = content.exportPlainFile()
Log.i("[Cht Room] Making a copy of [$plainFilePath] to the cache directory before exporting it") Log.i("[Cht Room] Making a copy of [$plainFilePath] to the cache directory before exporting it")
val cacheCopyPath = FileUtils.copyFileToCache(plainFilePath) val cacheCopyPath = FileUtils.copyFileToCache(plainFilePath)
if (cacheCopyPath != null) { if (cacheCopyPath != null) {

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

@ -128,7 +128,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
attachFileEnabled.value = true attachFileEnabled.value = true
sendMessageEnabled.value = false sendMessageEnabled.value = false
isReadOnly.value = chatRoom.isReadOnly isReadOnly.value = chatRoom.isReadOnly || (chatRoom.hasCapability(ChatRoomCapabilities.Conference.toInt()) && chatRoom.participants.isEmpty())
val recorderParams = coreContext.core.createRecorderParams() val recorderParams = coreContext.core.createRecorderParams()
if (corePreferences.voiceMessagesFormatMkv) { if (corePreferences.voiceMessagesFormatMkv) {

2
app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
View file

@ -137,7 +137,7 @@ class TopBarFragment : GenericFragment<FileViewerTopBarFragmentBinding>() {
if (mediaStoreFilePath.isEmpty()) { if (mediaStoreFilePath.isEmpty()) {
Log.w("[File Viewer] Media store file path is empty, media store export failed?") Log.w("[File Viewer] Media store file path is empty, media store export failed?")
val filePath = content.plainFilePath.orEmpty() val filePath = content.exportPlainFile().orEmpty()
plainFilePath = filePath.ifEmpty { content.filePath.orEmpty() } plainFilePath = filePath.ifEmpty { content.filePath.orEmpty() }
Log.i("[File Viewer] Plain file path is: $plainFilePath") Log.i("[File Viewer] Plain file path is: $plainFilePath")
if (plainFilePath.isNotEmpty()) { if (plainFilePath.isNotEmpty()) {

2
app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
View file

@ -34,7 +34,7 @@ open class FileViewerViewModel(val content: Content) : ViewModel() {
init { init {
filePath = if (deleteAfterUse) { filePath = if (deleteAfterUse) {
Log.i("[File Viewer] Content is encrypted, requesting plain file path") Log.i("[File Viewer] Content is encrypted, requesting plain file path")
content.plainFilePath content.exportPlainFile()
} else { } else {
content.filePath.orEmpty() content.filePath.orEmpty()
} }

6
app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
View file

@ -147,7 +147,7 @@ class Api23Compatibility {
return false return false
} }
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@ -185,7 +185,7 @@ class Api23Compatibility {
return false return false
} }
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@ -224,7 +224,7 @@ class Api23Compatibility {
return false return false
} }
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath

6
app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
View file

@ -99,7 +99,7 @@ class Api29Compatibility {
} }
suspend fun addImageToMediaStore(context: Context, content: Content): Boolean { suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@ -135,7 +135,7 @@ class Api29Compatibility {
} }
suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean { suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean {
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@ -172,7 +172,7 @@ class Api29Compatibility {
} }
suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean { suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean {
val plainFilePath = content.plainFilePath.orEmpty() val plainFilePath = content.exportPlainFile().orEmpty()
val isVfsEncrypted = plainFilePath.isNotEmpty() val isVfsEncrypted = plainFilePath.isNotEmpty()
Log.w("[Media Store] Content is encrypted, requesting plain file path") Log.w("[Media Store] Content is encrypted, requesting plain file path")
val filePath = if (isVfsEncrypted) plainFilePath else content.filePath val filePath = if (isVfsEncrypted) plainFilePath else content.filePath