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

refactoring

Browse Source
This commit is contained in:
Mariotaku Lee 2016-05-13 13:08:02 +08:00
parent 455bd2af3f
commit 5fc3f8561c
262 changed files with 1390 additions and 1387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere.component.common/src/main/java/org/mariotaku/twidere/api/MicroBlog.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlog.java
View File

@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api;
package org.mariotaku.microblog.library;
import org.mariotaku.twidere.api.fanfou.Fanfou;
import org.mariotaku.twidere.api.statusnet.StatusNet;
import org.mariotaku.twidere.api.twitter.Twitter;
import org.mariotaku.microblog.library.fanfou.Fanfou;
import org.mariotaku.microblog.library.statusnet.StatusNet;
import org.mariotaku.microblog.library.twitter.Twitter;
public interface MicroBlog extends Twitter, StatusNet, Fanfou {
}

30
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterException.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java
View File

@ -17,18 +17,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter;
package org.mariotaku.microblog.library;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.restfu.http.HttpRequest;
import org.mariotaku.restfu.http.HttpResponse;
import org.mariotaku.twidere.api.twitter.http.HttpResponseCode;
import org.mariotaku.twidere.api.twitter.model.ErrorInfo;
import org.mariotaku.twidere.api.twitter.model.RateLimitStatus;
import org.mariotaku.twidere.api.twitter.model.TwitterResponse;
import org.mariotaku.twidere.api.twitter.util.InternalParseUtil;
import org.mariotaku.microblog.library.twitter.http.HttpResponseCode;
import org.mariotaku.microblog.library.twitter.model.ErrorInfo;
import org.mariotaku.microblog.library.twitter.model.RateLimitStatus;
import org.mariotaku.microblog.library.twitter.model.TwitterResponse;
import org.mariotaku.microblog.library.twitter.util.InternalParseUtil;
import java.io.IOException;
import java.util.Locale;
@ -41,7 +41,7 @@ import java.util.Locale;
* @author Yusuke Yamamoto - yusuke at mac.com
*/
@JsonObject
public class TwitterException extends Exception implements TwitterResponse, HttpResponseCode {
public class MicroBlogException extends Exception implements TwitterResponse, HttpResponseCode {
private static final long serialVersionUID = -2623309261327598087L;
@JsonField(name = "errors")
@ -57,25 +57,25 @@ public class TwitterException extends Exception implements TwitterResponse, Http
private HttpResponse httpResponse;
private boolean causedByNetworkIssue;
public TwitterException() {
public MicroBlogException() {
super();
}
public TwitterException(String detailMessage) {
public MicroBlogException(String detailMessage) {
super(detailMessage);
}
public TwitterException(final Throwable cause) {
public MicroBlogException(final Throwable cause) {
this(cause.getMessage(), cause);
if (cause instanceof TwitterException) {
((TwitterException) cause).setNested();
if (cause instanceof MicroBlogException) {
((MicroBlogException) cause).setNested();
}
}
public TwitterException(String detailMessage, Throwable cause) {
public MicroBlogException(String detailMessage, Throwable cause) {
super(detailMessage, cause);
if (cause instanceof TwitterException) {
((TwitterException) cause).setNested();
if (cause instanceof MicroBlogException) {
((MicroBlogException) cause).setNested();
}
setCausedByNetworkIssue(cause instanceof IOException);
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/annotation/NoObfuscate.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/NoObfuscate.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.annotation;
package org.mariotaku.microblog.library.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

17
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/Fanfou.java Normal file
View File

@ -0,0 +1,17 @@
package org.mariotaku.microblog.library.fanfou;
import org.mariotaku.microblog.library.fanfou.api.BlocksResources;
import org.mariotaku.microblog.library.fanfou.api.FavoritesResources;
import org.mariotaku.microblog.library.fanfou.api.FriendshipsResources;
import org.mariotaku.microblog.library.fanfou.api.PhotosResources;
import org.mariotaku.microblog.library.fanfou.api.SearchResources;
import org.mariotaku.microblog.library.fanfou.api.StatusesResources;
import org.mariotaku.microblog.library.fanfou.api.UsersResources;
import org.mariotaku.microblog.library.fanfou.api.DirectMessagesResources;
/**
* Created by mariotaku on 16/3/10.
*/
public interface Fanfou extends StatusesResources, SearchResources, UsersResources, PhotosResources,
FriendshipsResources, BlocksResources, FavoritesResources, DirectMessagesResources {
}

23
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/BlocksResources.java Normal file
View File

@ -0,0 +1,23 @@
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/11.
*/
public interface BlocksResources {
@POST("/blocks/create.json")
User createFanfouBlock(@Param("id") String userId) throws MicroBlogException;
@POST("/blocks/destroy.json")
User destroyFanfouBlock(@Param("id") String userId) throws MicroBlogException;
@POST("/blocks/blocking.json")
ResponseList<User> getFanfouBlocking(@Param Paging paging) throws MicroBlogException;
}

10
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/api/DirectMessagesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/DirectMessagesResources.java
View File

@ -1,9 +1,9 @@
package org.mariotaku.twidere.api.fanfou.api;
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.DirectMessage;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.DirectMessage;
/**
* Created by mariotaku on 16/3/31.
@ -13,10 +13,10 @@ public interface DirectMessagesResources {
@POST("/direct_messages/new.json")
DirectMessage sendFanfouDirectMessage(@Param("user") String user, @Param("text") String text,
@Param("in_reply_to_id") String inReplyToId)
throws TwitterException;
throws MicroBlogException;
@POST("/direct_messages/new.json")
DirectMessage sendFanfouDirectMessage(@Param("user") String user, @Param("text") String text)
throws TwitterException;
throws MicroBlogException;
}

18
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FavoritesResources.java Normal file
View File

@ -0,0 +1,18 @@
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Status;
/**
* Created by mariotaku on 16/3/11.
*/
public interface FavoritesResources {
@POST("/favorites/create/{id}.json")
Status createFanfouFavorite(@Path("id") String id) throws MicroBlogException;
@POST("/favorites/destroy/{id}.json")
Status destroyFanfouFavorite(@Path("id") String id) throws MicroBlogException;
}

20
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/api/FriendshipsResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FriendshipsResources.java
View File

@ -1,13 +1,13 @@
package org.mariotaku.twidere.api.fanfou.api;
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Query;
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;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/11.
@ -15,18 +15,18 @@ import org.mariotaku.twidere.api.twitter.model.User;
public interface FriendshipsResources {
@POST("/friendships/create.json")
User createFanfouFriendship(@Param("id") String id) throws TwitterException;
User createFanfouFriendship(@Param("id") String id) throws MicroBlogException;
@POST("/friendships/destroy.json")
User destroyFanfouFriendship(@Param("id") String id) throws TwitterException;
User destroyFanfouFriendship(@Param("id") String id) throws MicroBlogException;
@POST("/friendships/accept.json")
User acceptFanfouFriendship(@Param("id") String id) throws TwitterException;
User acceptFanfouFriendship(@Param("id") String id) throws MicroBlogException;
@POST("/friendships/deny.json")
User denyFanfouFriendship(@Param("id") String id) throws TwitterException;
User denyFanfouFriendship(@Param("id") String id) throws MicroBlogException;
@GET("/friendships/requests.json")
ResponseList<User> getFriendshipsRequests(@Query Paging paging) throws TwitterException;
ResponseList<User> getFriendshipsRequests(@Query Paging paging) throws MicroBlogException;
}

26
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/PhotosResources.java Normal file
View File

@ -0,0 +1,26 @@
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.microblog.library.fanfou.model.PhotoStatusUpdate;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
/**
* Created by mariotaku on 16/3/10.
*/
public interface PhotosResources {
@GET("/photos/user_timeline.json")
ResponseList<Status> getPhotosUserTimeline(@Query("id") String id, @Query Paging paging) throws MicroBlogException;
@POST("/photos/upload.json")
@BodyType(BodyType.MULTIPART)
Status uploadPhoto(@Param PhotoStatusUpdate update) throws MicroBlogException;
}

22
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/SearchResources.java Normal file
View File

@ -0,0 +1,22 @@
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/10.
*/
public interface SearchResources {
@GET("/search/public_timeline.json")
ResponseList<Status> searchPublicTimeline(@Query("q") String query, @Query Paging paging) throws MicroBlogException;
@GET("/search/users.json")
ResponseList<User> searchFanfouUsers(@Query("q") String query, @Query Paging paging) throws MicroBlogException;
}

14
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/api/StatusesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/StatusesResources.java
View File

@ -1,11 +1,11 @@
package org.mariotaku.twidere.api.fanfou.api;
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
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.Status;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
/**
* Created by mariotaku on 16/3/10.
@ -13,9 +13,9 @@ import org.mariotaku.twidere.api.twitter.model.Status;
public interface StatusesResources {
@GET("/statuses/mentions.json")
ResponseList<Status> getMentions(@Query Paging paging) throws TwitterException;
ResponseList<Status> getMentions(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/context_timeline.json")
ResponseList<Status> getContextTimeline(@Query("id") String id, @Query Paging paging) throws TwitterException;
ResponseList<Status> getContextTimeline(@Query("id") String id, @Query Paging paging) throws MicroBlogException;
}

24
twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/UsersResources.java Normal file
View File

@ -0,0 +1,24 @@
package org.mariotaku.microblog.library.fanfou.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/10.
*/
public interface UsersResources {
@GET("/users/show.json")
User showFanfouUser(@Query("id") String userId) throws MicroBlogException;
@GET("/users/followers.json")
PageableResponseList<User> getUsersFollowers(@Query("id") String id, @Query Paging paging) throws MicroBlogException;
@GET("/users/friends.json")
PageableResponseList<User> getUsersFriends(@Query("id") String id, @Query Paging paging) throws MicroBlogException;
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/model/Photo.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Photo.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.fanfou.model;
package org.mariotaku.microblog.library.fanfou.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/model/PhotoStatusUpdate.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/PhotoStatusUpdate.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.fanfou.model;
package org.mariotaku.microblog.library.fanfou.model;
import org.mariotaku.restfu.http.SimpleValueMap;
import org.mariotaku.restfu.http.mime.Body;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/gnusocial/model/Attachment.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/gnusocial/model/Attachment.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.gnusocial.model;
package org.mariotaku.microblog.library.gnusocial.model;
import android.os.Parcel;
import android.os.Parcelable;

20
twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/StatusNet.java Normal file
View File

@ -0,0 +1,20 @@
package org.mariotaku.microblog.library.statusnet;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.microblog.library.statusnet.api.GroupResources;
import org.mariotaku.microblog.library.statusnet.api.SearchResources;
import org.mariotaku.microblog.library.statusnet.api.StatusNetResources;
import org.mariotaku.microblog.library.statusnet.api.UserResources;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/4.
*/
public interface StatusNet extends StatusNetResources, GroupResources, SearchResources, UserResources {
@GET("/externalprofile/show.json")
User showExternalProfile(@Query("profileurl") String profileUrl) throws MicroBlogException;
}

32
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/api/GroupResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/GroupResources.java
View File

@ -1,14 +1,14 @@
package org.mariotaku.twidere.api.statusnet.api;
package org.mariotaku.microblog.library.statusnet.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.twidere.api.statusnet.model.Group;
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.Status;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.microblog.library.statusnet.model.Group;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/4.
@ -16,30 +16,30 @@ import org.mariotaku.twidere.api.twitter.model.User;
public interface GroupResources {
@GET("/statusnet/groups/timeline/{group_id}.json")
ResponseList<Status> getGroupStatuses(@Path("group_id") String groupId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getGroupStatuses(@Path("group_id") String groupId, @Query Paging paging) throws MicroBlogException;
@GET("/statusnet/groups/timeline/{group_name}.json")
ResponseList<Status> getGroupStatusesByName(@Path("group_name") String name, @Query Paging paging) throws TwitterException;
ResponseList<Status> getGroupStatusesByName(@Path("group_name") String name, @Query Paging paging) throws MicroBlogException;
@GET("/statusnet/groups/show.json")
Group showGroup(@Query("group_id") String groupId) throws TwitterException;
Group showGroup(@Query("group_id") String groupId) throws MicroBlogException;
@GET("/statusnet/groups/show.json")
Group showGroupByName(@Query("group_name") String groupName) throws TwitterException;
Group showGroupByName(@Query("group_name") String groupName) throws MicroBlogException;
@GET("/statusnet/groups/membership.json")
ResponseList<User> getGroupMembers(@Query("group_id") String groupId, @Query Paging paging) throws TwitterException;
ResponseList<User> getGroupMembers(@Query("group_id") String groupId, @Query Paging paging) throws MicroBlogException;
@GET("/statusnet/groups/membership.json")
ResponseList<User> getGroupMembersByName(@Query("group_name") String groupName, @Query Paging paging) throws TwitterException;
ResponseList<User> getGroupMembersByName(@Query("group_name") String groupName, @Query Paging paging) throws MicroBlogException;
@GET("/statusnet/groups/list.json")
ResponseList<Group> getGroupsByScreenName(@Query("screen_name") String screenName) throws TwitterException;
ResponseList<Group> getGroupsByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@GET("/statusnet/groups/list.json")
ResponseList<Group> getGroups(@Query("id") String userId) throws TwitterException;
ResponseList<Group> getGroups(@Query("id") String userId) throws MicroBlogException;
@GET("/statusnet/groups/list_all.json")
ResponseList<Group> getAllGroups(@Query Paging paging) throws TwitterException;
ResponseList<Group> getAllGroups(@Query Paging paging) throws MicroBlogException;
}

18
twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/SearchResources.java Normal file
View File

@ -0,0 +1,18 @@
package org.mariotaku.microblog.library.statusnet.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
/**
* Created by mariotaku on 16/3/4.
*/
public interface SearchResources {
@GET("/search.json")
ResponseList<Status> searchStatuses(@Query("q") String query, @Query Paging paging) throws MicroBlogException;
}

22
twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/StatusNetResources.java Normal file
View File

@ -0,0 +1,22 @@
package org.mariotaku.microblog.library.statusnet.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.microblog.library.statusnet.model.StatusNetConfig;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
/**
* Created by mariotaku on 16/2/27.
*/
public interface StatusNetResources {
@GET("/statusnet/config.json")
StatusNetConfig getStatusNetConfig() throws MicroBlogException;
@GET("/statusnet/conversation/{id}.json")
ResponseList<Status> getStatusNetConversation(@Path("id") String statusId, @Query Paging paging) throws MicroBlogException;
}

18
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/api/UserResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/UserResources.java
View File

@ -1,11 +1,11 @@
package org.mariotaku.twidere.api.statusnet.api;
package org.mariotaku.microblog.library.statusnet.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
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.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* Created by mariotaku on 16/3/4.
@ -13,15 +13,15 @@ import org.mariotaku.twidere.api.twitter.model.User;
public interface UserResources {
@GET("/statuses/friends.json")
PageableResponseList<User> getStatusesFriendsList(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getStatusesFriendsList(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/friends.json")
PageableResponseList<User> getStatusesFriendsListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getStatusesFriendsListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/followers.json")
PageableResponseList<User> getStatusesFollowersList(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getStatusesFollowersList(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/followers.json")
PageableResponseList<User> getStatusesFollowersListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getStatusesFollowersListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/Attention.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Attention.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.statusnet.model;
package org.mariotaku.microblog.library.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/Group.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Group.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.statusnet.model;
package org.mariotaku.microblog.library.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -7,7 +7,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter;
import java.util.Date;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/StatusNetConfig.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/StatusNetConfig.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.statusnet.model;
package org.mariotaku.microblog.library.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;

24
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/Twitter.java Normal file
View File

@ -0,0 +1,24 @@
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.microblog.library.twitter.api.DirectMessagesResources;
import org.mariotaku.microblog.library.twitter.api.FavoritesResources;
import org.mariotaku.microblog.library.twitter.api.FriendsFollowersResources;
import org.mariotaku.microblog.library.twitter.api.HelpResources;
import org.mariotaku.microblog.library.twitter.api.ListResources;
import org.mariotaku.microblog.library.twitter.api.PlacesGeoResources;
import org.mariotaku.microblog.library.twitter.api.SavedSearchesResources;
import org.mariotaku.microblog.library.twitter.api.SearchResource;
import org.mariotaku.microblog.library.twitter.api.SpamReportingResources;
import org.mariotaku.microblog.library.twitter.api.TimelineResources;
import org.mariotaku.microblog.library.twitter.api.TrendsResources;
import org.mariotaku.microblog.library.twitter.api.TweetResources;
import org.mariotaku.microblog.library.twitter.api.UsersResources;
/**
* Created by mariotaku on 16/5/13.
*/
public interface Twitter extends SearchResource, TimelineResources, TweetResources, UsersResources,
ListResources, DirectMessagesResources, FriendsFollowersResources, FavoritesResources,
SpamReportingResources, SavedSearchesResources, TrendsResources, PlacesGeoResources,
HelpResources, TwitterPrivate {
}

17
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterCaps.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/TwitterCaps.java
View File

@ -17,17 +17,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter;
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.model.CardDataMap;
import org.mariotaku.twidere.api.twitter.model.CardResponse;
import org.mariotaku.twidere.api.twitter.model.CreateCardData;
import org.mariotaku.twidere.api.twitter.model.CreateCardResult;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.CardDataMap;
import org.mariotaku.microblog.library.twitter.model.CardResponse;
import org.mariotaku.microblog.library.twitter.model.CreateCardData;
import org.mariotaku.microblog.library.twitter.model.CreateCardResult;
/**
* Card API maybe??
@ -38,12 +39,12 @@ public interface TwitterCaps {
@GET("/v2/capi/passthrough/1")
CardResponse getPassThrough(@Query CardDataMap params)
throws TwitterException;
throws MicroBlogException;
@POST("/v2/capi/passthrough/1")
@BodyType(BodyType.FORM)
CardResponse sendPassThrough(@Param CardDataMap params) throws TwitterException;
CardResponse sendPassThrough(@Param CardDataMap params) throws MicroBlogException;
@POST("/v2/cards/create.json")
CreateCardResult createCard(@Param("card_data") CreateCardData cardData) throws TwitterException;
CreateCardResult createCard(@Param("card_data") CreateCardData cardData) throws MicroBlogException;
}

13
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterOAuth.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/TwitterOAuth.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter;
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.restfu.annotation.method.POST;
@ -25,7 +25,8 @@ import org.mariotaku.restfu.annotation.param.Extra;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Params;
import org.mariotaku.twidere.api.twitter.auth.OAuthToken;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.auth.OAuthToken;
/**
* Created by mariotaku on 15/2/4.
@ -33,20 +34,20 @@ import org.mariotaku.twidere.api.twitter.auth.OAuthToken;
public interface TwitterOAuth {
@POST("/oauth/request_token")
OAuthToken getRequestToken(@Param("oauth_callback") String oauthCallback) throws TwitterException;
OAuthToken getRequestToken(@Param("oauth_callback") String oauthCallback) throws MicroBlogException;
@POST("/oauth/access_token")
@Params(@KeyValue(key = "x_auth_mode", value = "client_auth"))
OAuthToken getAccessToken(@Param("x_auth_username") String xauthUsername,
@Param("x_auth_password") String xauthPassword) throws TwitterException;
@Param("x_auth_password") String xauthPassword) throws MicroBlogException;
@POST("/oauth/access_token")
OAuthToken getAccessToken(@Extra({"oauth_token", "oauth_token_secret"}) OAuthToken requestToken,
@Param("oauth_verifier") String oauthVerifier) throws TwitterException;
@Param("oauth_verifier") String oauthVerifier) throws MicroBlogException;
@POST("/oauth/access_token")
OAuthToken getAccessToken(@Extra({"oauth_token", "oauth_token_secret"}) OAuthToken requestToken)
throws TwitterException;
throws MicroBlogException;
}

9
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterOAuth2.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/TwitterOAuth2.java
View File

@ -1,11 +1,12 @@
package org.mariotaku.twidere.api.twitter;
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Header;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Params;
import org.mariotaku.twidere.api.twitter.auth.OAuth2GetTokenHeader;
import org.mariotaku.twidere.api.twitter.auth.OAuth2Token;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.auth.OAuth2GetTokenHeader;
import org.mariotaku.microblog.library.twitter.auth.OAuth2Token;
/**
* Created by mariotaku on 16/1/4.
@ -15,5 +16,5 @@ public interface TwitterOAuth2 {
@POST("/oauth2/token")
@Params(@KeyValue(key = "grant_type", value = "client_credentials"))
OAuth2Token getApplicationOnlyAccessToken(@Header("Authorization") OAuth2GetTokenHeader token)
throws TwitterException;
throws MicroBlogException;
}

16
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/TwitterPrivate.java Normal file
View File

@ -0,0 +1,16 @@
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.microblog.library.twitter.api.PrivateActivityResources;
import org.mariotaku.microblog.library.twitter.api.PrivateDirectMessagesResources;
import org.mariotaku.microblog.library.twitter.api.PrivateFriendsFollowersResources;
import org.mariotaku.microblog.library.twitter.api.PrivateScheduleResources;
import org.mariotaku.microblog.library.twitter.api.PrivateTimelineResources;
import org.mariotaku.microblog.library.twitter.api.PrivateTweetResources;
/**
* Created by mariotaku on 16/3/4.
*/
public interface TwitterPrivate extends PrivateActivityResources, PrivateTweetResources,
PrivateTimelineResources, PrivateFriendsFollowersResources, PrivateDirectMessagesResources,
PrivateScheduleResources {
}

21
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterUpload.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/TwitterUpload.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter;
package org.mariotaku.microblog.library.twitter;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.KeyValue;
@ -26,9 +26,10 @@ import org.mariotaku.restfu.annotation.param.Params;
import org.mariotaku.restfu.annotation.param.Raw;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.restfu.http.mime.Body;
import org.mariotaku.twidere.api.twitter.model.MediaUploadResponse;
import org.mariotaku.twidere.api.twitter.model.NewMediaMetadata;
import org.mariotaku.twidere.api.twitter.model.ResponseCode;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.MediaUploadResponse;
import org.mariotaku.microblog.library.twitter.model.NewMediaMetadata;
import org.mariotaku.microblog.library.twitter.model.ResponseCode;
import java.io.File;
@ -36,28 +37,28 @@ public interface TwitterUpload {
@POST("/media/upload.json")
@BodyType(BodyType.MULTIPART)
MediaUploadResponse uploadMedia(@Param("media") File file) throws TwitterException;
MediaUploadResponse uploadMedia(@Param("media") File file) throws MicroBlogException;
@POST("/media/upload.json")
@BodyType(BodyType.MULTIPART)
MediaUploadResponse uploadMedia(@Param("media") Body data) throws TwitterException;
MediaUploadResponse uploadMedia(@Param("media") Body data) throws MicroBlogException;
@POST("/media/upload.json")
@Params(@KeyValue(key = "command", value = "INIT"))
MediaUploadResponse initUploadMedia(@Param("media_type") String mediaType,
@Param("total_bytes") long totalBytes) throws TwitterException;
@Param("total_bytes") long totalBytes) throws MicroBlogException;
@POST("/media/upload.json")
@Params(@KeyValue(key = "command", value = "APPEND"))
ResponseCode initUploadMedia(@Param("media_id") long mediaId,
@Param("segment_index") int segmentIndex,
@Param("media") Body media) throws TwitterException;
@Param("media") Body media) throws MicroBlogException;
@POST("/media/upload.json")
@Params(@KeyValue(key = "command", value = "FINALIZE"))
MediaUploadResponse initUploadMedia(@Param("media_id") long mediaId) throws TwitterException;
MediaUploadResponse initUploadMedia(@Param("media_id") long mediaId) throws MicroBlogException;
@POST("/media/metadata/create.json")
ResponseCode createMetadata(@Raw NewMediaMetadata metadata) throws TwitterException;
ResponseCode createMetadata(@Raw NewMediaMetadata metadata) throws MicroBlogException;
}

26
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/DirectMessagesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/DirectMessagesResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -26,10 +26,10 @@ import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.DirectMessage;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.DirectMessage;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "full_text", valueKey = "full_text"),
@ -40,30 +40,30 @@ public interface DirectMessagesResources {
@POST("/direct_messages/destroy.json")
@BodyType(BodyType.FORM)
DirectMessage destroyDirectMessage(@Param("id") String id) throws TwitterException;
DirectMessage destroyDirectMessage(@Param("id") String id) throws MicroBlogException;
@GET("/direct_messages.json")
ResponseList<DirectMessage> getDirectMessages(@Query Paging paging) throws TwitterException;
ResponseList<DirectMessage> getDirectMessages(@Query Paging paging) throws MicroBlogException;
@GET("/direct_messages/sent.json")
ResponseList<DirectMessage> getSentDirectMessages(@Query Paging paging) throws TwitterException;
ResponseList<DirectMessage> getSentDirectMessages(@Query Paging paging) throws MicroBlogException;
@POST("/direct_messages/new.json")
DirectMessage sendDirectMessage(@Param("user_id") String userId, @Param("text") String text)
throws TwitterException;
throws MicroBlogException;
@POST("/direct_messages/new.json")
DirectMessage sendDirectMessage(@Param("user_id") String userId, @Param("text") String text,
@Param("media_id") String mediaId) throws TwitterException;
@Param("media_id") String mediaId) throws MicroBlogException;
@POST("/direct_messages/new.json")
DirectMessage sendDirectMessageToScreenName(@Param("screen_name") String screenName, @Param("text") String text)
throws TwitterException;
throws MicroBlogException;
@POST("/direct_messages/new.json")
DirectMessage sendDirectMessageToScreenName(@Param("screen_name") String screenName, @Param("text") String text,
@Param("media_id") String mediaId) throws TwitterException;
@Param("media_id") String mediaId) throws MicroBlogException;
@GET("/direct_messages/show.json")
DirectMessage showDirectMessage(@Query("id") String id) throws TwitterException;
DirectMessage showDirectMessage(@Query("id") String id) throws MicroBlogException;
}

20
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/FavoritesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FavoritesResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -25,10 +25,10 @@ import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.Status;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -43,17 +43,17 @@ import org.mariotaku.twidere.api.twitter.model.Status;
public interface FavoritesResources {
@POST("/favorites/create.json")
Status createFavorite(@Param("id") String id) throws TwitterException;
Status createFavorite(@Param("id") String id) throws MicroBlogException;
@POST("/favorites/destroy.json")
Status destroyFavorite(@Param("id") String id) throws TwitterException;
Status destroyFavorite(@Param("id") String id) throws MicroBlogException;
@GET("/favorites/list.json")
ResponseList<Status> getFavorites() throws TwitterException;
ResponseList<Status> getFavorites() throws MicroBlogException;
@GET("/favorites/list.json")
ResponseList<Status> getFavorites(@Query("user_id") String userId, @Query({"since_id", "max_id", "count"}) Paging paging) throws TwitterException;
ResponseList<Status> getFavorites(@Query("user_id") String userId, @Query({"since_id", "max_id", "count"}) Paging paging) throws MicroBlogException;
@GET("/favorites/list.json")
ResponseList<Status> getFavoritesByScreenName(@Query("screen_name") String screenName, @Query({"since_id", "max_id", "count"}) Paging paging) throws TwitterException;
ResponseList<Status> getFavoritesByScreenName(@Query("screen_name") String screenName, @Query({"since_id", "max_id", "count"}) Paging paging) throws MicroBlogException;
}

70
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/FriendsFollowersResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FriendsFollowersResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -26,15 +26,15 @@ import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.Friendship;
import org.mariotaku.twidere.api.twitter.model.FriendshipUpdate;
import org.mariotaku.twidere.api.twitter.model.IDs;
import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.Relationship;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Friendship;
import org.mariotaku.microblog.library.twitter.model.FriendshipUpdate;
import org.mariotaku.microblog.library.twitter.model.IDs;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.Relationship;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.User;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_entities", valueKey = "include_entities")})
@ -42,93 +42,93 @@ public interface FriendsFollowersResources {
@POST("/friendships/create.json")
@BodyType(BodyType.FORM)
User createFriendship(@Param("user_id") String userId) throws TwitterException;
User createFriendship(@Param("user_id") String userId) throws MicroBlogException;
@POST("/friendships/create.json")
@BodyType(BodyType.FORM)
User createFriendship(@Param("user_id") String userId, @Param("follow") boolean follow) throws TwitterException;
User createFriendship(@Param("user_id") String userId, @Param("follow") boolean follow) throws MicroBlogException;
@POST("/friendships/create.json")
@BodyType(BodyType.FORM)
User createFriendshipByScreenName(@Param("screen_name") String screenName) throws TwitterException;
User createFriendshipByScreenName(@Param("screen_name") String screenName) throws MicroBlogException;
@POST("/friendships/create.json")
@BodyType(BodyType.FORM)
User createFriendshipByScreenName(@Param("screen_name") String screenName, @Param("follow") boolean follow) throws TwitterException;
User createFriendshipByScreenName(@Param("screen_name") String screenName, @Param("follow") boolean follow) throws MicroBlogException;
@POST("/friendships/destroy.json")
@BodyType(BodyType.FORM)
User destroyFriendship(@Param("user_id") String userId) throws TwitterException;
User destroyFriendship(@Param("user_id") String userId) throws MicroBlogException;
@POST("/friendships/destroy.json")
@BodyType(BodyType.FORM)
User destroyFriendshipByScreenName(@Param("screen_name") String screenName) throws TwitterException;
User destroyFriendshipByScreenName(@Param("screen_name") String screenName) throws MicroBlogException;
@GET("/followers/ids.json")
IDs getFollowersIDs(@Query Paging paging) throws TwitterException;
IDs getFollowersIDs(@Query Paging paging) throws MicroBlogException;
@GET("/followers/ids.json")
IDs getFollowersIDs(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
IDs getFollowersIDs(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/followers/ids.json")
IDs getFollowersIDsByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
IDs getFollowersIDsByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
@GET("/followers/list.json")
PageableResponseList<User> getFollowersList(@Query Paging paging) throws TwitterException;
PageableResponseList<User> getFollowersList(@Query Paging paging) throws MicroBlogException;
@GET("/followers/list.json")
PageableResponseList<User> getFollowersList(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getFollowersList(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/followers/list.json")
PageableResponseList<User> getFollowersListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getFollowersListByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
@GET("/friends/ids.json")
IDs getFriendsIDs(String userId, Paging paging) throws TwitterException;
IDs getFriendsIDs(String userId, Paging paging) throws MicroBlogException;
@GET("/friends/ids.json")
IDs getFriendsIDsByScreenName(String screenName, Paging paging) throws TwitterException;
IDs getFriendsIDsByScreenName(String screenName, Paging paging) throws MicroBlogException;
@GET("/friends/list.json")
PageableResponseList<User> getFriendsList(@Query("user_id") String userId, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/friends/list.json")
PageableResponseList<User> getFriendsListByScreenName(@Query("screen_name") String screenName,
@Query Paging paging) throws TwitterException;
@Query Paging paging) throws MicroBlogException;
@GET("/friendships/incoming.json")
IDs getIncomingFriendships(@Query Paging paging) throws TwitterException;
IDs getIncomingFriendships(@Query Paging paging) throws MicroBlogException;
@GET("/friendships/outgoing.json")
IDs getOutgoingFriendships(@Query Paging paging) throws TwitterException;
IDs getOutgoingFriendships(@Query Paging paging) throws MicroBlogException;
@POST("/friendships/lookup.json")
ResponseList<Friendship> lookupFriendships(@Param(value = "id", arrayDelimiter = ',') String[] ids)
throws TwitterException;
throws MicroBlogException;
@POST("/friendships/lookup.json")
ResponseList<Friendship> lookupFriendshipsByScreenName(@Param(value = "id", arrayDelimiter = ',') String[] screenNames)
throws TwitterException;
throws MicroBlogException;
@GET("/friendships/show.json")
Relationship showFriendship(@Query("source_id") String sourceId,
@Query("target_id") String targetId) throws TwitterException;
@Query("target_id") String targetId) throws MicroBlogException;
@GET("/friendships/show.json")
Relationship showFriendship(@Query("target_id") String targetId) throws TwitterException;
Relationship showFriendship(@Query("target_id") String targetId) throws MicroBlogException;
@GET("/friendships/show.json")
Relationship showFriendshipByScreenName(@Query("source_screen_name") String sourceScreenName,
@Query("target_screen_name") String targetScreenName)
throws TwitterException;
throws MicroBlogException;
@POST("/friendships/update.json")
@BodyType(BodyType.FORM)
Relationship updateFriendship(@Param("user_id") String userId, @Param FriendshipUpdate update)
throws TwitterException;
throws MicroBlogException;
@POST("/friendships/update.json")
@BodyType(BodyType.FORM)
Relationship updateFriendshipByScreenName(@Param("screen_name") String screenName,
@Param FriendshipUpdate update) throws TwitterException;
@Param FriendshipUpdate update) throws MicroBlogException;
}

28
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/HelpResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/HelpResources.java
View File

@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.Language;
import org.mariotaku.twidere.api.twitter.model.RateLimitStatus;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.TwitterAPIConfiguration;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Language;
import org.mariotaku.microblog.library.twitter.model.RateLimitStatus;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.TwitterAPIConfiguration;
import java.util.Map;
@ -37,7 +37,7 @@ public interface HelpResources {
* they are loaded, but no more than once a day.
*
* @return configuration
* @throws TwitterException when Twitter service or network is
* @throws MicroBlogException when Twitter service or network is
* unavailable
* @see <a
* href="https://dev.twitter.com/docs/api/1.1/get/help/configuration">GET
@ -45,7 +45,7 @@ public interface HelpResources {
* @since Twitter4J 2.2.3
*/
@GET("/help/configuration.json")
TwitterAPIConfiguration getAPIConfiguration() throws TwitterException;
TwitterAPIConfiguration getAPIConfiguration() throws MicroBlogException;
/**
* Returns the list of languages supported by Twitter along with their ISO
@ -53,7 +53,7 @@ public interface HelpResources {
* include lang with any of your requests.
*
* @return list of languages supported by Twitter
* @throws TwitterException when Twitter service or network is
* @throws MicroBlogException when Twitter service or network is
* unavailable
* @see <a
* href="https://dev.twitter.com/docs/api/1.1/get/help/languages">GET
@ -61,14 +61,14 @@ public interface HelpResources {
* @since Twitter4J 2.2.3
*/
@GET("/help/languages.json")
ResponseList<Language> getLanguages() throws TwitterException;
ResponseList<Language> getLanguages() throws MicroBlogException;
String getPrivacyPolicy() throws TwitterException;
String getPrivacyPolicy() throws MicroBlogException;
Map<String, RateLimitStatus> getRateLimitStatus() throws TwitterException;
Map<String, RateLimitStatus> getRateLimitStatus() throws MicroBlogException;
Map<String, RateLimitStatus> getRateLimitStatus(String... resources) throws TwitterException;
Map<String, RateLimitStatus> getRateLimitStatus(String... resources) throws MicroBlogException;
String getTermsOfService() throws TwitterException;
String getTermsOfService() throws MicroBlogException;
}

90
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/ListResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/ListResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -25,95 +25,95 @@ import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.ResponseList;
import org.mariotaku.twidere.api.twitter.model.Status;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.twidere.api.twitter.model.UserList;
import org.mariotaku.twidere.api.twitter.model.UserListUpdate;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.microblog.library.twitter.model.UserList;
import org.mariotaku.microblog.library.twitter.model.UserListUpdate;
public interface ListResources {
@POST("/lists/members/create.json")
UserList addUserListMember(@Query("list_id") String listId, @Query("user_id") String userId) throws TwitterException;
UserList addUserListMember(@Query("list_id") String listId, @Query("user_id") String userId) throws MicroBlogException;
@POST("/lists/members/create.json")
UserList addUserListMemberByScreenName(@Query("list_id") String listId, @Query("screen_name") String userScreenName) throws TwitterException;
UserList addUserListMemberByScreenName(@Query("list_id") String listId, @Query("screen_name") String userScreenName) throws MicroBlogException;
@POST("/lists/members/create_all.json")
UserList addUserListMembers(@Param("list_id") String listId, @Param(value = "user_id", arrayDelimiter = ',') String[] userIds) throws TwitterException;
UserList addUserListMembers(@Param("list_id") String listId, @Param(value = "user_id", arrayDelimiter = ',') String[] userIds) throws MicroBlogException;
@POST("/lists/members/create_all.json")
UserList addUserListMembersByScreenName(@Param("list_id") String listId, @Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws TwitterException;
UserList addUserListMembersByScreenName(@Param("list_id") String listId, @Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws MicroBlogException;
@POST("/lists/create.json")
UserList createUserList(@Param UserListUpdate update) throws TwitterException;
UserList createUserList(@Param UserListUpdate update) throws MicroBlogException;
@POST("/lists/subscribers/create.json")
UserList createUserListSubscription(@Param("list_id") String listId) throws TwitterException;
UserList createUserListSubscription(@Param("list_id") String listId) throws MicroBlogException;
@POST("/lists/members/destroy.json")
UserList deleteUserListMember(@Query("list_id") String listId, @Query("user_id") String userId) throws TwitterException;
UserList deleteUserListMember(@Query("list_id") String listId, @Query("user_id") String userId) throws MicroBlogException;
@POST("/lists/members/destroy.json")
UserList deleteUserListMemberByScreenName(@Query("list_id") String listId, @Param("screen_name") String screenName) throws TwitterException;
UserList deleteUserListMemberByScreenName(@Query("list_id") String listId, @Param("screen_name") String screenName) throws MicroBlogException;
@POST("/lists/members/destroy_all.json")
UserList deleteUserListMembers(@Param("list_id") String listId, @Param(value = "user_id", arrayDelimiter = ',') String[] userIds) throws TwitterException;
UserList deleteUserListMembers(@Param("list_id") String listId, @Param(value = "user_id", arrayDelimiter = ',') String[] userIds) throws MicroBlogException;
@POST("/lists/members/destroy_all.json")
UserList deleteUserListMembersByScreenName(@Query("list_id") String listId, @Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws TwitterException;
UserList deleteUserListMembersByScreenName(@Query("list_id") String listId, @Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws MicroBlogException;
@POST("/lists/destroy.json")
UserList destroyUserList(@Param("list_id") String listId) throws TwitterException;
UserList destroyUserList(@Param("list_id") String listId) throws MicroBlogException;
@POST("/lists/subscribers/destroy.json")
UserList destroyUserListSubscription(@Param("list_id") String listId) throws TwitterException;
UserList destroyUserListSubscription(@Param("list_id") String listId) throws MicroBlogException;
@GET("/lists/members.json")
PageableResponseList<User> getUserListMembers(@Query("list_id") String listId, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getUserListMembers(@Query("list_id") String listId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/members.json")
PageableResponseList<User> getUserListMembers(@Query("slug") String slug,
@Query("owner_id") String ownerId,
@Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/members.json")
PageableResponseList<User> getUserListMembersByScreenName(@Query("slug") String slug, @Query("owner_screen_name") String ownerScreenName, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/memberships.json")
PageableResponseList<UserList> getUserListMemberships(@Query("user_id") String listMemberId, @Query Paging paging) throws TwitterException;
PageableResponseList<UserList> getUserListMemberships(@Query("user_id") String listMemberId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/memberships.json")
PageableResponseList<UserList> getUserListMemberships(@Query("user_id") String listMemberId, @Query Paging paging,
@Query("filter_to_owned_lists") boolean filterToOwnedLists) throws TwitterException;
@Query("filter_to_owned_lists") boolean filterToOwnedLists) throws MicroBlogException;
@GET("/lists/memberships.json")
PageableResponseList<UserList> getUserListMembershipsByScreenName(@Query("screen_name") String listMemberScreenName, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/ownerships.json")
PageableResponseList<UserList> getUserListMembershipsByScreenName(@Query("screen_name") String listMemberScreenName, @Query Paging paging,
boolean filterToOwnedLists) throws TwitterException;
boolean filterToOwnedLists) throws MicroBlogException;
@GET("/lists/ownerships.json")
PageableResponseList<UserList> getUserListOwnerships(@Query Paging paging) throws TwitterException;
PageableResponseList<UserList> getUserListOwnerships(@Query Paging paging) throws MicroBlogException;
@GET("/lists/ownerships.json")
PageableResponseList<UserList> getUserListOwnerships(@Query("user_id") String listMemberId, @Query Paging paging) throws TwitterException;
PageableResponseList<UserList> getUserListOwnerships(@Query("user_id") String listMemberId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/ownerships.json")
PageableResponseList<UserList> getUserListOwnershipsByScreenName(@Query("screen_name") String listMemberScreenName, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/list.json")
ResponseList<UserList> getUserLists(@Query("user_id") String userId, @Query("reverse") boolean reverse) throws TwitterException;
ResponseList<UserList> getUserLists(@Query("user_id") String userId, @Query("reverse") boolean reverse) throws MicroBlogException;
@GET("/lists/list.json")
ResponseList<UserList> getUserListsByScreenName(@Query("screen_name") String screenName, @Query("reverse") boolean reverse) throws TwitterException;
ResponseList<UserList> getUserListsByScreenName(@Query("screen_name") String screenName, @Query("reverse") boolean reverse) throws MicroBlogException;
@GET("/lists/statuses.json")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -125,7 +125,7 @@ public interface ListResources {
@KeyValue(key = "include_descendent_reply_count", valueKey = "include_descendent_reply_count"),
@KeyValue(key = "include_ext_alt_text", valueKey = "include_ext_alt_text")
})
ResponseList<Status> getUserListStatuses(@Query("list_id") String listId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getUserListStatuses(@Query("list_id") String listId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/statuses.json")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -137,7 +137,7 @@ public interface ListResources {
@KeyValue(key = "include_descendent_reply_count", valueKey = "include_descendent_reply_count"),
@KeyValue(key = "include_ext_alt_text", valueKey = "include_ext_alt_text")
})
ResponseList<Status> getUserListStatuses(@Query("slug") String slug, @Query("owner_id") long ownerId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getUserListStatuses(@Query("slug") String slug, @Query("owner_id") long ownerId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/statuses.json")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -150,37 +150,37 @@ public interface ListResources {
@KeyValue(key = "include_ext_alt_text", valueKey = "include_ext_alt_text")
})
ResponseList<Status> getUserListStatuses(@Query("slug") String slug, @Query("owner_screen_name") String ownerScreenName, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/subscribers.json")
PageableResponseList<User> getUserListSubscribers(@Query("list_id") String listId, @Query Paging paging) throws TwitterException;
PageableResponseList<User> getUserListSubscribers(@Query("list_id") String listId, @Query Paging paging) throws MicroBlogException;
@GET("/lists/subscribers.json")
PageableResponseList<User> getUserListSubscribers(@Query("list_id") String slug, @Query("owner_id") String ownerId, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/subscribers.json")
PageableResponseList<User> getUserListSubscribersByScreenName(@Query("list_id") String slug, @Query("owner_screen_name") String ownerScreenName, @Query Paging paging)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/subscriptions.json")
PageableResponseList<UserList> getUserListSubscriptionsByScreenName(@Query("screen_name") String listOwnerScreenName, long cursor)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/subscriptions.json")
PageableResponseList<UserList> getUserListSubscriptions(@Query("user_id") String userId, long cursor)
throws TwitterException;
throws MicroBlogException;
@GET("/lists/show.json")
UserList showUserList(@Query("list_id") String listId) throws TwitterException;
UserList showUserList(@Query("list_id") String listId) throws MicroBlogException;
@GET("/lists/show.json")
UserList showUserList(@Query("slug") String slug, @Query("owner_id") String ownerId) throws TwitterException;
UserList showUserList(@Query("slug") String slug, @Query("owner_id") String ownerId) throws MicroBlogException;
@GET("/lists/show.json")
UserList showUserListByScrenName(@Query("slug") String slug, @Query("owner_screen_name") String ownerScreenName) throws TwitterException;
UserList showUserListByScrenName(@Query("slug") String slug, @Query("owner_screen_name") String ownerScreenName) throws MicroBlogException;
@POST("/lists/update.json")
UserList updateUserList(@Param("list_id") String listId, @Param UserListUpdate update) throws TwitterException;
UserList updateUserList(@Param("list_id") String listId, @Param UserListUpdate update) throws MicroBlogException;
}

34
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PlacesGeoResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PlacesGeoResources.java
View File

@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.twidere.api.twitter.model.GeoLocation;
import org.mariotaku.twidere.api.twitter.model.GeoQuery;
import org.mariotaku.twidere.api.twitter.model.Place;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.SimilarPlaces;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.GeoLocation;
import org.mariotaku.microblog.library.twitter.model.GeoQuery;
import org.mariotaku.microblog.library.twitter.model.Place;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SimilarPlaces;
/**
* @author Yusuke Yamamoto - yusuke at mac.com
@ -49,13 +49,13 @@ public interface PlacesGeoResources {
* attributes are also permitted. Learn more about Place
* Attributes.
* @return the created place
* @throws TwitterException when Twitter service or network is unavailable
* @throws MicroBlogException when Twitter service or network is unavailable
* @see <a href="https://dev.twitter.com/docs/api/1.1/post/geo/place">POST
* geo/place | Twitter Developers</a>
* @since Twitter4J 2.1.7
*/
Place createPlace(String name, String containedWithin, String token, GeoLocation location, String streetAddress)
throws TwitterException;
throws MicroBlogException;
/**
* Find out more details of a place that was returned from the
@ -65,13 +65,13 @@ public interface PlacesGeoResources {
*
* @param id The ID of the location to query about.
* @return details of the specified place
* @throws TwitterException when Twitter service or network is unavailable
* @throws MicroBlogException when Twitter service or network is unavailable
* @see <a
* href="https://dev.twitter.com/docs/api/1.1/get/geo/id/:place_id">GET
* geo/id/:place_id | Twitter Developers</a>
* @since Twitter4J 2.1.1
*/
Place getGeoDetails(String id) throws TwitterException;
Place getGeoDetails(String id) throws MicroBlogException;
/**
* Locates places near the given coordinates which are similar in name. <br>
@ -94,11 +94,11 @@ public interface PlacesGeoResources {
* Attributes.
* @return places (cities and neighborhoods) that can be attached to a
* statuses/update
* @throws TwitterException when Twitter service or network is unavailable
* @throws MicroBlogException when Twitter service or network is unavailable
* @since Twitter4J 2.1.7
*/
SimilarPlaces getSimilarPlaces(GeoLocation location, String name, String containedWithin, String streetAddress)
throws TwitterException;
throws MicroBlogException;
/**
* Search for places (cities and neighborhoods) that can be attached to a
@ -117,13 +117,13 @@ public interface PlacesGeoResources {
* @param query search query
* @return places (cities and neighborhoods) that can be attached to a
* statuses/update
* @throws TwitterException when Twitter service or network is unavailable
* @throws MicroBlogException when Twitter service or network is unavailable
* @see <a
* href="https://dev.twitter.com/docs/api/1.1/get/geo/reverse_geocode">GET
* geo/reverse_geocode | Twitter Developers</a>
* @since Twitter4J 2.1.1
*/
ResponseList<Place> reverseGeoCode(GeoQuery query) throws TwitterException;
ResponseList<Place> reverseGeoCode(GeoQuery query) throws MicroBlogException;
/**
* Search for places that can be attached to a statuses/update. Given a
@ -143,10 +143,10 @@ public interface PlacesGeoResources {
* @param query search query
* @return places (cities and neighborhoods) that can be attached to a
* statuses/update
* @throws TwitterException when Twitter service or network is unavailable
* @throws MicroBlogException when Twitter service or network is unavailable
* @see <a href="https://dev.twitter.com/docs/api/1.1/get/geo/search">GET
* geo/search | Twitter Developers</a>
* @since Twitter4J 2.1.7
*/
ResponseList<Place> searchPlaces(GeoQuery query) throws TwitterException;
ResponseList<Place> searchPlaces(GeoQuery query) throws MicroBlogException;
}

18
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateActivityResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateActivityResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -26,11 +26,11 @@ import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.Activity;
import org.mariotaku.twidere.api.twitter.model.CursorTimestampResponse;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Activity;
import org.mariotaku.microblog.library.twitter.model.CursorTimestampResponse;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -45,16 +45,16 @@ import org.mariotaku.twidere.api.twitter.model.ResponseList;
public interface PrivateActivityResources extends PrivateResources {
@GET("/activity/about_me.json")
ResponseList<Activity> getActivitiesAboutMe(@Query Paging paging) throws TwitterException;
ResponseList<Activity> getActivitiesAboutMe(@Query Paging paging) throws MicroBlogException;
@Queries({})
@GET("/activity/about_me/unread.json")
CursorTimestampResponse getActivitiesAboutMeUnread(@Query("cursor") boolean cursor) throws TwitterException;
CursorTimestampResponse getActivitiesAboutMeUnread(@Query("cursor") boolean cursor) throws MicroBlogException;
@Queries({})
@POST("/activity/about_me/unread.json")
@BodyType(BodyType.FORM)
CursorTimestampResponse setActivitiesAboutMeUnread(@Param("cursor") long cursor) throws TwitterException;
CursorTimestampResponse setActivitiesAboutMeUnread(@Param("cursor") long cursor) throws MicroBlogException;
}

24
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateDirectMessagesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateDirectMessagesResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -27,12 +27,12 @@ import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.ConversationTimeline;
import org.mariotaku.twidere.api.twitter.model.NewDm;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ResponseCode;
import org.mariotaku.twidere.api.twitter.model.UserInbox;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ConversationTimeline;
import org.mariotaku.microblog.library.twitter.model.NewDm;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseCode;
import org.mariotaku.microblog.library.twitter.model.UserInbox;
@Queries(@KeyValue(key = "include_groups", value = "true"))
@ -40,18 +40,18 @@ public interface PrivateDirectMessagesResources extends PrivateResources {
@POST("/dm/conversation/{conversation_id}/delete.json")
@BodyType(BodyType.FORM)
ResponseCode destroyDirectMessagesConversation(@Path("conversation_id") String conversationId) throws TwitterException;
ResponseCode destroyDirectMessagesConversation(@Path("conversation_id") String conversationId) throws MicroBlogException;
@POST("/dm/new.json")
ResponseCode sendDm(@Param NewDm newDm) throws TwitterException;
ResponseCode sendDm(@Param NewDm newDm) throws MicroBlogException;
@POST("/dm/conversation/{account_id}-{user_id}/delete.json")
@BodyType(BodyType.FORM)
ResponseCode destroyDirectMessagesConversation(@Path("account_id") String accountId, @Path("user_id") String userId) throws TwitterException;
ResponseCode destroyDirectMessagesConversation(@Path("account_id") String accountId, @Path("user_id") String userId) throws MicroBlogException;
@GET("/dm/user_inbox.json")
UserInbox getUserInbox(@Query Paging paging) throws TwitterException;
UserInbox getUserInbox(@Query Paging paging) throws MicroBlogException;
@GET("/dm/conversation/{conversation_id}.json")
ConversationTimeline getUserInbox(@Path("conversation_id") String conversationId, @Query Paging paging) throws TwitterException;
ConversationTimeline getUserInbox(@Path("conversation_id") String conversationId, @Query Paging paging) throws MicroBlogException;
}

14
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateFriendsFollowersResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateFriendsFollowersResources.java
View File

@ -17,28 +17,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.User;
@Queries({@KeyValue(key = "include_entities", valueKey = "include_entities")})
public interface PrivateFriendsFollowersResources extends PrivateResources {
@POST("/friendships/accept.json")
User acceptFriendship(@Param("user_id") long userId) throws TwitterException;
User acceptFriendship(@Param("user_id") long userId) throws MicroBlogException;
@POST("/friendships/accept.json")
User acceptFriendship(@Param("screen_name") String screenName) throws TwitterException;
User acceptFriendship(@Param("screen_name") String screenName) throws MicroBlogException;
@POST("/friendships/deny.json")
User denyFriendship(@Param("user_id") long userId) throws TwitterException;
User denyFriendship(@Param("user_id") long userId) throws MicroBlogException;
@POST("/friendships/deny.json")
User denyFriendship(@Param("screen_name") String screenName) throws TwitterException;
User denyFriendship(@Param("screen_name") String screenName) throws MicroBlogException;
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
public interface PrivateResources {

20
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateScheduleResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateScheduleResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.DELETE;
import org.mariotaku.restfu.annotation.method.GET;
@ -28,11 +28,11 @@ import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.ScheduledStatus;
import org.mariotaku.twidere.api.twitter.model.StatusSchedule;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.ScheduledStatus;
import org.mariotaku.microblog.library.twitter.model.StatusSchedule;
/**
* Created by mariotaku on 15/7/6.
@ -40,19 +40,19 @@ import org.mariotaku.twidere.api.twitter.model.StatusSchedule;
public interface PrivateScheduleResources {
@POST("/schedule/status/tweet.json")
ScheduledStatus scheduleTweet(@Param StatusSchedule schedule) throws TwitterException;
ScheduledStatus scheduleTweet(@Param StatusSchedule schedule) throws MicroBlogException;
@DELETE("/schedule/status/{id}.json")
ScheduledStatus destroyScheduleTweet(@Path("id") long id) throws TwitterException;
ScheduledStatus destroyScheduleTweet(@Path("id") long id) throws MicroBlogException;
@PUT("/schedule/status/{id}.json")
ScheduledStatus updateScheduleTweet(@Path("id") long id, @Param StatusSchedule schedule) throws TwitterException;
ScheduledStatus updateScheduleTweet(@Path("id") long id, @Param StatusSchedule schedule) throws MicroBlogException;
@GET("/schedule/status/list.json")
@Queries({@KeyValue(key = "include_entities", valueKey = "include_entities"),
@KeyValue(key = "include_cards", valueKey = "include_cards"),
@KeyValue(key = "cards_platform", valueKey = "cards_platform")})
ResponseList<ScheduledStatus> getScheduledStatuses(@Query Paging paging,
@Query(value = "state", arrayDelimiter = ',') @ScheduledStatus.State String[] states) throws TwitterException;
@Query(value = "state", arrayDelimiter = ',') @ScheduledStatus.State String[] states) throws MicroBlogException;
}

10
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateSearchResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateSearchResources.java
View File

@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.PrivateSearchQuery;
import org.mariotaku.twidere.api.twitter.model.PrivateSearchResult;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.PrivateSearchQuery;
import org.mariotaku.microblog.library.twitter.model.PrivateSearchResult;
/**
* Created by mariotaku on 15/10/21.
@ -30,6 +30,6 @@ import org.mariotaku.twidere.api.twitter.model.PrivateSearchResult;
public interface PrivateSearchResources {
@GET("/search/universal.json")
PrivateSearchResult searchTweets(PrivateSearchQuery query) throws TwitterException;
PrivateSearchResult searchTweets(PrivateSearchQuery query) throws MicroBlogException;
}

14
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateTimelineResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTimelineResources.java
View File

@ -17,16 +17,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.Status;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -41,8 +41,8 @@ import org.mariotaku.twidere.api.twitter.model.Status;
public interface PrivateTimelineResources extends PrivateResources {
@GET("/statuses/media_timeline.json")
ResponseList<Status> getMediaTimeline(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getMediaTimeline(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/media_timeline.json")
ResponseList<Status> getMediaTimelineByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
ResponseList<Status> getMediaTimelineByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
}

20
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateTweetResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTweetResources.java
View File

@ -17,19 +17,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.Status;
import org.mariotaku.twidere.api.twitter.model.StatusActivitySummary;
import org.mariotaku.twidere.api.twitter.model.TranslationResult;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.microblog.library.twitter.model.StatusActivitySummary;
import org.mariotaku.microblog.library.twitter.model.TranslationResult;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -44,11 +44,11 @@ import org.mariotaku.twidere.api.twitter.model.TranslationResult;
public interface PrivateTweetResources extends PrivateResources {
@GET("/statuses/{id}/activity/summary.json")
StatusActivitySummary getStatusActivitySummary(@Path("id") String statusId) throws TwitterException;
StatusActivitySummary getStatusActivitySummary(@Path("id") String statusId) throws MicroBlogException;
@GET("/conversation/show.json")
ResponseList<Status> showConversation(@Query("id") String statusId, @Query Paging paging) throws TwitterException;
ResponseList<Status> showConversation(@Query("id") String statusId, @Query Paging paging) throws MicroBlogException;
@GET("/translations/show.json")
TranslationResult showTranslation(@Query("id") String statusId, @Query("dest") String dest) throws TwitterException;
TranslationResult showTranslation(@Query("id") String statusId, @Query("dest") String dest) throws MicroBlogException;
}

16
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SavedSearchesResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SavedSearchesResources.java
View File

@ -17,31 +17,31 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.SavedSearch;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SavedSearch;
@SuppressWarnings("RedundantThrows")
public interface SavedSearchesResources {
@POST("/saved_searches/create.json")
@BodyType(BodyType.FORM)
SavedSearch createSavedSearch(@Param("query") String query) throws TwitterException;
SavedSearch createSavedSearch(@Param("query") String query) throws MicroBlogException;
@POST("/saved_searches/destroy/{id}.json")
@BodyType(BodyType.FORM)
SavedSearch destroySavedSearch(@Path("id") long id) throws TwitterException;
SavedSearch destroySavedSearch(@Path("id") long id) throws MicroBlogException;
@GET("/saved_searches/list.json")
ResponseList<SavedSearch> getSavedSearches() throws TwitterException;
ResponseList<SavedSearch> getSavedSearches() throws MicroBlogException;
@POST("/saved_searches/show/{id}.json")
SavedSearch showSavedSearch(@Path("id") long id) throws TwitterException;
SavedSearch showSavedSearch(@Path("id") long id) throws MicroBlogException;
}

10
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SearchResource.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SearchResource.java
View File

@ -17,15 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.QueryResult;
import org.mariotaku.twidere.api.twitter.model.SearchQuery;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.QueryResult;
import org.mariotaku.microblog.library.twitter.model.SearchQuery;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -37,5 +37,5 @@ import org.mariotaku.twidere.api.twitter.model.SearchQuery;
@KeyValue(key = "include_descendent_reply_count", valueKey = "include_descendent_reply_count")})
public interface SearchResource {
@GET("/search/tweets.json")
QueryResult search(@Query SearchQuery query) throws TwitterException;
QueryResult search(@Query SearchQuery query) throws MicroBlogException;
}

10
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SpamReportingResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SpamReportingResources.java
View File

@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.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.User;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.User;
/**
* @author Joern Huxhorn - jhuxhorn at googlemail.com
@ -33,9 +33,9 @@ public interface SpamReportingResources {
@POST("/users/report_spam.json")
@BodyType(BodyType.FORM)
User reportSpam(@Param("user_id") String userId) throws TwitterException;
User reportSpam(@Param("user_id") String userId) throws MicroBlogException;
@POST("/users/report_spam.json")
@BodyType(BodyType.FORM)
User reportSpamByScreenName(@Param("screen_name") String screenName) throws TwitterException;
User reportSpamByScreenName(@Param("screen_name") String screenName) throws MicroBlogException;
}

24
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TimelineResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TimelineResources.java
View File

@ -17,17 +17,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.KeyValue;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
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.Status;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -42,23 +42,23 @@ import org.mariotaku.twidere.api.twitter.model.Status;
public interface TimelineResources {
@GET("/statuses/home_timeline.json")
ResponseList<Status> getHomeTimeline(@Query Paging paging) throws TwitterException;
ResponseList<Status> getHomeTimeline(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/public_timeline.json")
ResponseList<Status> getPublicTimeline(@Query Paging paging) throws TwitterException;
ResponseList<Status> getPublicTimeline(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/mentions_timeline.json")
ResponseList<Status> getMentionsTimeline(@Query Paging paging) throws TwitterException;
ResponseList<Status> getMentionsTimeline(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/retweets_of_me.json")
ResponseList<Status> getRetweetsOfMe(@Query Paging paging) throws TwitterException;
ResponseList<Status> getRetweetsOfMe(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/user_timeline.json")
ResponseList<Status> getUserTimeline(@Query("user_id") String userId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getUserTimeline(@Query("user_id") String userId, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/user_timeline.json")
ResponseList<Status> getUserTimeline(@Query Paging paging) throws TwitterException;
ResponseList<Status> getUserTimeline(@Query Paging paging) throws MicroBlogException;
@GET("/statuses/user_timeline.json")
ResponseList<Status> getUserTimelineByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws TwitterException;
ResponseList<Status> getUserTimelineByScreenName(@Query("screen_name") String screenName, @Query Paging paging) throws MicroBlogException;
}

22
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TrendsResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TrendsResources.java
View File

@ -17,15 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.GeoLocation;
import org.mariotaku.twidere.api.twitter.model.Location;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.Trends;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.GeoLocation;
import org.mariotaku.microblog.library.twitter.model.Location;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Trends;
/**
* @author Joern Huxhorn - jhuxhorn at googlemail.com
@ -34,17 +34,17 @@ import org.mariotaku.twidere.api.twitter.model.Trends;
public interface TrendsResources {
@GET("/trends/available.json")
ResponseList<Location> getAvailableTrends() throws TwitterException;
ResponseList<Location> getAvailableTrends() throws MicroBlogException;
@GET("/trends/available.json")
ResponseList<Location> getAvailableTrends(@Query GeoLocation location) throws TwitterException;
ResponseList<Location> getAvailableTrends(@Query GeoLocation location) throws MicroBlogException;
@GET("/trends/closest.json")
ResponseList<Location> getClosestTrends(@Query GeoLocation location) throws TwitterException;
ResponseList<Location> getClosestTrends(@Query GeoLocation location) throws MicroBlogException;
@GET("/trends/place.json")
ResponseList<Trends> getLocationTrends(@Query("id") int woeid) throws TwitterException;
ResponseList<Trends> getLocationTrends(@Query("id") int woeid) throws MicroBlogException;
@GET("/trends/place.json")
Trends getPlaceTrends(@Query("id") int woeid) throws TwitterException;
Trends getPlaceTrends(@Query("id") int woeid) throws MicroBlogException;
}

28
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TweetResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TweetResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -26,12 +26,12 @@ import org.mariotaku.restfu.annotation.param.Param;
import org.mariotaku.restfu.annotation.param.Path;
import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.IDs;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.Status;
import org.mariotaku.twidere.api.twitter.model.StatusUpdate;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.IDs;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.Status;
import org.mariotaku.microblog.library.twitter.model.StatusUpdate;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_my_retweet", valueKey = "include_my_retweet"),
@ -45,24 +45,24 @@ import org.mariotaku.twidere.api.twitter.model.StatusUpdate;
})
public interface TweetResources {
@POST("/statuses/destroy/{id}.json")
Status destroyStatus(@Path("id") String statusId) throws TwitterException;
Status destroyStatus(@Path("id") String statusId) throws MicroBlogException;
@GET("/statuses/retweeters/ids.json")
IDs getRetweetersIDs(@Query("id") String statusId, @Query Paging paging) throws TwitterException;
IDs getRetweetersIDs(@Query("id") String statusId, @Query Paging paging) throws MicroBlogException;
@GET("/statuses/retweets/{id}.json")
ResponseList<Status> getRetweets(@Path("id") String statusId, @Query Paging paging) throws TwitterException;
ResponseList<Status> getRetweets(@Path("id") String statusId, @Query Paging paging) throws MicroBlogException;
@POST("/statuses/retweet/{id}.json")
Status retweetStatus(@Path("id") String statusId) throws TwitterException;
Status retweetStatus(@Path("id") String statusId) throws MicroBlogException;
@GET("/statuses/show.json")
Status showStatus(@Query("id") String id) throws TwitterException;
Status showStatus(@Query("id") String id) throws MicroBlogException;
@POST("/statuses/update.json")
Status updateStatus(@Param StatusUpdate latestStatus) throws TwitterException;
Status updateStatus(@Param StatusUpdate latestStatus) throws MicroBlogException;
@POST("/statuses/lookup.json")
ResponseList<Status> lookupStatuses(@Param(value = "id", arrayDelimiter = ',') String[] ids) throws TwitterException;
ResponseList<Status> lookupStatuses(@Param(value = "id", arrayDelimiter = ',') String[] ids) throws MicroBlogException;
}

84
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/UsersResources.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/UsersResources.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.api;
package org.mariotaku.microblog.library.twitter.api;
import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.annotation.method.POST;
@ -27,17 +27,17 @@ import org.mariotaku.restfu.annotation.param.Queries;
import org.mariotaku.restfu.annotation.param.Query;
import org.mariotaku.restfu.http.BodyType;
import org.mariotaku.restfu.http.mime.FileBody;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.twidere.api.twitter.model.AccountSettings;
import org.mariotaku.twidere.api.twitter.model.Category;
import org.mariotaku.twidere.api.twitter.model.IDs;
import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
import org.mariotaku.twidere.api.twitter.model.Paging;
import org.mariotaku.twidere.api.twitter.model.ProfileUpdate;
import org.mariotaku.twidere.api.twitter.model.ResponseCode;
import org.mariotaku.twidere.api.twitter.model.ResponseList;
import org.mariotaku.twidere.api.twitter.model.SettingsUpdate;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.AccountSettings;
import org.mariotaku.microblog.library.twitter.model.Category;
import org.mariotaku.microblog.library.twitter.model.IDs;
import org.mariotaku.microblog.library.twitter.model.PageableResponseList;
import org.mariotaku.microblog.library.twitter.model.Paging;
import org.mariotaku.microblog.library.twitter.model.ProfileUpdate;
import org.mariotaku.microblog.library.twitter.model.ResponseCode;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SettingsUpdate;
import org.mariotaku.microblog.library.twitter.model.User;
@SuppressWarnings("RedundantThrows")
@Queries({@KeyValue(key = "include_entities", valueKey = "include_entities"),
@ -46,93 +46,93 @@ import org.mariotaku.twidere.api.twitter.model.User;
public interface UsersResources {
@POST("/blocks/create.json")
User createBlock(@Param("user_id") String userId) throws TwitterException;
User createBlock(@Param("user_id") String userId) throws MicroBlogException;
@POST("/blocks/create.json")
User createBlockByScreenName(@Query("screen_name") String screenName) throws TwitterException;
User createBlockByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@POST("/mutes/users/create.json")
User createMute(@Param("user_id") String userId) throws TwitterException;
User createMute(@Param("user_id") String userId) throws MicroBlogException;
@POST("/mutes/users/create.json")
User createMuteByScreenName(@Query("screen_name") String screenName) throws TwitterException;
User createMuteByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@POST("/blocks/destroy.json")
User destroyBlock(@Param("user_id") String userId) throws TwitterException;
User destroyBlock(@Param("user_id") String userId) throws MicroBlogException;
@POST("/blocks/destroy.json")
User destroyBlockByScreenName(@Query("screen_name") String screenName) throws TwitterException;
User destroyBlockByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@POST("/mutes/users/destroy.json")
User destroyMute(@Param("user_id") String userId) throws TwitterException;
User destroyMute(@Param("user_id") String userId) throws MicroBlogException;
@POST("/mutes/users/destroy.json")
User destroyMuteByScreenName(@Query("screen_name") String screenName) throws TwitterException;
User destroyMuteByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@GET("/account/settings.json")
AccountSettings getAccountSettings() throws TwitterException;
AccountSettings getAccountSettings() throws MicroBlogException;
@GET("/blocks/ids.json")
IDs getBlocksIDs(@Query Paging paging) throws TwitterException;
IDs getBlocksIDs(@Query Paging paging) throws MicroBlogException;
@GET("/blocks/list.json")
PageableResponseList<User> getBlocksList(@Query Paging paging) throws TwitterException;
PageableResponseList<User> getBlocksList(@Query Paging paging) throws MicroBlogException;
ResponseList<User> getMemberSuggestions(String categorySlug) throws TwitterException;
ResponseList<User> getMemberSuggestions(String categorySlug) throws MicroBlogException;
@GET("/mutes/users/ids.json")
IDs getMutesUsersIDs(Paging paging) throws TwitterException;
IDs getMutesUsersIDs(Paging paging) throws MicroBlogException;
@GET("/mutes/users/list.json")
PageableResponseList<User> getMutesUsersList(@Query Paging paging) throws TwitterException;
PageableResponseList<User> getMutesUsersList(@Query Paging paging) throws MicroBlogException;
ResponseList<Category> getSuggestedUserCategories() throws TwitterException;
ResponseList<Category> getSuggestedUserCategories() throws MicroBlogException;
ResponseList<User> getUserSuggestions(String categorySlug) throws TwitterException;
ResponseList<User> getUserSuggestions(String categorySlug) throws MicroBlogException;
@POST("/users/lookup.json")
@BodyType(BodyType.FORM)
ResponseList<User> lookupUsers(@Param(value = "user_id", arrayDelimiter = ',') String[] ids) throws TwitterException;
ResponseList<User> lookupUsers(@Param(value = "user_id", arrayDelimiter = ',') String[] ids) throws MicroBlogException;
@GET("/users/lookup.json")
ResponseList<User> lookupUsersByScreenName(@Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws TwitterException;
ResponseList<User> lookupUsersByScreenName(@Param(value = "screen_name", arrayDelimiter = ',') String[] screenNames) throws MicroBlogException;
@POST("/account/remove_profile_banner.json")
ResponseCode removeProfileBannerImage() throws TwitterException;
ResponseCode removeProfileBannerImage() throws MicroBlogException;
@GET("/users/search.json")
ResponseList<User> searchUsers(@Query("q") String query, @Query Paging paging) throws TwitterException;
ResponseList<User> searchUsers(@Query("q") String query, @Query Paging paging) throws MicroBlogException;
@GET("/users/show.json")
User showUser(@Query("user_id") String userId) throws TwitterException;
User showUser(@Query("user_id") String userId) throws MicroBlogException;
@GET("/users/show.json")
User showUserByScreenName(@Query("screen_name") String screenName) throws TwitterException;
User showUserByScreenName(@Query("screen_name") String screenName) throws MicroBlogException;
@POST("/account/settings.json")
AccountSettings updateAccountSettings(@Param SettingsUpdate settingsUpdate) throws TwitterException;
AccountSettings updateAccountSettings(@Param SettingsUpdate settingsUpdate) throws MicroBlogException;
@POST("/account/update_profile.json")
User updateProfile(@Param ProfileUpdate profileUpdate) throws TwitterException;
User updateProfile(@Param ProfileUpdate profileUpdate) throws MicroBlogException;
@POST("/account/update_profile_background_image.json")
User updateProfileBackgroundImage(@Param("image") FileBody data, @Param("tile") boolean tile) throws TwitterException;
User updateProfileBackgroundImage(@Param("image") FileBody data, @Param("tile") boolean tile) throws MicroBlogException;
@POST("/account/update_profile_background_image.json")
User updateProfileBackgroundImage(@Param("media_id") long mediaId, @Param("tile") boolean tile) throws TwitterException;
User updateProfileBackgroundImage(@Param("media_id") long mediaId, @Param("tile") boolean tile) throws MicroBlogException;
@POST("/account/update_profile_banner.json")
ResponseCode updateProfileBannerImage(@Param("banner") FileBody data, @Param("width") int width,
@Param("height") int height, @Param("offset_left") int offsetLeft,
@Param("offset_top") int offsetTop)
throws TwitterException;
throws MicroBlogException;
@POST("/account/update_profile_banner.json")
ResponseCode updateProfileBannerImage(@Param("banner") FileBody data) throws TwitterException;
ResponseCode updateProfileBannerImage(@Param("banner") FileBody data) throws MicroBlogException;
@POST("/account/update_profile_image.json")
User updateProfileImage(@Param("image") FileBody data) throws TwitterException;
User updateProfileImage(@Param("image") FileBody data) throws MicroBlogException;
@GET("/account/verify_credentials.json")
User verifyCredentials() throws TwitterException;
User verifyCredentials() throws MicroBlogException;
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/AuthorizationConfiguration.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/AuthorizationConfiguration.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
/**
* A static factory class for Authorization.

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/BasicAuthorization.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import android.util.Base64;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/BearerAuthorization.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import org.mariotaku.restfu.RestRequest;
import org.mariotaku.restfu.http.Authorization;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/EmptyAuthorization.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import org.mariotaku.restfu.RestRequest;
import org.mariotaku.restfu.http.Authorization;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuth2GetTokenHeader.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2GetTokenHeader.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import android.util.Base64;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuth2Token.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2Token.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthAuthorization.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuthAuthorization.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthEndpoint.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuthEndpoint.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import org.mariotaku.restfu.http.Endpoint;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthSupport.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuthSupport.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
/**
* Created by mariotaku on 15/5/7.

6
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthToken.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuthToken.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.auth;
package org.mariotaku.microblog.library.twitter.auth;
import org.mariotaku.restfu.RestConverter;
@ -26,7 +26,7 @@ import org.mariotaku.restfu.http.ContentType;
import org.mariotaku.restfu.http.HttpResponse;
import org.mariotaku.restfu.http.ValueMap;
import org.mariotaku.restfu.http.mime.Body;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.microblog.library.MicroBlogException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -124,7 +124,7 @@ public class OAuthToken implements ValueMap {
return new String[]{"oauth_token", "oauth_token_secret"};
}
public static class ResponseConverter implements RestConverter<HttpResponse, OAuthToken, TwitterException> {
public static class ResponseConverter implements RestConverter<HttpResponse, OAuthToken, MicroBlogException> {
@Override
public OAuthToken convert(HttpResponse response) throws IOException, ConvertException {
final Body body = response.getBody();

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/http/HttpResponseCode.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/http/HttpResponseCode.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.http;
package org.mariotaku.microblog.library.twitter.http;
/**
* @author Yusuke Yamamoto - yusuke at mac.com

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/AccountSettings.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/AccountSettings.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Activity$$JsonObjectMapper.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity$$JsonObjectMapper.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.JsonMapper;
import com.bluelinelabs.logansquare.LoganSquare;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Activity.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -27,7 +27,7 @@ import android.text.TextUtils;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.annotation.NoObfuscate;
import org.mariotaku.microblog.library.annotation.NoObfuscate;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

8
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CardDataMap.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.LoganSquare;
import com.fasterxml.jackson.core.JsonGenerator;
@ -26,7 +26,7 @@ import org.mariotaku.restfu.RestConverter;
import org.mariotaku.restfu.http.ValueMap;
import org.mariotaku.restfu.http.mime.Body;
import org.mariotaku.restfu.http.mime.StringBody;
import org.mariotaku.twidere.api.twitter.TwitterException;
import org.mariotaku.microblog.library.MicroBlogException;
import java.io.IOException;
import java.io.StringWriter;
@ -72,9 +72,9 @@ public class CardDataMap implements ValueMap {
'}';
}
public static class BodyConverter implements RestConverter<CardDataMap, Body, TwitterException> {
public static class BodyConverter implements RestConverter<CardDataMap, Body, MicroBlogException> {
@Override
public Body convert(CardDataMap obj) throws ConvertException, IOException, TwitterException {
public Body convert(CardDataMap obj) throws ConvertException, IOException, MicroBlogException {
final StringWriter sw = new StringWriter();
final JsonGenerator generator = LoganSquare.JSON_FACTORY.createGenerator(sw);
generator.writeStartObject();

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CardEntity.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardEntity.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -29,7 +29,7 @@ import com.hannesdorfmann.parcelableplease.annotation.Bagger;
import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.model.util.ParcelMapBagger;
import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger;
import java.util.HashMap;
import java.util.Map;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CardResponse.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardResponse.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Category.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Category.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Contributor.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Contributor.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ConversationTimeline.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ConversationTimeline.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CreateCardData.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardData.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
/**
* Example

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CreateCardResult.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardResult.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CursorSupport.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorSupport.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
/**
* @author Yusuke Yamamoto - yusuke at mac.com

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CursorTimestampResponse.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorTimestampResponse.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/DMResponse.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -9,7 +9,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.Bagger;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.model.util.ParcelMapBagger;
import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/DirectMessage.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessage.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -27,7 +27,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter;
import java.io.IOException;
import java.util.Date;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Entities.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Entities.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/EntitySupport.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/EntitySupport.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
/**
* @author Yusuke Yamamoto - yusuke at mac.com

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ErrorInfo.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ErrorInfo.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ExtendedEntitySupport.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedEntitySupport.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
public interface ExtendedEntitySupport extends EntitySupport {

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ExtendedProfile.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Friendship.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Friendship.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
public class Friendship {
public long getId() {

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/FriendshipUpdate.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/FriendshipUpdate.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import org.mariotaku.restfu.http.SimpleValueMap;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoLocation.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoPoint.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoPoint.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoQuery.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import org.mariotaku.restfu.http.ValueMap;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/HashtagEntity.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/HashtagEntity.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/IDs$$JsonObjectMapper.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.JsonMapper;
import com.fasterxml.jackson.core.JsonGenerator;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/IDs.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.JsonMapper;
import com.bluelinelabs.logansquare.LoganSquare;
@ -25,7 +25,7 @@ import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import org.mariotaku.twidere.api.annotation.NoObfuscate;
import org.mariotaku.microblog.library.annotation.NoObfuscate;
import java.io.IOException;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Indices.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Indices.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/IndicesConverter.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IndicesConverter.java
View File

@ -17,15 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import org.mariotaku.twidere.api.twitter.model.Indices;
import java.io.IOException;
/**

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Language.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Language.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Location.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Location.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaEntity.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
@ -29,7 +29,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.Bagger;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.model.util.ParcelMapBagger;
import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaUploadResponse.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/NewDm.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewDm.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import org.mariotaku.restfu.http.SimpleValueMap;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/NewMediaMetadata.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewMediaMetadata.java
View File

@ -1,4 +1,4 @@
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/PageableResponseList$$JsonObjectMapper.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import com.bluelinelabs.logansquare.JsonMapper;
import com.bluelinelabs.logansquare.LoganSquare;

4
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/PageableResponseList.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java
View File

@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import org.mariotaku.twidere.api.annotation.NoObfuscate;
import org.mariotaku.microblog.library.annotation.NoObfuscate;
/**
* Response list supports cursor pagination

2
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Paging.java → twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Paging.java
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.api.twitter.model;
package org.mariotaku.microblog.library.twitter.model;
import org.mariotaku.restfu.http.SimpleValueMap;

Some files were not shown because too many files have changed in this diff Show More