From 59df0d65a7e2dd30d91522675a577b189a3b22cb Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 19 May 2022 15:54:44 +0200 Subject: [PATCH] Fix issue #69 - App kept all notification position --- .../main/java/app/fedilab/android/BaseMainActivity.java | 7 +++++-- .../ui/fragment/timeline/FragmentMastodonTimeline.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 4bf7bb5eb..bc18fb896 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -252,8 +252,11 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt } else if (extras.getInt(Helper.INTENT_ACTION) == Helper.OPEN_NOTIFICATION) { final Handler handler = new Handler(); handler.postDelayed(() -> { - binding.bottomNavView.getMenu().getItem(3).setChecked(true); - binding.viewPager.setCurrentItem(3); + int position = BottomMenu.getPosition(bottomMenu, R.id.nav_notifications); + if (position > 0) { + binding.bottomNavView.getMenu().getItem(position).setChecked(true); + binding.viewPager.setCurrentItem(position); + } }, 1000); intent.removeExtra(Helper.INTENT_ACTION); diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java index b2eeb044a..f4f4558d2 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -393,7 +393,7 @@ public class FragmentMastodonTimeline extends Fragment { if (max_id == null || (fetched_statuses.pagination.max_id != null && fetched_statuses.pagination.max_id.compareTo(max_id) < 0)) { max_id = fetched_statuses.pagination.max_id; } - if (min_id == null || (fetched_statuses.pagination.max_id != null && fetched_statuses.pagination.min_id.compareTo(min_id) > 0)) { + if (min_id == null || (fetched_statuses.pagination.min_id != null && fetched_statuses.pagination.min_id.compareTo(min_id) > 0)) { min_id = fetched_statuses.pagination.min_id; } }