ChatViewerFragment: message context menu called on short click also.

app/src/main/java/com/xabber/android/ui/ChatViewerFragment.java

@@ -31,7 +31,7 @@ import com.xabber.android.data.message.chat.ChatManager;
 import com.xabber.android.ui.adapter.ChatMessageAdapter;
 import com.xabber.androiddev.R;
 
-public class ChatViewerFragment extends Fragment {
+public class ChatViewerFragment extends Fragment implements AdapterView.OnItemClickListener {
 
     public static final String ARGUMENT_ACCOUNT = "ARGUMENT_ACCOUNT";
     public static final String ARGUMENT_USER = "ARGUMENT_USER";
@@ -74,6 +74,7 @@ public class ChatViewerFragment extends Fragment {
 
         listView = (ListView) view.findViewById(android.R.id.list);
         listView.setAdapter(chatMessageAdapter);
+        listView.setOnItemClickListener(this);
 
         ColorDrawable background = new ColorDrawable(getActivity().getResources().getIntArray(
                 R.array.account_chat_background)[AccountManager.getInstance().getColorLevel(account)]);
@@ -132,8 +133,9 @@ public class ChatViewerFragment extends Fragment {
 
             @Override
             public void afterTextChanged(Editable text) {
-                if (skipOnTextChanges)
+                if (skipOnTextChanges) {
                     return;
+                }
                 ChatStateManager.getInstance().onComposing(account, user, text);
             }
 
@@ -147,15 +149,11 @@ public class ChatViewerFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-
         ((ChatViewer)getActivity()).registerChat(this);
-
-        registerForContextMenu(listView);
-
         restoreInputState();
     }
 
-    private void restoreInputState() {
+    public void restoreInputState() {
         skipOnTextChanges = true;
 
         inputView.setText(ChatManager.getInstance().getTypedMessage(account, user));
@@ -163,22 +161,24 @@ public class ChatViewerFragment extends Fragment {
                 ChatManager.getInstance().getSelectionEnd(account, user));
 
         skipOnTextChanges = false;
+
+        if (!inputView.getText().toString().isEmpty()) {
+            inputView.requestFocus();
+        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-
         saveInputState();
-
         ((ChatViewer)getActivity()).unregisterChat(this);
-
-        unregisterForContextMenu(listView);
     }
 
     public void saveInputState() {
         ChatManager.getInstance().setTyped(account, user, inputView.getText().toString(),
                 inputView.getSelectionStart(), inputView.getSelectionEnd());
+
+        inputView.clearFocus();
     }
 
     private void sendMessage() {
@@ -281,14 +281,16 @@ public class ChatViewerFragment extends Fragment {
     public void setInputText(String additional) {
         String source = inputView.getText().toString();
         int selection = inputView.getSelectionEnd();
-        if (selection == -1)
+        if (selection == -1) {
             selection = source.length();
-        else if (selection > source.length())
+        } else if (selection > source.length()) {
             selection = source.length();
+        }
         String before = source.substring(0, selection);
         String after = source.substring(selection);
-        if (before.length() > 0 && !before.endsWith("\n"))
+        if (before.length() > 0 && !before.endsWith("\n")) {
             additional = "\n" + additional;
+        }
         inputView.setText(before + additional + after);
         inputView.setSelection(selection + additional.length());
     }
@@ -311,4 +313,11 @@ public class ChatViewerFragment extends Fragment {
             listView.setSelection(size - 1);
         }
     }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        registerForContextMenu(listView);
+        listView.showContextMenuForChild(view);
+        unregisterForContextMenu(listView);
+    }
 }

app/src/main/java/com/xabber/android/ui/adapter/ChatMessageAdapter.java

@@ -17,7 +17,6 @@ package com.xabber.android.ui.adapter;
 import android.app.Activity;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
-import android.text.method.LinkMovementMethod;
 import android.text.style.CharacterStyle;
 import android.text.style.TextAppearanceSpan;
 import android.view.View;
@@ -200,10 +199,11 @@ public class ChatMessageAdapter extends BaseAdapter implements UpdatableAdapter
             view = activity.getLayoutInflater().inflate(layoutId, parent, false);
         }
 
-        return setUpMessageView(messageItem, view);
+        setUpMessageView(messageItem, view);
+        return view;
     }
 
-    private View setUpMessageView(MessageItem messageItem, View view) {
+    private void setUpMessageView(MessageItem messageItem, View view) {
         final boolean incoming = messageItem.isIncoming();
 
 
@@ -240,7 +240,6 @@ public class ChatMessageAdapter extends BaseAdapter implements UpdatableAdapter
         textView.setTextAppearance(activity, appearanceStyle);
         textView.getBackground().setAlpha(127);
         textView.setText(builder);
-        textView.setMovementMethod(LinkMovementMethod.getInstance());
 
         String time = StringUtils.getSmartTimeText(activity, messageItem.getTimestamp());
 
@@ -255,7 +254,6 @@ public class ChatMessageAdapter extends BaseAdapter implements UpdatableAdapter
         if (incoming) {
             setUpAvatar(messageItem, view);
         }
-        return view;
     }
 
     private void setStatusIcon(MessageItem messageItem, View view) {