From 9ae0f49bff0207dc90c143f70944380438ea9a8d Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Mon, 20 Feb 2023 11:20:01 -0300 Subject: [PATCH] Revert "Changing hardcoded fosstodon to domain" This reverts commit 269794bfc35780785fea0ed66b18467654370086. --- .../android/fragments/CustomLocalTimelineFragment.java | 4 ++-- .../org/joinmastodon/android/model/TimelineDefinition.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java index ec3b0196c..dd6bb3a4f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java @@ -48,7 +48,7 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment { public void onAttach(Activity activity){ super.onAttach(activity); domain=getArguments().getString("domain"); - updateTitle(domain); + updateTitle(getArguments().getString("domain")); setHasOptionsMenu(true); } @@ -82,7 +82,7 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment { onDataLoaded(result, !result.isEmpty()); } }) - .execNoAuth(domain); + .execNoAuth("fosstodon.org"); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java index 043d068fe..ba832cd80 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java @@ -30,7 +30,7 @@ public class TimelineDefinition { private @Nullable String listTitle; private @Nullable String hashtagName; - private @Nullable String domain; + private @Nullable String customLocalTimelineDomain; public static TimelineDefinition ofList(String listId, String listTitle) { TimelineDefinition def = new TimelineDefinition(TimelineType.LIST); @@ -55,7 +55,7 @@ public class TimelineDefinition { public static TimelineDefinition ofCustomLocalTimeline(String domain) { TimelineDefinition def = new TimelineDefinition(TimelineType.CUSTOM_LOCAL_TIMELINE); - def.domain = domain; + def.customLocalTimelineDomain = domain; return def; } @@ -92,7 +92,7 @@ public class TimelineDefinition { case POST_NOTIFICATIONS -> ctx.getString(R.string.sk_timeline_posts); case LIST -> listTitle; case HASHTAG -> hashtagName; - case CUSTOM_LOCAL_TIMELINE -> domain; + case CUSTOM_LOCAL_TIMELINE -> customLocalTimelineDomain; }; }