From 391a44c0e5e7457abc6e5e8d5f4e216afbf2c9a5 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <LucasGGamerM@protonmail.com>
Date: Wed, 4 Oct 2023 07:37:00 -0300
Subject: [PATCH] fix(instance-info): use normalized Uri instead of parsing the
 uri

---
 .../fragments/settings/SettingsServerFragment.java     | 10 +++-------
 mastodon/src/main/res/menu/instance_info.xml           |  2 --
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerFragment.java
index 33b3748ab..ad2c96c59 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsServerFragment.java
@@ -153,18 +153,14 @@ public class SettingsServerFragment extends AppKitFragment{
 		if(id==R.id.share){
 			Intent intent = new Intent(Intent.ACTION_SEND);
 			intent.setType("text/plain");
-			intent.putExtra(Intent.EXTRA_TEXT, Uri.parse(instance.uri).getHost());
+			intent.putExtra(Intent.EXTRA_TEXT, instance.normalizedUri);
 			startActivity(Intent.createChooser(intent, item.getTitle()));
 		} else if (id==R.id.open_timeline) {
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("domain", Uri.parse(instance.uri).getHost());
+			args.putString("domain", instance.normalizedUri);
 			Nav.go(getActivity(), CustomLocalTimelineFragment.class, args);
-		} /* else if (id==R.id.moderated_servers) {
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
-			Nav.go(getActivity(), InstanceBlockListFragment.class, args);
-		} */
+		}
 		return true;
 	}
 
diff --git a/mastodon/src/main/res/menu/instance_info.xml b/mastodon/src/main/res/menu/instance_info.xml
index ca25b7dea..eea36f26b 100644
--- a/mastodon/src/main/res/menu/instance_info.xml
+++ b/mastodon/src/main/res/menu/instance_info.xml
@@ -2,6 +2,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
 	<item android:id="@+id/open_timeline" android:title="@string/mo_instance_info_open_timeline" android:icon="@drawable/ic_fluent_timeline_24_regular"/>
-	<item android:id="@+id/rules" android:title="@string/instance_rules_title" android:icon="@drawable/ic_fluent_task_list_ltr_24_regular"/>
-	<item android:id="@+id/moderated_servers" android:title="@string/mo_instance_info_moderated_servers" android:icon="@drawable/ic_fluent_book_exclamation_mark_24_regular"/>
 </menu>
\ No newline at end of file