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

Fix after rebase

This commit is contained in:
Maxime NATUREL 2022-08-01 10:00:01 +02:00
parent c616229d53
commit 8571fd0ba9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -860,8 +860,8 @@ class TimelineFragment @Inject constructor(
views.liveLocationStatusIndicator.stopButton.debouncedClicks { views.liveLocationStatusIndicator.stopButton.debouncedClicks {
timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing) timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing)
} }
views.locationLiveStatusIndicator.debouncedClicks { views.liveLocationStatusIndicator.debouncedClicks {
navigateToLocationLiveMap() navigateToLiveLocationMap()
} }
} }

10
vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt
View File

@ -29,8 +29,8 @@ import im.vector.app.core.time.Clock
import im.vector.app.features.home.HomeActivity import im.vector.app.features.home.HomeActivity
import im.vector.app.features.home.room.detail.RoomDetailActivity import im.vector.app.features.home.room.detail.RoomDetailActivity
import im.vector.app.features.home.room.detail.arguments.TimelineArgs import im.vector.app.features.home.room.detail.arguments.TimelineArgs
import im.vector.app.features.location.live.map.LocationLiveMapViewActivity import im.vector.app.features.location.live.map.LiveLocationMapViewActivity
import im.vector.app.features.location.live.map.LocationLiveMapViewArgs import im.vector.app.features.location.live.map.LiveLocationMapViewArgs
import im.vector.app.features.notifications.NotificationUtils import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.themes.ThemeUtils import im.vector.app.features.themes.ThemeUtils
import javax.inject.Inject import javax.inject.Inject
@ -51,7 +51,7 @@ class LiveLocationNotificationBuilder @Inject constructor(
return NotificationCompat.Builder(context, NotificationUtils.SILENT_NOTIFICATION_CHANNEL_ID) return NotificationCompat.Builder(context, NotificationUtils.SILENT_NOTIFICATION_CHANNEL_ID)
.setContentTitle(stringProvider.getString(R.string.live_location_sharing_notification_title)) .setContentTitle(stringProvider.getString(R.string.live_location_sharing_notification_title))
.setContentText(stringProvider.getString(R.string.live_location_sharing_notification_description)) .setContentText(stringProvider.getString(R.string.live_location_sharing_notification_description))
.setSmallIcon(R.drawable.ic_attachment_location_live_white) .setSmallIcon(R.drawable.ic_attachment_live_location_white)
.setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary)) .setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary))
.setCategory(NotificationCompat.CATEGORY_LOCATION_SHARING) .setCategory(NotificationCompat.CATEGORY_LOCATION_SHARING)
.setContentIntent(buildOpenLiveLocationMapIntent(roomId)) .setContentIntent(buildOpenLiveLocationMapIntent(roomId))
@ -61,9 +61,9 @@ class LiveLocationNotificationBuilder @Inject constructor(
private fun buildOpenLiveLocationMapIntent(roomId: String): PendingIntent? { private fun buildOpenLiveLocationMapIntent(roomId: String): PendingIntent? {
val homeIntent = HomeActivity.newIntent(context, firstStartMainActivity = false) val homeIntent = HomeActivity.newIntent(context, firstStartMainActivity = false)
val roomIntent = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true), firstStartMainActivity = false) val roomIntent = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true), firstStartMainActivity = false)
val mapIntent = LocationLiveMapViewActivity.getIntent( val mapIntent = LiveLocationMapViewActivity.getIntent(
context = context, context = context,
locationLiveMapViewArgs = LocationLiveMapViewArgs(roomId = roomId), liveLocationMapViewArgs = LiveLocationMapViewArgs(roomId = roomId),
firstStartMainActivity = true firstStartMainActivity = true
) )
mapIntent.action = NotificationUtils.TAP_TO_VIEW_ACTION mapIntent.action = NotificationUtils.TAP_TO_VIEW_ACTION