From 1720dc1fac27e9f3602469c3085ae603712c15a5 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 2 May 2022 14:23:24 +0200 Subject: [PATCH] Removing non necessary fields when mapping from DB model --- .../LiveLocationShareAggregatedSummary.kt | 5 ----- .../LiveLocationShareAggregatedSummaryMapper.kt | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt index 604b15f90a..0b28d62f56 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt @@ -22,11 +22,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocati * Aggregation info concerning a live location share. */ data class LiveLocationShareAggregatedSummary( - /** - * Event id of the event that started the live. - */ - val eventId: String, - val roomId: String, val isActive: Boolean?, val endOfLiveTimestampMillis: Long?, val lastLocationDataContent: MessageBeaconLocationDataContent?, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt index 605fb25d30..71b36f88bd 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt @@ -16,7 +16,6 @@ package org.matrix.android.sdk.internal.database.mapper -import org.matrix.android.sdk.api.session.events.model.toContent import org.matrix.android.sdk.api.session.events.model.toModel import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent @@ -26,21 +25,9 @@ internal object LiveLocationShareAggregatedSummaryMapper { fun map(entity: LiveLocationShareAggregatedSummaryEntity): LiveLocationShareAggregatedSummary { return LiveLocationShareAggregatedSummary( - eventId = entity.eventId, - roomId = entity.roomId, isActive = entity.isActive, endOfLiveTimestampMillis = entity.endOfLiveTimestampMillis, lastLocationDataContent = ContentMapper.map(entity.lastLocationContent).toModel() ) } - - fun map(model: LiveLocationShareAggregatedSummary): LiveLocationShareAggregatedSummaryEntity { - return LiveLocationShareAggregatedSummaryEntity( - eventId = model.eventId, - roomId = model.roomId, - isActive = model.isActive, - endOfLiveTimestampMillis = model.endOfLiveTimestampMillis, - lastLocationContent = ContentMapper.map(model.lastLocationDataContent.toContent()) - ) - } }