Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-17 04:00:48 +01:00
Code Issues Releases Wiki Activity

made blocking list work for fanfou

Browse Source
This commit is contained in:
Mariotaku Lee 2016-03-11 23:13:08 +08:00
parent a5af94027c
commit 4525535876
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/api/BlocksResources.java
View File

@ -2,8 +2,9 @@ package org.mariotaku.twidere.api.fanfou.api;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.User;
/**
@ -16,4 +17,7 @@ public interface BlocksResources {
@POST("/blocks/destroy.json")
User destroyFanfouBlock(@Param("id") String userId) throws TwitterException;
@POST("/blocks/blocking.json")
ResponseList<User> getFanfouBlocking(@Param Paging paging) throws TwitterException;
}

6
twidere/src/main/java/org/mariotaku/twidere/loader/support/CursorSupportUsersLoader.java
View File

@ -92,7 +92,7 @@ public abstract class CursorSupportUsersLoader extends TwitterAPIUsersLoader
mPrevCursor = cursor.getPreviousCursor();
}
protected final void incrementPage(ResponseList<User> users) {
protected final void incrementPage(List<User> users) {
if (users.isEmpty()) return;
if (mPage == -1) {
mPage = 1;
@ -106,7 +106,7 @@ public abstract class CursorSupportUsersLoader extends TwitterAPIUsersLoader
@NonNull
protected ResponseList<User> getCursoredUsers(@NonNull final Twitter twitter,
protected List<User> getCursoredUsers(@NonNull final Twitter twitter,
@NonNull final ParcelableCredentials credentials,
@NonNull final Paging paging)
throws TwitterException {
@ -129,7 +129,7 @@ public abstract class CursorSupportUsersLoader extends TwitterAPIUsersLoader
} else if (getPage() > 1) {
paging.setPage(getPage());
}
final ResponseList<User> users;
final List<User> users;
if (useIDs(credentials)) {
final IDs ids = getIDs(twitter, credentials, paging);
setCursors(ids);

14
twidere/src/main/java/org/mariotaku/twidere/loader/support/UserBlocksLoader.java
View File

@ -24,12 +24,13 @@ import android.support.annotation.NonNull;
import org.mariotaku.twidere.api.twitter.Twitter;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.ParcelableCredentials;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.model.util.ParcelableAccountUtils;
import java.util.List;
@ -42,8 +43,15 @@ public class UserBlocksLoader extends CursorSupportUsersLoader {
@NonNull
@Override
protected final PageableResponseList<User> getCursoredUsers(@NonNull final Twitter twitter, @NonNull ParcelableCredentials credentials, @NonNull final Paging paging)
protected final List<User> getCursoredUsers(@NonNull final Twitter twitter,
@NonNull ParcelableCredentials credentials,
@NonNull final Paging paging)
throws TwitterException {
switch (ParcelableAccountUtils.getAccountType(credentials)) {
case ParcelableAccount.Type.FANFOU: {
return twitter.getFanfouBlocking(paging);
}
}
return twitter.getBlocksList(paging);
}