normalize instance uri

This commit is contained in:
sk
2023-06-01 19:13:03 +02:00
parent 2c4504bad3
commit 0702703d78
3 changed files with 9 additions and 7 deletions

View File

@@ -50,7 +50,6 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
private ElevationOnScrollListener onScrollListener;
private static final int RULES_REQUEST=376;
private String domain;
@Override
public void onCreate(Bundle savedInstanceState){
@@ -63,10 +62,6 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
super.onAttach(activity);
setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
instance=Parcels.unwrap(getArguments().getParcelable("instance"));
// akkoma says uri is "https://example.social" while just "example.social" on mastodon
domain = instance.uri
.replaceFirst("^https://", "")
.replaceFirst("/$", "");
setTitle(R.string.instance_rules_title);
}
@@ -142,7 +137,7 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
public void onProvideAssistContent(AssistContent assistContent) {
assistContent.setWebUri(new Uri.Builder()
.scheme("https")
.authority(domain)
.authority(instance.normalizedUri)
.path("/about")
.build());
}