Remove legacy Java ApiClient

app/build.gradle.kts

@@ -96,7 +96,6 @@ dependencies {
 	implementation(projects.playback.media3.exoplayer)
 	implementation(projects.playback.media3.session)
 	implementation(projects.preference)
-	implementation(libs.jellyfin.apiclient)
 	implementation(libs.jellyfin.sdk) {
 		// Change version if desired
 		val sdkVersion = findProperty("sdk.version")?.toString()

app/src/main/java/org/jellyfin/androidtv/auth/repository/SessionRepository.kt

@@ -7,7 +7,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.jellyfin.androidtv.auth.apiclient.ApiBinder
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.jellyfin.androidtv.preference.PreferencesRepository
@@ -48,7 +47,6 @@ interface SessionRepository {
 
 class SessionRepositoryImpl(
 	private val authenticationPreferences: AuthenticationPreferences,
-	private val apiBinder: ApiBinder,
 	private val authenticationStore: AuthenticationStore,
 	private val userApiClient: ApiClient,
 	private val preferencesRepository: PreferencesRepository,
@@ -114,7 +112,6 @@ class SessionRepositoryImpl(
 
 		userRepository.updateCurrentUser(null)
 		_currentSession.value = null
-		apiBinder.updateSession(null, userApiClient.deviceInfo)
 		_state.value = SessionRepositoryState.READY
 	}
 
@@ -134,34 +131,30 @@ class SessionRepositoryImpl(
 
 		// Update session after binding the apiclient settings
 		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
-		val success = apiBinder.updateSession(session, deviceInfo)
-		Timber.i("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
-
-		if (success) {
-			val applied = userApiClient.applySession(session, deviceInfo)
-
-			if (applied && session != null) {
-				try {
-					val user by userApiClient.userApi.getCurrentUser()
-					userRepository.updateCurrentUser(user)
-				} catch (err: ApiClientException) {
-					Timber.e(err, "Unable to authenticate: bad response when getting user info")
-					destroyCurrentSession()
-					return false
-				}
-
-				// Update crash reporting URL
-				val crashReportUrl = userApiClient.clientLogApi.logFileUrl()
-				telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
-				telemetryPreferences[TelemetryPreferences.crashReportToken] = session.accessToken
-			} else {
-				userRepository.updateCurrentUser(null)
+		Timber.i("Updating current session. userId=${session?.userId}")
+
+		val applied = userApiClient.applySession(session, deviceInfo)
+		if (applied && session != null) {
+			try {
+				val user by userApiClient.userApi.getCurrentUser()
+				userRepository.updateCurrentUser(user)
+			} catch (err: ApiClientException) {
+				Timber.e(err, "Unable to authenticate: bad response when getting user info")
+				destroyCurrentSession()
+				return false
 			}
-			preferencesRepository.onSessionChanged()
-			_currentSession.value = session
-		} else destroyCurrentSession()
 
-		return success
+			// Update crash reporting URL
+			val crashReportUrl = userApiClient.clientLogApi.logFileUrl()
+			telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
+			telemetryPreferences[TelemetryPreferences.crashReportToken] = session.accessToken
+		} else {
+			userRepository.updateCurrentUser(null)
+		}
+		preferencesRepository.onSessionChanged()
+		_currentSession.value = session
+
+		return true
 	}
 
 	private fun createLastUserSession(): Session? {

app/src/main/java/org/jellyfin/androidtv/di/AppModule.kt

@@ -46,20 +46,13 @@ import org.jellyfin.androidtv.util.MarkdownRenderer
 import org.jellyfin.androidtv.util.PlaybackHelper
 import org.jellyfin.androidtv.util.apiclient.ReportingHelper
 import org.jellyfin.androidtv.util.sdk.SdkPlaybackHelper
-import org.jellyfin.androidtv.util.sdk.legacy
-import org.jellyfin.apiclient.AppInfo
-import org.jellyfin.apiclient.android
-import org.jellyfin.apiclient.logging.AndroidLogger
 import org.jellyfin.sdk.android.androidDevice
 import org.jellyfin.sdk.createJellyfin
 import org.jellyfin.sdk.model.ClientInfo
-import org.jellyfin.sdk.model.DeviceInfo
-import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
-import org.jellyfin.apiclient.Jellyfin as JellyfinApiClient
 import org.jellyfin.sdk.Jellyfin as JellyfinSdk
 
 val defaultDeviceInfo = named("defaultDeviceInfo")
@@ -87,21 +80,6 @@ val appModule = module {
 
 	single { SocketHandler(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
 
-	// Old apiclient
-	single {
-		JellyfinApiClient {
-			appInfo = AppInfo("Jellyfin Android TV", BuildConfig.VERSION_NAME)
-			logger = AndroidLogger()
-			android(androidApplication())
-		}
-	}
-
-	single {
-		get<JellyfinApiClient>().createApi(
-			device = get<DeviceInfo>(defaultDeviceInfo).legacy()
-		)
-	}
-
 	// Coil (images)
 	single {
 		ImageLoader.Builder(androidContext()).apply {

app/src/main/java/org/jellyfin/androidtv/di/AuthModule.kt

@@ -1,7 +1,6 @@
 package org.jellyfin.androidtv.di
 
 import org.jellyfin.androidtv.auth.AccountManagerMigration
-import org.jellyfin.androidtv.auth.apiclient.ApiBinder
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepository
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepositoryImpl
 import org.jellyfin.androidtv.auth.repository.ServerRepository
@@ -25,8 +24,6 @@ val authModule = module {
 	single<ServerRepository> { ServerRepositoryImpl(get(), get()) }
 	single<ServerUserRepository> { ServerUserRepositoryImpl(get(), get()) }
 	single<SessionRepository> {
-		SessionRepositoryImpl(get(), get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
+		SessionRepositoryImpl(get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
 	}
-
-	single { ApiBinder(get(), get()) }
 }

app/src/main/java/org/jellyfin/androidtv/ui/LiveProgramDetailPopup.java

@@ -24,7 +24,7 @@
 import org.jellyfin.androidtv.ui.livetv.LiveTvGuide;
 import org.jellyfin.androidtv.ui.livetv.TvManager;
 import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.EmptyResponse;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.koin.java.KoinJavaComponent;
 
@@ -48,13 +48,13 @@
     private Button mFirstButton;
     private Button mSeriesSettingsButton;
 
-    private EmptyLifecycleAwareResponse mTuneAction;
+    private EmptyResponse mTuneAction;
 
     private View mAnchor;
     private int mPosLeft;
     private int mPosTop;
 
-    public LiveProgramDetailPopup(Context context, LifecycleOwner lifecycleOwner, LiveTvGuide tvGuide, int width, EmptyLifecycleAwareResponse tuneAction) {
+    public LiveProgramDetailPopup(Context context, LifecycleOwner lifecycleOwner, LiveTvGuide tvGuide, int width, EmptyResponse tuneAction) {
         mContext = context;
         lifecycle = lifecycleOwner.getLifecycle();
         mTvGuide = tvGuide;
@@ -247,7 +247,7 @@
         tune.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mTuneAction != null && mTuneAction.getActive()) mTuneAction.onResponse();
+                if (mTuneAction != null) mTuneAction.onResponse();
                 mPopup.dismiss();
             }
         });

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseGridFragment.java

@@ -59,7 +59,7 @@
 import org.jellyfin.androidtv.util.InfoLayoutHelper;
 import org.jellyfin.androidtv.util.KeyProcessor;
 import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.EmptyResponse;
 import org.jellyfin.sdk.api.client.ApiClient;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.jellyfin.sdk.model.api.BaseItemKind;
@@ -659,11 +659,9 @@ private void buildAdapter() {
         filters.setFavoriteOnly(libraryPreferences.get(LibraryPreferences.Companion.getFilterFavoritesOnly()));
         filters.setUnwatchedOnly(libraryPreferences.get(LibraryPreferences.Companion.getFilterUnwatchedOnly()));
 
-        mAdapter.setRetrieveFinishedListener(new EmptyLifecycleAwareResponse(getLifecycle()) {
+        mAdapter.setRetrieveFinishedListener(new EmptyResponse() {
             @Override
             public void onResponse() {
-                if (!getActive()) return;
-
                 setStatusText(mFolder.getName());
                 if (mCurrentItem == null) { // don't mess-up pos via loadMoreItemsIfNeeded
                     setItem(null);

app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java

@@ -77,7 +77,7 @@
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.androidtv.util.apiclient.BaseItemUtils;
-import org.jellyfin.androidtv.util.apiclient.LifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.Response;
 import org.jellyfin.androidtv.util.sdk.BaseItemExtensionsKt;
 import org.jellyfin.androidtv.util.sdk.TrailerUtils;
 import org.jellyfin.androidtv.util.sdk.compat.JavaCompat;
@@ -714,11 +714,9 @@ void addItemToQueue() {
         BaseItemDto baseItem = mBaseItem;
         if (baseItem.getType() == BaseItemKind.AUDIO || baseItem.getType() == BaseItemKind.MUSIC_ALBUM || baseItem.getType() == BaseItemKind.MUSIC_ARTIST) {
             if (baseItem.getType() == BaseItemKind.MUSIC_ALBUM || baseItem.getType() == BaseItemKind.MUSIC_ARTIST) {
-                playbackHelper.getValue().getItemsToPlay(getContext(), baseItem, false, false, new LifecycleAwareResponse<List<BaseItemDto>>(getLifecycle()) {
+                playbackHelper.getValue().getItemsToPlay(getContext(), baseItem, false, false, new Response<List<BaseItemDto>>() {
                     @Override
                     public void onResponse(List<BaseItemDto> response) {
-                        if (!getActive()) return;
-
                         mediaManager.getValue().addToAudioQueue(response);
                     }
                 });
@@ -1196,10 +1194,9 @@ void shufflePlay() {
     }
 
     void play(final BaseItemDto item, final int pos, final boolean shuffle) {
-        playbackHelper.getValue().getItemsToPlay(getContext(), item, pos == 0 && item.getType() == BaseItemKind.MOVIE, shuffle, new LifecycleAwareResponse<List<BaseItemDto>>(getLifecycle()) {
+        playbackHelper.getValue().getItemsToPlay(getContext(), item, pos == 0 && item.getType() == BaseItemKind.MOVIE, shuffle, new Response<List<BaseItemDto>>() {
             @Override
             public void onResponse(List<BaseItemDto> response) {
-                if (!getActive()) return;
                 if (response.isEmpty()) {
                     Timber.e("No items to play - ignoring play request.");
                     return;

app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncher.java

@@ -17,8 +17,8 @@
 import org.jellyfin.androidtv.ui.playback.VideoQueueManager;
 import org.jellyfin.androidtv.util.PlaybackHelper;
 import org.jellyfin.androidtv.util.Utils;
+import org.jellyfin.androidtv.util.apiclient.Response;
 import org.jellyfin.androidtv.util.sdk.compat.JavaCompat;
-import org.jellyfin.apiclient.interaction.Response;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.jellyfin.sdk.model.api.BaseItemKind;
 import org.jellyfin.sdk.model.api.CollectionType;

app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncherHelper.kt

@@ -3,7 +3,7 @@ package org.jellyfin.androidtv.ui.itemhandling
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
-import org.jellyfin.apiclient.interaction.Response
+import org.jellyfin.androidtv.util.apiclient.Response
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
 import org.jellyfin.sdk.api.client.extensions.userLibraryApi

app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java

@@ -31,7 +31,7 @@
 import org.jellyfin.androidtv.ui.presentation.MutableObjectAdapter;
 import org.jellyfin.androidtv.ui.presentation.TextItemPresenter;
 import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.EmptyResponse;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.jellyfin.sdk.model.api.BaseItemPerson;
 import org.jellyfin.sdk.model.api.ItemSortBy;
@@ -78,7 +78,7 @@
     private SortOrder sortOrder;
     private FilterOptions mFilters;
 
-    private EmptyLifecycleAwareResponse mRetrieveFinishedListener;
+    private EmptyResponse mRetrieveFinishedListener;
 
     private ChangeTriggerType[] reRetrieveTriggers = new ChangeTriggerType[]{};
     private Instant lastFullRetrieve;
@@ -720,13 +720,13 @@
 
     protected void notifyRetrieveFinished(@Nullable Exception exception) {
         setCurrentlyRetrieving(false);
-        if (mRetrieveFinishedListener != null && mRetrieveFinishedListener.getActive()) {
+        if (mRetrieveFinishedListener != null) {
             if (exception == null) mRetrieveFinishedListener.onResponse();
             else mRetrieveFinishedListener.onError(exception);
         }
     }
 
-    public void setRetrieveFinishedListener(EmptyLifecycleAwareResponse response) {
+    public void setRetrieveFinishedListener(EmptyResponse response) {
         this.mRetrieveFinishedListener = response;
     }
 

app/src/main/java/org/jellyfin/androidtv/ui/livetv/LiveTvGuideFragment.java

@@ -49,7 +49,7 @@
 import org.jellyfin.androidtv.util.TextUtilsKt;
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.EmptyResponse;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 
 import java.time.LocalDateTime;
@@ -426,11 +426,9 @@ public void dismissProgramOptions() {
     public void showProgramOptions() {
         if (mSelectedProgram == null) return;
         if (mDetailPopup == null) {
-            mDetailPopup = new LiveProgramDetailPopup(requireActivity(), this, this, mSummary.getWidth()+20, new EmptyLifecycleAwareResponse(getLifecycle()) {
+            mDetailPopup = new LiveProgramDetailPopup(requireActivity(), this, this, mSummary.getWidth()+20, new EmptyResponse() {
                 @Override
                 public void onResponse() {
-                    if (!getActive()) return;
-
                     playbackHelper.getValue().retrieveAndPlay(mSelectedProgram.getChannelId(), false, requireContext());
                 }
             });
@@ -475,11 +473,9 @@ private void loadProgramData() {
         mChannels.removeAllViews();
         mChannelStatus.setText("");
         mFilterStatus.setText("");
-        TvManager.getProgramsAsync(this, mCurrentDisplayChannelStartNdx, mCurrentDisplayChannelEndNdx, mCurrentGuideStart, mCurrentGuideEnd, new EmptyLifecycleAwareResponse(getLifecycle()) {
+        TvManager.getProgramsAsync(this, mCurrentDisplayChannelStartNdx, mCurrentDisplayChannelEndNdx, mCurrentGuideStart, mCurrentGuideEnd, new EmptyResponse() {
             @Override
             public void onResponse() {
-                if (!getActive()) return;
-
                 Timber.d("*** Programs response");
                 if (mDisplayProgramsTask != null) mDisplayProgramsTask.cancel(true);
                 mDisplayProgramsTask = new DisplayProgramsTask();