Merge custom actions if any (ones other than the defaults) to message actions...

Merge custom actions if any (ones other than the defaults) to message actions and remove test action

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

@@ -21,7 +21,6 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.Toast;
 
 import com.hadisatrio.optional.Optional;
 
@@ -670,7 +669,6 @@ public class RoomFragment extends AbstractChatRoomFragment implements
                     .setReplyAction(presenter::replyMessage)
                     .setEditAction(this::onEditMessage)
                     .setCopyAction(msg -> onCopy(message.getMessage()))
-                    .addAction("Test", message1 -> Toast.makeText(context, "Teste", Toast.LENGTH_SHORT).show())
                     .show(context);
         }
     }

app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessagePopup.java

@@ -6,6 +6,7 @@ import android.support.v4.util.Pair;
 import android.support.v7.app.AlertDialog;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import chat.rocket.android.BackgroundLooper;
@@ -81,6 +82,7 @@ public class MessagePopup {
                                     allowedActions.add(action);
                                 }
                             }
+                            allowedActions.addAll(singleton.otherActions);
                             CharSequence[] items = new CharSequence[allowedActions.size()];
                             for (int j = 0; j < items.length; j++) {
                                 items[j] = allowedActions.get(j).actionName;