filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename fun for clarity

This commit is contained in:
Benoit Marty 2022-01-29 07:40:41 +01:00
parent b14e557c36
commit 83ed80e6d8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
View File

@ -63,5 +63,5 @@ data class MessageLocationContent(
@Json(name = "org.matrix.msc1767.text") val text: String? = null @Json(name = "org.matrix.msc1767.text") val text: String? = null
) : MessageContent { ) : MessageContent {
fun getUri() = locationInfo?.geoUri ?: geoUri fun getBestGeoUri() = locationInfo?.geoUri ?: geoUri
} }

4
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -614,7 +614,7 @@ class RoomDetailFragment @Inject constructor(
private fun handleShowLocationPreview(locationContent: MessageLocationContent, senderId: String) { private fun handleShowLocationPreview(locationContent: MessageLocationContent, senderId: String) {
// TODO Create a helper // TODO Create a helper
val geoUri = locationContent.getUri() val geoUri = locationContent.getBestGeoUri()
val locationData = LocationData.create(geoUri) val locationData = LocationData.create(geoUri)
navigator navigator
.openLocationSharing( .openLocationSharing(
@ -1948,7 +1948,7 @@ class RoomDetailFragment @Inject constructor(
when (action.messageContent) { when (action.messageContent) {
is MessageTextContent -> shareText(requireContext(), action.messageContent.body) is MessageTextContent -> shareText(requireContext(), action.messageContent.body)
is MessageLocationContent -> { is MessageLocationContent -> {
LocationData.create(action.messageContent.getUri())?.let { LocationData.create(action.messageContent.getBestGeoUri())?.let {
openLocation(requireActivity(), it.latitude, it.longitude) openLocation(requireActivity(), it.latitude, it.longitude)
} }
} }

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
View File

@ -79,7 +79,7 @@ class MessageActionsEpoxyController @Inject constructor(
val bindingOptions = spanUtils.getBindingOptions(body) val bindingOptions = spanUtils.getBindingOptions(body)
val locationUrl = state.timelineEvent()?.root?.getClearContent() val locationUrl = state.timelineEvent()?.root?.getClearContent()
?.toModel<MessageLocationContent>(catchError = true) ?.toModel<MessageLocationContent>(catchError = true)
?.let { LocationData.create(it.getUri()) } ?.let { LocationData.create(it.getBestGeoUri()) }
?.let { urlMapProvider.buildStaticMapUrl(it, INITIAL_MAP_ZOOM_IN_TIMELINE, 1200, 800) } ?.let { urlMapProvider.buildStaticMapUrl(it, INITIAL_MAP_ZOOM_IN_TIMELINE, 1200, 800) }
bottomSheetMessagePreviewItem { bottomSheetMessagePreviewItem {

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View File

@ -200,7 +200,7 @@ class MessageItemFactory @Inject constructor(
informationData: MessageInformationData, informationData: MessageInformationData,
highlight: Boolean, highlight: Boolean,
attributes: AbsMessageItem.Attributes): MessageLocationItem? { attributes: AbsMessageItem.Attributes): MessageLocationItem? {
val geoUri = locationContent.getUri() val geoUri = locationContent.getBestGeoUri()
val locationData = LocationData.create(geoUri) val locationData = LocationData.create(geoUri)
val width = resources.displayMetrics.widthPixels - dimensionConverter.dpToPx(60) val width = resources.displayMetrics.widthPixels - dimensionConverter.dpToPx(60)