Merge branch 'trz/rename' into trz/rebase

Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

1 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 7443c0cb..9d8cc0ba 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -7,6 +7,7 @@ import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,6 +20,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -61,11 +63,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			view = inflater.inflate(R.layout.conversation_list_row,parent, false);
 		}
 		Conversation conversation = getItem(position);
+        // Highlight the currently selected conversation
 		if (this.activity instanceof ConversationActivity) {
-			View swipeableItem = view.findViewById(R.id.swipeable_item);
 			ConversationActivity a = (ConversationActivity) this.activity;
-			int c = !a.isConversationsOverviewHideable() && conversation == a.getSelectedConversation() ? a.getSecondaryBackgroundColor() : a.getPrimaryBackgroundColor();
-			swipeableItem.setBackgroundColor(c);
+			int c = conversation == a.getSelectedConversation() ? a.getSecondaryBackgroundColor() : a.getPrimaryBackgroundColor();
+			view.findViewById(R.id.conversationListRowContent).setBackgroundColor(c);
+            view.findViewById(R.id.conversationListRowFrame).setBackgroundColor(c);
 		}
 		TextView convName = (TextView) view.findViewById(R.id.conversation_name);
 		if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
@@ -77,7 +80,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
 
-        if (Settings.SHOW_ONLINE_STATUS && conversation != null && conversation.getAccount().getStatus() == Account.State.ONLINE) {
+        if (Settings.SHOW_ONLINE_STATUS && conversation.getAccount().getStatus() == Account.State.ONLINE) {
             TextView status = (TextView) view.findViewById(R.id.status);
 
             String color = "#000000";
@@ -138,7 +141,8 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
 		ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
-		loadAvatar(conversation,profilePicture);
+		profilePicture.setOnLongClickListener(new ShowResourcesListDialogListener(activity, conversation.getContact()));
+		loadAvatar(conversation, profilePicture);
 
 		return view;
 	}
@@ -225,4 +229,4 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			return bitmapWorkerTaskReference.get();
 		}
 	}
-}
\ No newline at end of file
+}