From 8571fd0ba9b70f57f6fc2bece2d59f4ea0049e20 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 1 Aug 2022 10:00:01 +0200 Subject: [PATCH] Fix after rebase --- .../app/features/home/room/detail/TimelineFragment.kt | 4 ++-- .../live/tracking/LiveLocationNotificationBuilder.kt | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 46d758b0de..7acc77a686 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -860,8 +860,8 @@ class TimelineFragment @Inject constructor( views.liveLocationStatusIndicator.stopButton.debouncedClicks { timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing) } - views.locationLiveStatusIndicator.debouncedClicks { - navigateToLocationLiveMap() + views.liveLocationStatusIndicator.debouncedClicks { + navigateToLiveLocationMap() } } diff --git a/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt index 5ba793ea89..b8dd17e8fd 100644 --- a/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt +++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt @@ -29,8 +29,8 @@ import im.vector.app.core.time.Clock import im.vector.app.features.home.HomeActivity import im.vector.app.features.home.room.detail.RoomDetailActivity 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.LocationLiveMapViewArgs +import im.vector.app.features.location.live.map.LiveLocationMapViewActivity +import im.vector.app.features.location.live.map.LiveLocationMapViewArgs import im.vector.app.features.notifications.NotificationUtils import im.vector.app.features.themes.ThemeUtils import javax.inject.Inject @@ -51,7 +51,7 @@ class LiveLocationNotificationBuilder @Inject constructor( return NotificationCompat.Builder(context, NotificationUtils.SILENT_NOTIFICATION_CHANNEL_ID) .setContentTitle(stringProvider.getString(R.string.live_location_sharing_notification_title)) .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)) .setCategory(NotificationCompat.CATEGORY_LOCATION_SHARING) .setContentIntent(buildOpenLiveLocationMapIntent(roomId)) @@ -61,9 +61,9 @@ class LiveLocationNotificationBuilder @Inject constructor( private fun buildOpenLiveLocationMapIntent(roomId: String): PendingIntent? { val homeIntent = HomeActivity.newIntent(context, firstStartMainActivity = false) val roomIntent = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true), firstStartMainActivity = false) - val mapIntent = LocationLiveMapViewActivity.getIntent( + val mapIntent = LiveLocationMapViewActivity.getIntent( context = context, - locationLiveMapViewArgs = LocationLiveMapViewArgs(roomId = roomId), + liveLocationMapViewArgs = LiveLocationMapViewArgs(roomId = roomId), firstStartMainActivity = true ) mapIntent.action = NotificationUtils.TAP_TO_VIEW_ACTION