Move the code that checks if the Fragment is still attached closer to…

… the code that actually use the activity
wordpress-mobile · Mar 21, 2024 · 88e9cab · 88e9cab
1 parent ae0e624
commit 88e9cab
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
@@ -2321,14 +2321,19 @@ private void updateCurrentTagIfTime() {
         new Thread() {
             @Override
             public void run() {
-                // Check the fragment is attached to the activity when this Thread starts.
-                FragmentActivity activity = getActivity();
-                if (activity == null) {
-                    return;
-                }
                 if (ReaderTagTable.shouldAutoUpdateTag(getCurrentTag()) && isAdded()) {
+                    // Check the fragment is attached right after `shouldAutoUpdateTag`
+                    FragmentActivity activity = getActivity();
+                    if (activity == null) {
+                        return;
+                    }
                     activity.runOnUiThread(() -> updateCurrentTag());
                 } else {
+                    // Check the fragment is attached to the activity when this Thread starts.
+                    FragmentActivity activity = getActivity();
+                    if (activity == null) {
+                        return;
+                    }
                     activity.runOnUiThread(() -> {
                         if (isBookmarksList() && isPostAdapterEmpty() && isAdded()) {
                             setEmptyTitleAndDescriptionForBookmarksList();