From 3bb2b7b791d61559d8090fc63e89eee7bc689fc0 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 31 May 2022 21:08:51 -0500
Subject: [PATCH] Execute command and show note or error response

---
 src/cheogram/res/layout/command_note.xml      |  30 +++
 src/cheogram/res/layout/command_page.xml      |  27 ++
 .../conversations/entities/Conversation.java  | 253 ++++++++++++++++++
 .../ui/ConversationFragment.java              |  55 +---
 src/main/res/layout/fragment_conversation.xml |   2 +-
 5 files changed, 315 insertions(+), 52 deletions(-)
 create mode 100644 src/cheogram/res/layout/command_note.xml
 create mode 100644 src/cheogram/res/layout/command_page.xml

diff --git a/src/cheogram/res/layout/command_note.xml b/src/cheogram/res/layout/command_note.xml
new file mode 100644
index 0000000000000000000000000000000000000000..79c4f35fd18002ba1ff868acbf9e55aae0a8dc8a
--- /dev/null
+++ b/src/cheogram/res/layout/command_note.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:visibility="gone"
+            android:id="@+id/error_icon"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_centerHorizontal="true"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_send_cancel_dnd" />
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="?android:attr/listPreferredItemHeightSmall"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="@style/TextAppearance.Conversations.Body1"
+            android:textColor="?attr/edit_text_color" />
+
+    </LinearLayout>
+</layout>
diff --git a/src/cheogram/res/layout/command_page.xml b/src/cheogram/res/layout/command_page.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c624dd8f8b016b26143952cbfa78a06465254dd9
--- /dev/null
+++ b/src/cheogram/res/layout/command_page.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/form"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        <Button
+            android:id="@+id/done"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            style="@style/Widget.Conversations.Button.Borderless"
+            android:background="?attr/colorPrimary"
+            android:textColor="@color/white"
+            android:text="Done" />
+    </RelativeLayout>
+</layout>
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index c53a4e304fa3ed618993f932b645edf12a080db4..da60ce91ca0060f9e0315f6d03d7717c8817aa50 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -3,10 +3,19 @@ package eu.siacs.conversations.entities;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.tabs.TabLayout;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Lists;
 
@@ -22,18 +31,24 @@ import java.util.ListIterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.OmemoSetting;
 import eu.siacs.conversations.crypto.PgpDecryptionService;
+import eu.siacs.conversations.databinding.CommandPageBinding;
+import eu.siacs.conversations.databinding.CommandNoteBinding;
 import eu.siacs.conversations.persistance.DatabaseBackend;
 import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.QuickConversationsService;
+import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.JidHelper;
 import eu.siacs.conversations.utils.MessageUtils;
 import eu.siacs.conversations.utils.UIHelper;
+import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
 import eu.siacs.conversations.xmpp.mam.MamReference;
+import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
 import static eu.siacs.conversations.entities.Bookmark.printableValue;
 
@@ -86,6 +101,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     private ChatState mIncomingChatState = Config.DEFAULT_CHAT_STATE;
     private String mFirstMamReference = null;
     protected int mCurrentTab = -1;
+    protected ConversationPagerAdapter pagerAdapter = new ConversationPagerAdapter();
 
     public Conversation(final String name, final Account account, final Jid contactJid,
                         final int mode) {
@@ -1125,6 +1141,14 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return 1;
     }
 
+    public void startCommand(Element command, XmppConnectionService xmppConnectionService) {
+        pagerAdapter.startCommand(command, xmppConnectionService);
+    }
+
+    public void setupViewPager(ViewPager pager, TabLayout tabs) {
+        pagerAdapter.setupViewPager(pager, tabs);
+    }
+
     public interface OnMessageFound {
         void onMessageFound(final Message message);
     }
@@ -1146,4 +1170,233 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             return message;
         }
     }
