TwitterUtils を整理（WIP）

8 files changed, 22 insertions, 28 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
index 2fb4ea9e..439c8c56 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
@@ -46,7 +46,6 @@ import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.logging.Logger;
 import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.task.TweetTask;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.util.BitmapThumbnailTask;
 import net.lacolaco.smileessence.util.IntentUtils;
 import net.lacolaco.smileessence.util.UIHandler;
@@ -144,7 +143,7 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
             if (postState.getInReplyToStatusID() >= 0) {
                 viewGroupReply.setVisibility(View.VISIBLE);
                 final Account account = activity.getCurrentAccount();
-                TwitterUtils.tryGetStatus(account, postState.getInReplyToStatusID(), new TwitterUtils.StatusCallback() {
+                account.tryGetStatus(postState.getInReplyToStatusID(), new Account.StatusCallback() {
                     @Override
                     public void success(Tweet tweet) {
                         View header = viewGroupReply.findViewById(R.id.layout_post_reply_status);
@@ -188,9 +187,10 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
     }
 
     public void updateTextCount(CharSequence s) {
-        int remainingCount = 140 - TwitterUtils.getFixedTextLength(s.toString());
+        Validator validator = new Validator();
+        int remainingCount = 140 - validator.getTweetLength(s.toString());
         if (!TextUtils.isEmpty(PostState.getState().getMediaFilePath())) {
-            remainingCount -= new Validator().getShortUrlLength();
+            remainingCount -= validator.getShortUrlLength();
         }
         textViewCount.setText(String.valueOf(remainingCount));
         if (remainingCount == 140) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
index 7fe1c5cd..676c2db0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
@@ -41,7 +41,6 @@ import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.entity.Account;
 import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.twitter.task.DeleteMessageTask;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.view.DialogHelper;
 import net.lacolaco.smileessence.view.adapter.MessageListAdapter;
 import net.lacolaco.smileessence.view.listener.ListItemClickListener;
@@ -80,7 +79,7 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
     public void onClick(final View v) {
         final MainActivity activity = (MainActivity) getActivity();
         final Account account = activity.getCurrentAccount();
-        TwitterUtils.tryGetMessage(account, getMessageID(), new TwitterUtils.MessageCallback() {
+        account.tryGetMessage(getMessageID(), new Account.MessageCallback() {
             @Override
             public void success(DirectMessage message) {
                 switch (v.getId()) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageMenuDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageMenuDialogFragment.java
index d2c487b3..dcf24f38 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageMenuDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageMenuDialogFragment.java
@@ -34,7 +34,6 @@ import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.command.CommandSaveAsTemplate;
 import net.lacolaco.smileessence.entity.Account;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter;
 
 import java.util.ArrayList;
@@ -70,7 +69,7 @@ public class MessageMenuDialogFragment extends MenuDialogFragment {
         final MainActivity activity = (MainActivity) getActivity();
         final Account account = activity.getCurrentAccount();
 
-        TwitterUtils.tryGetMessage(account, getMessageID(), new TwitterUtils.MessageCallback() {
+        account.tryGetMessage(getMessageID(), new Account.MessageCallback() {
             @Override
             public void success(DirectMessage message) {
                 List<Command> commands = getCommands(activity, message, account);
@@ -93,7 +92,7 @@ public class MessageMenuDialogFragment extends MenuDialogFragment {
     public void addBottomCommands(Activity activity, DirectMessage message, Account account, ArrayList<Command> commands) {
         commands.add(new CommandSaveAsTemplate(activity, message.getText()));
         //User
-        for (String screenName : TwitterUtils.getScreenNames(message, null)) {
+        for (String screenName : message.getMentioningScreenNames()) {
             commands.add(new CommandOpenUserDetail(activity, screenName, account));
         }
         for (Command command : getHashtagCommands(activity, message)) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
index 8e9c9402..acd9420b 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
@@ -43,7 +43,6 @@ import com.twitter.Validator;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.twitter.task.SendMessageTask;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.data.PostState;
 
 import twitter4j.Twitter;
@@ -94,9 +93,10 @@ public class SendMessageDialogFragment extends StackableDialogFragment implement
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        int remainingCount = 140 - TwitterUtils.getFixedTextLength(s.toString());
+        Validator validator = new Validator();
+        int remainingCount = 140 - validator.getTweetLength(s.toString());
         if (!TextUtils.isEmpty(PostState.getState().getMediaFilePath())) {
-            remainingCount -= new Validator().getShortUrlLength();
+            remainingCount -= validator.getShortUrlLength();
         }
         textViewCount.setText(String.valueOf(remainingCount));
         if (remainingCount == 140) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
index 2965c465..d21c67c7 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
@@ -48,7 +48,6 @@ import net.lacolaco.smileessence.twitter.task.DeleteStatusTask;
 import net.lacolaco.smileessence.twitter.task.FavoriteTask;
 import net.lacolaco.smileessence.twitter.task.RetweetTask;
 import net.lacolaco.smileessence.twitter.task.UnfavoriteTask;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.view.DialogHelper;
 import net.lacolaco.smileessence.data.PostState;
 import net.lacolaco.smileessence.view.adapter.StatusListAdapter;
@@ -135,7 +134,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
         if (inReplyToStatusId == -1) {
             listView.setVisibility(View.GONE);
         } else {
-            TwitterUtils.tryGetStatus(account, inReplyToStatusId, new TwitterUtils.StatusCallback() {
+            account.tryGetStatus(inReplyToStatusId, new Account.StatusCallback() {
                 @Override
                 public void success(Tweet tweet) {
                     adapter.addToTop(new StatusViewModel(tweet));
@@ -272,7 +271,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
         if (account.userID == originalTweet.getUser().getId()) {
             builder.addScreenName(account.screenName);
         }
-        builder.addScreenNames(TwitterUtils.getScreenNames(originalTweet, account.screenName));
+        builder.addScreenNames(originalTweet.getMentioningScreenNames(account.screenName));
 
         String text = builder.buildText();
         int selStart = originalTweet.getUser().getScreenName().length() + 2; // "@" and " "
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusMenuDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusMenuDialogFragment.java
index e73f03b4..77c3ea29 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusMenuDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusMenuDialogFragment.java
@@ -35,7 +35,6 @@ import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.command.CommandSaveAsTemplate;
 import net.lacolaco.smileessence.entity.Account;
 import net.lacolaco.smileessence.entity.Tweet;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter;
 
 import java.util.ArrayList;
@@ -43,7 +42,6 @@ import java.util.List;
 
 import twitter4j.HashtagEntity;
 import twitter4j.MediaEntity;
-import twitter4j.Status;
 import twitter4j.URLEntity;
 
 public class StatusMenuDialogFragment extends MenuDialogFragment {
@@ -88,7 +86,7 @@ public class StatusMenuDialogFragment extends MenuDialogFragment {
     public void addBottomCommands(Activity activity, Tweet tweet, Account account, ArrayList<Command> commands) {
         commands.add(new CommandSaveAsTemplate(activity, tweet.getOriginalTweet().getText()));
         //User
-        for (String screenName : TwitterUtils.getScreenNames(tweet, null)) {
+        for (String screenName : tweet.getMentioningScreenNames()) {
             commands.add(new CommandOpenUserDetail(activity, screenName, account));
         }
         for (Command command : getHashtagCommands(activity, tweet)) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
index 146d3d8d..e7be7485 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
@@ -115,7 +115,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
     public void onClick(final View v) {
         final MainActivity activity = (MainActivity) getActivity();
         final Account account = activity.getCurrentAccount();
-        TwitterUtils.tryGetUser(account, getUserID(), new TwitterUtils.UserCallback() {
+        account.tryGetUser(getUserID(), new Account.UserCallback() {
             @Override
             public void success(final User user) {
                 switch (v.getId()) {
@@ -128,23 +128,23 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
                         break;
                     }
                     case R.id.textview_user_detail_screenname: {
-                        openUrl(TwitterUtils.getUserHomeURL(user.getScreenName()));
+                        openUrl(user.getUserHomeURL());
                         break;
                     }
                     case R.id.textview_user_detail_tweet_count: {
-                        openUrl(TwitterUtils.getUserHomeURL(user.getScreenName()));
+                        openUrl(user.getUserHomeURL());
                         break;
                     }
                     case R.id.textview_user_detail_friend_count: {
-                        openUrl(String.format("%s/following", TwitterUtils.getUserHomeURL(user.getScreenName())));
+                        openUrl(String.format("%s/following", user.getUserHomeURL()));
                         break;
                     }
                     case R.id.textview_user_detail_follower_count: {
-                        openUrl(String.format("%s/followers", TwitterUtils.getUserHomeURL(user.getScreenName())));
+                        openUrl(String.format("%s/followers", user.getUserHomeURL()));
                         break;
                     }
                     case R.id.textview_user_detail_favorite_count: {
-                        openUrl(String.format("%s/favorites", TwitterUtils.getUserHomeURL(user.getScreenName())));
+                        openUrl(String.format("%s/favorites", user.getUserHomeURL()));
                         break;
                     }
                     case R.id.button_user_detail_follow: {
@@ -252,7 +252,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         tabHost.setCurrentTab(0);
 
         final Account account = activity.getCurrentAccount();
-        TwitterUtils.tryGetUser(account, getUserID(), new TwitterUtils.UserCallback() {
+        account.tryGetUser(getUserID(), new Account.UserCallback() {
             @Override
             public void success(User user) {
                 try {
@@ -296,7 +296,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         }
         String html = description;
         html = html.replaceAll("https?://[\\w/:%#\\$&\\?\\(\\)~\\.=\\+\\-]+", "<a href=\"$0\">$0</a>");
-        html = html.replaceAll("@([a-zA-Z0-9_]+)", "<a href=\"" + TwitterUtils.getUserHomeURL("$1") + "\">$0</a>");
+        html = html.replaceAll("@([a-zA-Z0-9_]+)", "<a href=\"https://twitter.com/$1\">$0</a>");
         html = html.replaceAll("\r\n", "<br />");
         return html;
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java
index 0883b99e..c8005e62 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java
@@ -32,7 +32,6 @@ import net.lacolaco.smileessence.command.Command;
 import net.lacolaco.smileessence.command.CommandSearchOnTwitter;
 import net.lacolaco.smileessence.entity.Account;
 import net.lacolaco.smileessence.entity.User;
-import net.lacolaco.smileessence.twitter.util.TwitterUtils;
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter;
 
 import java.util.ArrayList;
@@ -63,7 +62,7 @@ public class UserMenuDialogFragment extends MenuDialogFragment {
         final MainActivity activity = (MainActivity) getActivity();
         final Account account = activity.getCurrentAccount();
 
-        TwitterUtils.tryGetUser(account, getUserID(), new TwitterUtils.UserCallback() {
+        account.tryGetUser(getUserID(), new Account.UserCallback() {
             @Override
             public void success(User user) {
                 List<Command> commands = getCommands(activity, user, account);