From 42df8dfcb6189194267618336210ded11063da7f Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 19 May 2022 15:48:22 +0200 Subject: [PATCH] Fix issue #66 - Bad tags when clicking on a tag --- .../ui/fragment/timeline/FragmentMastodonTimeline.java | 8 +++++--- .../app/fedilab/android/viewmodel/mastodon/TopBarVM.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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 d2263bd7f..b2eeb044a 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 @@ -178,14 +178,16 @@ public class FragmentMastodonTimeline extends Fragment { statusReport = (Status) getArguments().getSerializable(Helper.ARG_STATUS_REPORT); } if (tagTimeline != null) { - ident = tagTimeline.name; + ident = "@T@" + tagTimeline.name; if (tagTimeline.isART) { timelineType = Timeline.TimeLineEnum.ART; } } else if (list_id != null) { - ident = list_id; + ident = "@l@" + list_id; } else if (remoteInstance != null) { - ident = remoteInstance; + ident = "@R@" + remoteInstance; + } else if (search != null) { + ident = "@S@" + search; } else { ident = null; } diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TopBarVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TopBarVM.java index b4361ecfa..87ed69faf 100644 --- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TopBarVM.java +++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TopBarVM.java @@ -42,7 +42,7 @@ public class TopBarVM extends AndroidViewModel { Handler mainHandler = new Handler(Looper.getMainLooper()); Pinned pinnedTimeline = null; try { - pinnedTimeline = pinned.getAllPinned(BaseMainActivity.accountWeakReference.get()); + pinnedTimeline = pinned.getPinned(BaseMainActivity.accountWeakReference.get()); } catch (DBException e) { e.printStackTrace(); }