{Message,Status}MenuDialog から DetailDialog に hashtag のコマンドを移動

1 files changed, 12 insertions, 3 deletions

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 c000976c..4b16cf49 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
@@ -24,6 +24,7 @@
 
 package net.lacolaco.smileessence.view.dialog;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.graphics.drawable.ColorDrawable;
@@ -35,6 +36,7 @@ import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.command.Command;
+import net.lacolaco.smileessence.command.CommandOpenHashtagDialog;
 import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.data.Account;
@@ -216,17 +218,24 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
     }
 
     private List<Command> getCommands() {
+        Activity activity = getActivity();
         List<Command> commands = new ArrayList<>();
         // Mentions
+        if (message.getSender() != message.getRecipient()) {
+            commands.add(new CommandOpenUserDetail(activity, message.getRecipient().getScreenName()));
+        }
         for (String screenName : message.getMentions()) {
-            commands.add(new CommandOpenUserDetail(getActivity(), screenName));
+            commands.add(new CommandOpenUserDetail(activity, screenName));
+        }
+        for (String hashtag : message.getHashtags()) {
+            commands.add(new CommandOpenHashtagDialog(activity, hashtag));
         }
         // URL
         for (String url : message.getUrlsExpanded()) {
-            commands.add(new CommandOpenURL(getActivity(), url));
+            commands.add(new CommandOpenURL(activity, url));
         }
         for (String url : message.getMediaUrls()) {
-            commands.add(new CommandOpenURL(getActivity(), url));
+            commands.add(new CommandOpenURL(activity, url));
         }
         return commands;
     }