Don't use activity.isFinishing()

jellyfin · Oct 9, 2022 · b055048 · b055048
1 parent a48c696
commit b055048
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java
@@ -185,7 +185,7 @@ public void onResume() {
 
  // React to deletion
  DataRefreshService dataRefreshService = KoinJavaComponent.<DataRefreshService>get(DataRefreshService.class);
- if (getActivity() != null && !getActivity().isFinishing() && mCurrentRow != null && mCurrentItem != null && mCurrentItem.getItemId() != null && mCurrentItem.getItemId().equals(dataRefreshService.getLastDeletedItemId())) {
+ if (mCurrentRow != null && mCurrentItem != null && mCurrentItem.getItemId() != null && mCurrentItem.getItemId().equals(dataRefreshService.getLastDeletedItemId())) {
  ((ItemRowAdapter) mCurrentRow.getAdapter()).remove(mCurrentItem);
  dataRefreshService.setLastDeletedItemId(null);
  }
@@ -201,7 +201,7 @@ public void run() {
 
  for (int i = 0; i < mRowsAdapter.size(); i++) {
  if (mRowsAdapter.get(i) instanceof ListRow) {
- if (((ListRow) mRowsAdapter.get(i)).getAdapter() instanceof ItemRowAdapter && !mActivity.isFinishing()) {
+ if (((ListRow) mRowsAdapter.get(i)).getAdapter() instanceof ItemRowAdapter) {
  ((ItemRowAdapter) ((ListRow) mRowsAdapter.get(i)).getAdapter()).ReRetrieveIfNeeded();
  }
  }

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeRowsFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/home/HomeRowsFragment.kt
@@ -180,7 +180,7 @@ class HomeRowsFragment : RowsSupportFragment(), AudioEventListener, View.OnKeyLi
  super.onResume()
 
  //React to deletion
- if (activity != null && !requireActivity().isFinishing && currentRow != null && currentItem != null && currentItem!!.getItemId() != null && currentItem!!.getItemId().equals(dataRefreshService.lastDeletedItemId)) {
+ if (currentRow != null && currentItem != null && currentItem!!.getItemId() != null && currentItem!!.getItemId().equals(dataRefreshService.lastDeletedItemId)) {
  (currentRow!!.adapter as ItemRowAdapter).remove(currentItem)
  dataRefreshService.lastDeletedItemId = null
  }

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
@@ -367,7 +367,7 @@ private void stopClock() {
  private static List<BaseItemKind> buttonTypeList = Arrays.asList(buttonTypes);
 
  private void updateWatched() {
- if (mWatchedToggleButton != null && mBaseItem != null && mBaseItem.getUserData() != null && !requireActivity().isFinishing()) {
+ if (mWatchedToggleButton != null && mBaseItem != null && mBaseItem.getUserData() != null) {
  mWatchedToggleButton.setActivated(mBaseItem.getUserData().getPlayed());
  }
  }
@@ -491,7 +491,7 @@ protected MyDetailsOverviewRow doInBackground(BaseItemDto... params) {
  protected void onPostExecute(MyDetailsOverviewRow detailsOverviewRow) {
  super.onPostExecute(detailsOverviewRow);
 
- if (requireActivity().isFinishing()) return;
+ if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) return;
 
  ClassPresenterSelector ps = new ClassPresenterSelector();
  ps.addClassPresenter(MyDetailsOverviewRow.class, mDorPresenter);

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java
@@ -418,7 +418,6 @@ public void onFocusChange(View v, boolean hasFocus) {
  };
 
  private void updatePoster() {
- if (requireActivity().isFinishing()) return;
  // Figure image size
  Double aspect = ImageUtils.getImageAspectRatio(mBaseItem, false);
  int posterHeight = aspect > 1 ? Utils.convertDpToPixel(requireActivity(), 150) : Utils.convertDpToPixel(requireActivity(), 250);