Fixes FS#237: Enable long click in layout instead of programmatically

3 files changed, 7 insertions, 15 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index e93ddbfa..dd190576 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -79,15 +79,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	private OnContactPictureClicked mOnContactPictureClickedListener;
 	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
 
-	private OnLongClickListener openContextMenu = new OnLongClickListener() {
-
-		@Override
-		public boolean onLongClick(View v) {
-			v.showContextMenu();
-			return true;
-		}
-	};
-
 	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
 		this.activity = activity;
@@ -389,7 +380,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 		viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
-		viewHolder.messageBody.setOnLongClickListener(openContextMenu);
 	}
 
     /**
@@ -420,7 +410,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				activity.startDownloadable(message);
 			}
 		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
 	private void displayOpenableMessage(ViewHolder viewHolder,final Message message) {
@@ -435,7 +424,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				openDownloadable(message);
 			}
 		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
 	private void displayLocationMessage(ViewHolder viewHolder, final Message message) {
@@ -450,7 +438,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				showLocation(message);
 			}
 		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
 	private void displayImageMessage(ViewHolder viewHolder,
@@ -485,7 +472,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				openDownloadable(message);
 			}
 		});
-		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
 	@Override
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index d331b3ef..029b0d74 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -46,7 +46,8 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
-                android:background="@color/black87"
+                android:longClickable="true"
+                android:background="@color/primaryText"
                 android:scaleType="centerCrop" />
 
             <github.ankushsachdeva.emojicon.EmojiconTextView
@@ -54,6 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
+                android:longClickable="true"
                 android:textColor="@color/primaryText"
                 android:textSize="?attr/TextSizeBody"
                 app:emojiconSize="?attr/EmojiconSizeBody" />
@@ -61,6 +63,7 @@
             <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
+                android:longClickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 30003309..f59c51f3 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -48,6 +48,7 @@
                 android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
                 android:background="@color/primaryText"
+                android:longClickable="true"
                 android:scaleType="centerCrop" />
 
             <github.ankushsachdeva.emojicon.EmojiconTextView
@@ -55,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
+                android:longClickable="true"
                 android:textColor="@color/primaryText"
                 android:textSize="?attr/TextSizeBody"
                 app:emojiconSize="?attr/EmojiconSizeBody"/>
@@ -62,6 +64,7 @@
             <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
+                android:longClickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone" />