+
+    public class ConversationPagerAdapter extends PagerAdapter {
+        protected ViewPager mPager = null;
+        protected TabLayout mTabs = null;
+        ArrayList<CommandSession> sessions = new ArrayList<>();
+
+        public void setupViewPager(ViewPager pager, TabLayout tabs) {
+            mPager = pager;
+            mTabs = tabs;
+            pager.setAdapter(this);
+            tabs.setupWithViewPager(mPager);
+            pager.setCurrentItem(getCurrentTab());
+
+            mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                public void onPageScrollStateChanged(int state) { }
+                public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { }
+
+                public void onPageSelected(int position) {
+                    setCurrentTab(position);
+                }
+            });
+        }
+
+        public void startCommand(Element command, XmppConnectionService xmppConnectionService) {
+            CommandSession session = new CommandSession(command.getAttribute("name"));
+
+            final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
+            packet.setTo(command.getAttributeAsJid("jid"));
+            final Element c = packet.addChild("command", Namespace.COMMANDS);
+            c.setAttribute("node", command.getAttribute("node"));
+            c.setAttribute("action", "execute");
+            xmppConnectionService.sendIqPacket(getAccount(), packet, (a, iq) -> {
+                mPager.post(() -> {
+                    session.updateWithResponse(iq);
+                });
+            });
+
+            sessions.add(session);
+            notifyDataSetChanged();
+            mPager.setCurrentItem(getCount() - 1);
+        }
+
+        @NonNull
+        @Override
+        public Object instantiateItem(@NonNull ViewGroup container, int position) {
+            if (position < 2) {
+              return mPager.getChildAt(position);
+            }
+
+            CommandSession session = sessions.get(position-2);
+            CommandPageBinding binding = DataBindingUtil.inflate(LayoutInflater.from(container.getContext()), R.layout.command_page, container, false);
+            container.addView(binding.getRoot());
+            binding.form.setAdapter(session);
+            binding.done.setOnClickListener((button) -> {
+                sessions.remove(session);
+                notifyDataSetChanged();
+            });
+
+            session.setBinding(binding);
+            return session;
+        }
+
+        @Override
+        public void destroyItem(@NonNull ViewGroup container, int position, Object o) {
+            if (position < 2) return;
+
+            container.removeView(((CommandSession) o).getView());
+        }
+
+        @Override
+        public int getItemPosition(Object o) {
+            if (o == mPager.getChildAt(0)) return PagerAdapter.POSITION_UNCHANGED;
+            if (o == mPager.getChildAt(1)) return PagerAdapter.POSITION_UNCHANGED;
+
+            int pos = sessions.indexOf(o);
+            if (pos < 0) return PagerAdapter.POSITION_NONE;
+            return pos + 2;
+        }
+
+        @Override
+        public int getCount() {
+            int count = 2 + sessions.size();
+            if (count > 2) {
+                mTabs.setTabMode(TabLayout.MODE_SCROLLABLE);
+            } else {
+                mTabs.setTabMode(TabLayout.MODE_FIXED);
+            }
+            return count;
+        }
+
+        @Override
+        public boolean isViewFromObject(@NonNull View view, @NonNull Object o) {
+            if (view == o) return true;
+
+            if (o instanceof CommandSession) {
+                return ((CommandSession) o).getView() == view;
+            }
+
+            return false;
+        }
+
+        @Nullable
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 0:
+                    return "Conversation";
+                case 1:
+                    return "Commands";
+                default:
+                    CommandSession session = sessions.get(position-2);
+                    if (session == null) return super.getPageTitle(position);
+                    return session.getTitle();
+            }
+        }
+
+        class CommandSession extends RecyclerView.Adapter<CommandSession.ViewHolder> {
+            abstract class ViewHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+                protected T binding;
+
+                public ViewHolder(T binding) {
+                    super(binding.getRoot());
+                    this.binding = binding;
+                }
+
+                abstract public void bind(IqPacket iq, int position);
+            }
+
+            class ErrorViewHolder extends ViewHolder<CommandNoteBinding> {
+                public ErrorViewHolder(CommandNoteBinding binding) { super(binding); }
+
+                @Override
+                public void bind(IqPacket iq, int position) {
+                    binding.errorIcon.setVisibility(View.VISIBLE);
+
+                    Element error = iq.findChild("error");
+                    if (error == null) return;
+                    String text = error.findChildContent("text", "urn:ietf:params:xml:ns:xmpp-stanzas");
+                    if (text == null || text.equals("")) {
+                        text = error.getChildren().get(0).getName();
+                    }
+                    binding.message.setText(text);
+                }
+            }
+
+            class NoteViewHolder extends ViewHolder<CommandNoteBinding> {
+                public NoteViewHolder(CommandNoteBinding binding) { super(binding); }
+
+                @Override
+                public void bind(IqPacket iq, int position) {
+                    Element command = iq.findChild("command", "http://jabber.org/protocol/commands");
+                    if (command == null) return;
+                    Element note = command.findChild("note", "http://jabber.org/protocol/commands");
+                    if (note == null) return;
+                    binding.message.setText(note.getContent());
+
+                    if (note.getAttribute("type").equals("error")) {
+                        binding.errorIcon.setVisibility(View.VISIBLE);
+                    }
+                }
+            }
+
+            final int TYPE_ERROR = 1;
+            final int TYPE_NOTE = 2;
+
+            protected String mTitle;
+            protected CommandPageBinding mBinding = null;
+            protected IqPacket response = null;
+
+            CommandSession(String title) {
+                mTitle = title;
+            }
+
+            public String getTitle() {
+                return mTitle;
+            }
+
+            public void updateWithResponse(IqPacket iq) {
+                this.response = iq;
+                notifyDataSetChanged();
+            }
+
+            @Override
+            public int getItemCount() {
+                if (response == null) return 0;
+                return 1;
+            }
+
+            @Override
+            public int getItemViewType(int position) {
+                if (response == null) return -1;
+
+                if (response.getType() == IqPacket.TYPE.RESULT) {
+                    return TYPE_NOTE;
+                } else {
+                    return TYPE_ERROR;
+                }
+            }
+
+            @Override
+            public ViewHolder onCreateViewHolder(ViewGroup container, int viewType) {
+                switch(viewType) {
+                    case TYPE_ERROR: {
+                        CommandNoteBinding binding = DataBindingUtil.inflate(LayoutInflater.from(container.getContext()), R.layout.command_note, container, false);
+                        return new ErrorViewHolder(binding);
+                    }
+                    case TYPE_NOTE: {
+                        CommandNoteBinding binding = DataBindingUtil.inflate(LayoutInflater.from(container.getContext()), R.layout.command_note, container, false);
+                        return new NoteViewHolder(binding);
+                    }
+                    default:
+                        return null;
+                }
+            }
+
+            @Override
+            public void onBindViewHolder(ViewHolder viewHolder, int position) {
+                viewHolder.bind(response, position);
+            }
+
+            public View getView() {
+                return mBinding.getRoot();
+            }
+
+            public void setBinding(CommandPageBinding b) {
+                mBinding = b;
+            }
+        }
+    }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index bd4ead7ea2b004d5a94e868665894d1c54e080b7..2f7b82c7909b86aacb2d1c4f13c86664315c0fae 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1243,22 +1243,12 @@ public class ConversationFragment extends XmppFragment
                     new EditMessageActionModeCallback(this.binding.textinput));
         }
 
