Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Changing hardcoded fosstodon to domain" 

This reverts commit 269794bfc3.
This commit is contained in:
LucasGGamerM 2023-02-20 11:20:01 -03:00
parent 269794bfc3
commit 9ae0f49bff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
View File

@ -48,7 +48,7 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
public void onAttach(Activity activity){ public void onAttach(Activity activity){
super.onAttach(activity); super.onAttach(activity);
domain=getArguments().getString("domain"); domain=getArguments().getString("domain");
updateTitle(domain); updateTitle(getArguments().getString("domain"));
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@ -82,7 +82,7 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
onDataLoaded(result, !result.isEmpty()); onDataLoaded(result, !result.isEmpty());
} }
}) })
.execNoAuth(domain); .execNoAuth("fosstodon.org");
} }
@Override @Override

6
mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
View File

@ -30,7 +30,7 @@ public class TimelineDefinition {
private @Nullable String listTitle; private @Nullable String listTitle;
private @Nullable String hashtagName; private @Nullable String hashtagName;
private @Nullable String domain; private @Nullable String customLocalTimelineDomain;
public static TimelineDefinition ofList(String listId, String listTitle) { public static TimelineDefinition ofList(String listId, String listTitle) {
TimelineDefinition def = new TimelineDefinition(TimelineType.LIST); TimelineDefinition def = new TimelineDefinition(TimelineType.LIST);
@ -55,7 +55,7 @@ public class TimelineDefinition {
public static TimelineDefinition ofCustomLocalTimeline(String domain) { public static TimelineDefinition ofCustomLocalTimeline(String domain) {
TimelineDefinition def = new TimelineDefinition(TimelineType.CUSTOM_LOCAL_TIMELINE); TimelineDefinition def = new TimelineDefinition(TimelineType.CUSTOM_LOCAL_TIMELINE);
def.domain = domain; def.customLocalTimelineDomain = domain;
return def; return def;
} }
@ -92,7 +92,7 @@ public class TimelineDefinition {
case POST_NOTIFICATIONS -> ctx.getString(R.string.sk_timeline_posts); case POST_NOTIFICATIONS -> ctx.getString(R.string.sk_timeline_posts);
case LIST -> listTitle; case LIST -> listTitle;
case HASHTAG -> hashtagName; case HASHTAG -> hashtagName;
case CUSTOM_LOCAL_TIMELINE -> domain; case CUSTOM_LOCAL_TIMELINE -> customLocalTimelineDomain;
}; };
} }