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

Switched to admin based ephemeral mode

Browse source
This commit is contained in:
Sylvain Berfini 2021-10-07 10:53:28 +02:00
parent 20543832b5
commit 336e8510b9
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -668,11 +668,12 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
} }
if (viewModel.ephemeralChatRoom) { if (viewModel.ephemeralChatRoom) {
if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged && if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged) {
viewModel.meAdmin.value == false if (chatRoom.me?.isAdmin == false) {
) { Log.w("[Chat Room] Hiding ephemeral menu as mode is admin managed and we aren't admin")
popupView.ephemeralHidden = true popupView.ephemeralHidden = true
totalSize -= itemSize totalSize -= itemSize
}
} }
} }
} }

1
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
View file

@ -169,6 +169,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
else else
ChatRoomEphemeralMode.AdminManaged ChatRoomEphemeralMode.AdminManaged
params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
Log.i("[Chat Room Creation] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}")
params.subject = AppUtils.getString(R.string.chat_room_dummy_subject) params.subject = AppUtils.getString(R.string.chat_room_dummy_subject)
} }

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

@ -50,7 +50,7 @@ class EphemeralViewModel(private val chatRoom: ChatRoom) : ViewModel() {
} }
init { init {
Log.i("[Ephemeral Messages] Current duration is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.ephemeralEnabled()}") Log.i("[Ephemeral Messages] Current lifetime is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.ephemeralEnabled()}")
currentSelectedDuration = if (chatRoom.ephemeralEnabled()) chatRoom.ephemeralLifetime else 0 currentSelectedDuration = if (chatRoom.ephemeralEnabled()) chatRoom.ephemeralLifetime else 0
computeEphemeralDurationValues() computeEphemeralDurationValues()
} }

1
app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
View file

@ -125,6 +125,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() {
ChatRoomEphemeralMode.AdminManaged ChatRoomEphemeralMode.AdminManaged
} }
params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
Log.i("[Chat Room Group Info] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}")
params.subject = subject.value params.subject = subject.value
val addresses = arrayOfNulls<Address>(participants.value.orEmpty().size) val addresses = arrayOfNulls<Address>(participants.value.orEmpty().size)

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

@ -424,9 +424,8 @@ class CorePreferences constructor(private val context: Context) {
val voiceMessagesFormatMkv: Boolean val voiceMessagesFormatMkv: Boolean
get() = config.getBool("app", "record_voice_messages_in_mkv_format", true) get() = config.getBool("app", "record_voice_messages_in_mkv_format", true)
// TODO FIXME: Keeping it device based until we have the API to know if all participants support the new mode
val useEphemeralPerDeviceMode: Boolean val useEphemeralPerDeviceMode: Boolean
get() = config.getBool("app", "ephemeral_chat_messages_settings_per_device", true) get() = config.getBool("app", "ephemeral_chat_messages_settings_per_device", false)
/* Default values related */ /* Default values related */

6
app/src/main/res/layout/chat_message_content_cell.xml
View file

@ -61,7 +61,8 @@
<LinearLayout <LinearLayout
android:layout_width="@dimen/chat_message_bubble_file_size" android:layout_width="@dimen/chat_message_bubble_file_size"
android:layout_height="@dimen/chat_message_bubble_file_size" android:layout_height="wrap_content"
android:minHeight="@dimen/chat_message_bubble_file_size"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
@ -74,7 +75,6 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:padding="10dp"
android:gravity="center" android:gravity="center"
android:textAlignment="center" android:textAlignment="center"
android:drawablePadding="5dp" android:drawablePadding="5dp"
@ -87,6 +87,8 @@
style="@style/chat_file_attachment_font" style="@style/chat_file_attachment_font"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginBottom="5dp"
android:text="@{data.downloadLabel}" android:text="@{data.downloadLabel}"
android:onClick="@{() -> data.download()}" android:onClick="@{() -> data.download()}"
android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"/> android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"/>