fix: crash when opening other people's profiles

LucasGGamerM · Mar 4, 2024 · 75e8d73 · 75e8d73
1 parent ec02aed
commit 75e8d73
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -23,12 +23,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.ImageSpan;
-import android.text.TextWatcher;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
 import android.transition.TransitionManager;
@@ -45,8 +42,6 @@
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
@@ -74,11 +69,9 @@
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.BlockedAccountsListFragment;
-import org.joinmastodon.android.fragments.account_list.BlocksListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
 import org.joinmastodon.android.fragments.account_list.MutedAccountsListFragment;
-import org.joinmastodon.android.fragments.account_list.MutesListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.fragments.settings.SettingsServerFragment;
 import org.joinmastodon.android.model.Account;
@@ -976,7 +969,7 @@ public void onError(ErrorResponse error){
 						.show();
 			}
 			invalidateOptionsMenu();
-		}else if(id==R.id.add_to_list){
+		}else if(id==R.id.manage_user_lists){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putParcelable("targetAccount", Parcels.wrap(account));

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
@@ -27,7 +27,6 @@
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.ListsFragment;
 import org.joinmastodon.android.fragments.AddAccountToListsFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
@@ -333,7 +332,7 @@ public void onError(ErrorResponse error){
 					})
 					.wrapProgress(fragment.getActivity(), R.string.loading, false)
 					.exec(accountID);
-		}else if(id==R.id.add_to_list){
+		}else if(id==R.id.manage_user_lists){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putParcelable("targetAccount", Parcels.wrap(account));
@@ -426,7 +425,7 @@ private boolean prepareMenu(){
 		}else{
 			blockDomain.setVisible(false);
 		}
-		menu.findItem(R.id.add_to_list).setVisible(relationship.following);
+		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
 		return true;
 	}
 

diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
@@ -4,7 +4,7 @@
 		<item android:id="@+id/edit_note" android:title="@string/sk_add_note" android:icon="@drawable/ic_fluent_notepad_24_regular" android:showAsAction="ifRoom" />
 	</group>
 	<group android:id="@+id/menu_group2">
-		<item android:id="@+id/add_to_list" android:title="@string/add_user_to_list"/>
+		<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/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
 		<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
 		<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>