some fixes

1 files changed, 13 insertions, 16 deletions

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 6b8f26c5e..80abbd813 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -587,7 +587,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                         });
                     }
                     binding.bottomNavView.setOnItemSelectedListener(item -> {
-
                         int itemId = item.getItemId();
                         int position = BottomMenu.getPosition(bottomMenu, itemId);
                         if (position >= 0) {
@@ -878,21 +877,19 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
      * Allow to scroll to top for bottom navigation items
      */
     private void scrollToTop() {
-        if (binding.viewPager.getAdapter() != null) {
-            Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());
-            if (fragment instanceof FragmentMastodonTimeline) {
-                FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
-                fragmentMastodonTimeline.scrollToTop();
-            } else if (fragment instanceof FragmentMastodonNotification) {
-                FragmentMastodonNotification fragmentMastodonNotification = ((FragmentMastodonNotification) fragment);
-                fragmentMastodonNotification.scrollToTop();
-            } else if (fragment instanceof FragmentMastodonConversation) {
-                FragmentMastodonConversation fragmentMastodonConversation = ((FragmentMastodonConversation) fragment);
-                fragmentMastodonConversation.scrollToTop();
-            } else if (fragment instanceof FragmentNotificationContainer) {
-                FragmentNotificationContainer fragmentNotificationContainer = ((FragmentNotificationContainer) fragment);
-                fragmentNotificationContainer.scrollToTop();
-            }
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());
+        if (fragment instanceof FragmentMastodonTimeline) {
+            FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
+            fragmentMastodonTimeline.scrollToTop();
+        } else if (fragment instanceof FragmentMastodonNotification) {
+            FragmentMastodonNotification fragmentMastodonNotification = ((FragmentMastodonNotification) fragment);
+            fragmentMastodonNotification.scrollToTop();
+        } else if (fragment instanceof FragmentMastodonConversation) {
+            FragmentMastodonConversation fragmentMastodonConversation = ((FragmentMastodonConversation) fragment);
+            fragmentMastodonConversation.scrollToTop();
+        } else if (fragment instanceof FragmentNotificationContainer) {
+            FragmentNotificationContainer fragmentNotificationContainer = ((FragmentNotificationContainer) fragment);
+            fragmentNotificationContainer.scrollToTop();
         }
     }