-        binding.conversationViewPager.setAdapter(new StaticPagerAdapter(
-            binding.conversationViewPager
-        ));
-        binding.tabLayout.setupWithViewPager(binding.conversationViewPager);
-        binding.conversationViewPager.setCurrentItem(conversation.getCurrentTab());
-        binding.conversationViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            public void onPageScrollStateChanged(int state) { }
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { }
-
-            public void onPageSelected(int position) {
-                conversation.setCurrentTab(position);
-            }
-        });
-
+        conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout);
         commandAdapter = new CommandAdapter((XmppActivity) getActivity());
         binding.commandsView.setAdapter(commandAdapter);
+        binding.commandsView.setOnItemClickListener((parent, view, position, id) -> {
+            conversation.startCommand(commandAdapter.getItem(position), activity.xmppConnectionService);
+        });
         Jid commandJid = conversation.getContact().resourceWhichSupport(Namespace.COMMANDS);
         if (commandJid != null) {
             binding.tabLayout.setVisibility(View.VISIBLE);
@@ -3647,41 +3637,4 @@ public class ConversationFragment extends XmppFragment
         }
         return activity;
     }
-
-    public class StaticPagerAdapter extends PagerAdapter {
-        ViewPager mPager;
-
-        StaticPagerAdapter(ViewPager pager) {
-            mPager = pager;
-        }
-
-        @NonNull
-        @Override
-        public View instantiateItem(@NonNull ViewGroup container, int position) {
-            return mPager.getChildAt(position);
-        }
-
-        @Override
-        public int getCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isViewFromObject(@NonNull View view, @NonNull Object o) {
-            return view == o;
-        }
-
-        @Nullable
-        @Override
-        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return "Conversation";
-                case 1:
-                    return "Commands";
-                default:
-                    return super.getPageTitle(position);
-            }
-        }
-    }
 }
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 945aca1ef9e31ab3ff44a23517cd3985f0be1580..791fb68fdd4b1e79d1eb60ed2024be083f9262ad 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -17,7 +17,7 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:tabGravity="fill"
             app:tabIndicatorColor="@color/white87"
-            app:tabMode="fixed"
+            app:tabMode="scrollable"
             app:tabSelectedTextColor="@color/white"
             app:tabTextColor="@color/white70" />