fix akkoma crash on list edit

closes sk22#352

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java

@@ -423,7 +423,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		} else if ((list = listItems.get(id)) != null) {
 			args.putString("listID", list.id);
 			args.putString("listTitle", list.title);
-			args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
+			if (list.repliesPolicy != null) args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
 			Nav.go(getActivity(), ListTimelineFragment.class, args);
 		} else if ((hashtag = hashtagsItems.get(id)) != null) {
 			args.putString("hashtag", hashtag.name);

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java

@@ -2,16 +2,15 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.view.HapticFeedbackConstants;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
-import android.widget.Toast;
 
-import org.joinmastodon.android.GlobalUserPreferences;
+import androidx.annotation.Nullable;
+
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetList;
 import org.joinmastodon.android.api.requests.lists.UpdateList;
@@ -23,7 +22,6 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import me.grishka.appkit.Nav;
@@ -36,6 +34,7 @@ import me.grishka.appkit.utils.V;
 public class ListTimelineFragment extends PinnableStatusListFragment {
     private String listID;
     private String listTitle;
+    @Nullable
     private ListTimeline.RepliesPolicy repliesPolicy;
     private ImageButton fab;
 
@@ -59,7 +58,9 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
             public void onSuccess(ListTimeline listTimeline) {
                 // TODO: save updated info
                 if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
-                if (!listTimeline.repliesPolicy.equals(repliesPolicy)) repliesPolicy = listTimeline.repliesPolicy;
+                if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
+                    repliesPolicy = listTimeline.repliesPolicy;
+                }
             }
 
             @Override
@@ -86,7 +87,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     .setTitle(R.string.sk_edit_list_title)
                     .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
-                    .setPositiveButton(R.string.save, (d, which) -> {
+                    .setPositiveButton(R.string.save, (d, which) ->
                             new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
                                 @Override
                                 public void onSuccess(ListTimeline list) {
@@ -96,7 +97,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                                     Bundle result = new Bundle();
                                     result.putString("listID", listID);
                                     result.putString("listTitle", listTitle);
-                                result.putInt("repliesPolicy", repliesPolicy.ordinal());
+                                    if (repliesPolicy != null) result.putInt("repliesPolicy", repliesPolicy.ordinal());
                                     setResult(true, result);
                                 }
 
@@ -104,8 +105,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                                 public void onError(ErrorResponse error) {
                                     error.showToast(getContext());
                                 }
-                        }).exec(accountID);
+                            }).exec(accountID))
-                    })
                     .setNegativeButton(R.string.cancel, (d, which) -> {})
                     .show();
         } else if (item.getItemId() == R.id.delete) {

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java

@@ -21,7 +21,6 @@ import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
 import java.util.ArrayList;
@@ -42,10 +41,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
 	 private String accountId;
 	 private String profileAccountId;
-    private String profileDisplayUsername;
+	 private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
-    private HashMap<String, Boolean> userInListBefore = new HashMap<>();
+	 private final HashMap<String, Boolean> userInList = new HashMap<>();
-    private HashMap<String, Boolean> userInList = new HashMap<>();
-    private int inProgress = 0;
 	 private ListsAdapter adapter;
 
 	 public ListTimelinesFragment() {
@@ -61,7 +58,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
 		  if(args.containsKey("profileAccount")){
 				profileAccountId=args.getString("profileAccount");
-            profileDisplayUsername=args.getString("profileDisplayUsername");
+				String profileDisplayUsername = args.getString("profileDisplayUsername");
 				setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
 		  } else {
 				setTitle(R.string.sk_your_lists);
@@ -94,7 +91,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 						  .setTitle(R.string.sk_create_list_title)
 						  .setIcon(R.drawable.ic_fluent_people_add_28_regular)
 						  .setView(editor)
-                    .setPositiveButton(R.string.sk_create, (d, which) -> {
+						  .setPositiveButton(R.string.sk_create, (d, which) ->
 									 new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
 										  @Override
 										  public void onSuccess(ListTimeline list) {
@@ -107,8 +104,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 										  public void onError(ErrorResponse error) {
 												error.showToast(getContext());
 										  }
-                        }).exec(accountId);
+									 }).exec(accountId)
-                    })
+						  )
 						  .setNegativeButton(R.string.cancel, (d, which) -> {})
 						  .show();
 		  }
@@ -169,7 +166,9 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 								adapter.notifyItemRemoved(i);
 						  } else {
 								item.title = result.getString("listTitle", item.title);
+								if (result.containsKey("repliesPolicy")) {
 									 item.repliesPolicy = ListTimeline.RepliesPolicy.values()[result.getInt("repliesPolicy")];
+								}
 								adapter.notifyItemChanged(i);
 						  }
 						  break;
@@ -240,7 +239,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 				args.putString("account", accountId);
 				args.putString("listID", item.id);
 				args.putString("listTitle", item.title);
-            args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
+				if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
 				Nav.goForResult(getActivity(), ListTimelineFragment.class, args, LIST_CHANGED_RESULT, ListTimelinesFragment.this);
 		  }
 	 }

mastodon/src/main/java/org/joinmastodon/android/model/ListTimeline.java

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.model;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.RequiredField;
@@ -11,9 +13,9 @@ public class ListTimeline extends BaseModel {
     public String id;
     @RequiredField
     public String title;
-    @RequiredField
     public RepliesPolicy repliesPolicy;
 
+    @NonNull
     @Override
     public String toString() {
         return "List{" +

mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java

@@ -10,6 +10,9 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ListTimeline;
 
@@ -37,9 +40,9 @@ public class ListTimelineEditor extends LinearLayout {
         setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
     }
 
-    public void applyList(String title, ListTimeline.RepliesPolicy policy) {
+    public void applyList(String title, @Nullable ListTimeline.RepliesPolicy policy) {
         input.getEditText().setText(title);
-        setRepliesPolicy(policy);
+        if (policy != null) setRepliesPolicy(policy);
     }
 
     public String getTitle() {
@@ -50,7 +53,7 @@ public class ListTimelineEditor extends LinearLayout {
         return policy;
     }
 
-    public void setRepliesPolicy(ListTimeline.RepliesPolicy policy) {
+    public void setRepliesPolicy(@NonNull ListTimeline.RepliesPolicy policy) {
         this.policy = policy;
         switch (policy) {
             case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed);