Commit Diff


commit - 7b56338e1df5c9bd8057bf13183df3d2579e3b5c
commit + 0fc8f55245c848c70afc4bd8a59154b57819993c
blob - c9a57f35a1561f5fb6abc77efce4bc664ddbe668
blob + 571db7890aed9a83a1920163bb8dc681c2bf6f49
--- mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -817,7 +817,11 @@ public class ProfileFragment extends LoaderFragment im
 		if(isOwnProfile){
 			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.scheduled, R.id.bookmarks);
 		}else{
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.edit_note, R.id.biteuser_btn);
+			if(isInstanceIceshrimp()) {
+				UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.edit_note, R.id.biteuser_btn);
+			}else{
+				UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.edit_note);
+			}
 		}
 		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 		menu.findItem(R.id.open_with_account).setVisible(hasMultipleAccounts);
@@ -838,6 +842,7 @@ public class ProfileFragment extends LoaderFragment im
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
 		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+		menu.findItem(R.id.biteuser_btn).setVisible(isInstanceIceshrimp());
 		MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 		if (relationship.following) {
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
blob - 0f3bd2935b956619e0f89c9d67d5051e0c417465
blob + 5c24a736cb9518dbf5bff82b0eaea5699738f170
--- mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -528,7 +528,7 @@ public class HeaderStatusDisplayItem extends StatusDis
 			menu.findItem(R.id.unmute_conversation).setVisible(item.status!=null && item.status.muted);
 			menu.findItem(R.id.open_in_browser).setVisible(!isPostScheduled && item.status!=null);
 			menu.findItem(R.id.copy_link).setVisible(!isPostScheduled && item.status!=null);
-			menu.findItem(R.id.bitepost_btn).setVisible(!isOwnPost && !isPostScheduled && item.status!=null);
+			menu.findItem(R.id.bitepost_btn).setVisible(!isOwnPost && !isPostScheduled && item.parentFragment.isInstanceIceshrimp() && item.status!=null);
 			MenuItem blockDomain=menu.findItem(R.id.block_domain);
 			MenuItem mute=menu.findItem(R.id.mute);
 			MenuItem block=menu.findItem(R.id.block);
blob - 9474ff02a1117dc45a4a200d4eefed91fd5d7556
blob + 7062c3df82726666d7c1a3a234f6728977c36fc0
--- mastodon/src/main/res/menu/post.xml
+++ mastodon/src/main/res/menu/post.xml
@@ -8,7 +8,7 @@
 		<item android:id="@+id/unpin" android:title="@string/sk_unpin_post" android:icon="@drawable/ic_fluent_pin_off_24_regular"/>
 	</group>
 	<group android:id="@+id/menu_group2">
-		<item android:id="@+id/bitepost_btn" android:title="@string/sk_bite_post" android:icon="@drawable/ic_fluent_animal_cat_24_regular"/>
+		<item android:id="@+id/bitepost_btn" android:title="@string/sk_bite_post" android:icon="@drawable/ic_fluent_animal_cat_24_regular" android:visible="false"/>
 		<item android:id="@+id/manage_user_lists" android:title="@string/add_user_to_list" android:icon="@drawable/ic_fluent_people_24_regular"/>
 		<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>
 		<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
blob - 0217336924483512bd76e7ae299dae36f81a64d0
blob + c8a74171fbd0fca04285d8f2fdf6ddab904951a0
--- mastodon/src/main/res/menu/profile.xml
+++ mastodon/src/main/res/menu/profile.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<group android:id="@+id/menu_group1">
 		<item android:id="@+id/edit_note" android:title="@string/sk_add_note" android:icon="@drawable/ic_fluent_notepad_24_regular" android:showAsAction="ifRoom" />
-		<item android:id="@+id/biteuser_btn" android:title="@string/sk_bite_user" android:icon="@drawable/ic_fluent_animal_cat_24_regular" android:showAsAction="ifRoom" />
+		<item android:id="@+id/biteuser_btn" android:title="@string/sk_bite_user" android:icon="@drawable/ic_fluent_animal_cat_24_regular" android:showAsAction="ifRoom" android:visible="false" />
 	</group>
 	<group android:id="@+id/menu_group2">
 		<item android:id="@+id/manage_user_lists" android:title="@string/add_user_to_list" android:icon="@drawable/ic_fluent_people_24_regular"/>