owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "And it still doesnt work"

Browse Source 
This reverts commit 002687d2b1.
This commit is contained in:
LucasGGamerM
2022-12-12 20:40:10 -03:00
parent 002687d2b1
commit 0115656d67
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
View File

@@ -1,11 +1,9 @@
package org.joinmastodon.android.api.requests.lists; package org.joinmastodon.android.api.requests.lists;
import android.app.ListFragment;
import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.MastodonAPIRequest;
public class DeleteList extends MastodonAPIRequest<ListFragment> { public class DeleteList extends MastodonAPIRequest<Object> {
public DeleteList(String id){ public DeleteList(String listId){
super(HttpMethod.DELETE, "/lists/"+id, ListFragment.class); super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
} }
} }

30
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
View File

@@ -1,6 +1,5 @@
package org.joinmastodon.android.fragments; package org.joinmastodon.android.fragments;
import android.app.ListFragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@@ -16,17 +15,13 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import org.joinmastodon.android.E;
import org.joinmastodon.android.R; import org.joinmastodon.android.R;
import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.MastodonAPIRequest;
import org.joinmastodon.android.api.requests.lists.AddAccountsToList; import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
import org.joinmastodon.android.api.requests.lists.DeleteList; import org.joinmastodon.android.api.requests.lists.DeleteList;
import org.joinmastodon.android.api.requests.lists.GetLists; import org.joinmastodon.android.api.requests.lists.GetLists;
import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList; import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.ListTimeline; import org.joinmastodon.android.model.ListTimeline;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.M3AlertDialogBuilder;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
@@ -211,25 +206,24 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
private void deleteList(String listId){ private void deleteList(String listId){
new M3AlertDialogBuilder(getActivity()) new M3AlertDialogBuilder(getActivity())
.setTitle(R.string.sk_delete_list_dialog_title) .setTitle(R.string.sk_delete_list_dialog_title)
.setPositiveButton(R.string.delete, (dialog, which)-> actuallyDeleteList(listId)) .setPositiveButton(R.string.delete, (dialog, which)-> new DeleteList(listId))
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(); .show();
} }
private void actuallyDeleteList(String listId){ private void actuallyDeleteList(String listId){
new DeleteList(listId) new DeleteList(listId).setCallback(new Callback<Object>() {
.setCallback(new Callback<>(){
@Override
public void onSuccess(ListFragment result){
System.out.println("All okay");
}
@Override @Override
public void onError(ErrorResponse error){ public void onSuccess(Object result) {
error.showToast(getActivity()); loadData();
} }
})
.wrapProgress(getActivity(), R.string.deleting, false); @Override
public void onError(ErrorResponse error) {
error.showToast(getActivity());
}
});
} }
} }
} }