From b56f18c778e5639d29d3482aeae58660e2bbbc8b Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Fri, 19 Aug 2022 19:36:39 +0200 Subject: [PATCH] Simplify reportPlaybackStopped code --- .../ui/playback/PlaybackManager.java | 2 +- .../util/apiclient/ReportingHelper.java | 37 +++++++------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackManager.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackManager.java index 761d7660da..6cf5936f9d 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackManager.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackManager.java @@ -113,7 +113,7 @@ public void reportPlaybackProgress(PlaybackProgressInfo info, final StreamInfo s apiClient.ReportPlaybackProgressAsync(info, response); } - public void reportPlaybackStopped(PlaybackStopInfo info, final StreamInfo streamInfo, final String serverId, String userId, final ApiClient apiClient, final EmptyResponse response) { + public void reportPlaybackStopped(PlaybackStopInfo info, final StreamInfo streamInfo, final ApiClient apiClient, final EmptyResponse response) { MediaSourceInfo mediaSource = streamInfo.getMediaSource(); if (mediaSource != null) { diff --git a/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java b/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java index 91fc687093..17e396d1b1 100644 --- a/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java +++ b/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java @@ -2,8 +2,6 @@ import androidx.annotation.Nullable; -import org.jellyfin.androidtv.auth.repository.Session; -import org.jellyfin.androidtv.auth.repository.SessionRepository; import org.jellyfin.androidtv.data.compat.StreamInfo; import org.jellyfin.androidtv.data.model.DataRefreshService; import org.jellyfin.androidtv.ui.playback.PlaybackController; @@ -16,32 +14,25 @@ import org.jellyfin.apiclient.model.session.PlaybackStopInfo; import org.koin.java.KoinJavaComponent; -import java.util.UUID; - import timber.log.Timber; public class ReportingHelper { public static void reportStopped(BaseItemDto item, StreamInfo streamInfo, long pos) { if (item != null && streamInfo != null) { - Session currentSession = KoinJavaComponent.get(SessionRepository.class).getCurrentSession().getValue(); - if (currentSession != null) { - UUID userId = currentSession.getUserId(); - - PlaybackStopInfo info = new PlaybackStopInfo(); - info.setItemId(item.getId()); - info.setPositionTicks(pos); - KoinJavaComponent.get(PlaybackManager.class).reportPlaybackStopped(info, streamInfo, KoinJavaComponent.get(ApiClient.class).getServerInfo().getId(), userId.toString(), KoinJavaComponent.get(ApiClient.class), new EmptyResponse()); - - DataRefreshService dataRefreshService = KoinJavaComponent.get(DataRefreshService.class); - dataRefreshService.setLastPlayback(System.currentTimeMillis()); - switch (item.getBaseItemType()) { - case Movie: - dataRefreshService.setLastMoviePlayback(System.currentTimeMillis()); - break; - case Episode: - dataRefreshService.setLastTvPlayback(System.currentTimeMillis()); - break; - } + PlaybackStopInfo info = new PlaybackStopInfo(); + info.setItemId(item.getId()); + info.setPositionTicks(pos); + KoinJavaComponent.get(PlaybackManager.class).reportPlaybackStopped(info, streamInfo, KoinJavaComponent.get(ApiClient.class), new EmptyResponse()); + + DataRefreshService dataRefreshService = KoinJavaComponent.get(DataRefreshService.class); + dataRefreshService.setLastPlayback(System.currentTimeMillis()); + switch (item.getBaseItemType()) { + case Movie: + dataRefreshService.setLastMoviePlayback(System.currentTimeMillis()); + break; + case Episode: + dataRefreshService.setLastTvPlayback(System.currentTimeMillis()); + break; } } }