From 2028bb9b58a78577dfca037c39a887c7df53d802 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Fri, 12 Feb 2016 20:48:28 +0100 Subject: green bubbles and setting to choose green or white bubbles removed --- .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/ui/adapter') diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 3e3bf98b..f87b3d51 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -79,14 +79,11 @@ public class MessageAdapter extends ArrayAdapter { return true; } }; - private boolean mIndicateReceived = false; - private boolean mUseWhiteBackground = false; public MessageAdapter(ConversationActivity activity, List messages) { super(activity, 0, messages); this.activity = activity; metrics = getContext().getResources().getDisplayMetrics(); - updatePreferences(); } public void setOnContactPictureClicked(OnContactPictureClicked listener) { @@ -509,7 +506,7 @@ public class MessageAdapter extends ArrayAdapter { } } - boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground)); + boolean darkBackground = (type == RECEIVED && !isInValidSession); if (type == STATUS) { if (conversation.getMode() == Conversation.MODE_SINGLE) { @@ -601,11 +598,6 @@ public class MessageAdapter extends ArrayAdapter { if (type == RECEIVED) { if(isInValidSession) { - if (mUseWhiteBackground) { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white); - } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received); - } viewHolder.encryption.setVisibility(View.GONE); } else { viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); @@ -655,11 +647,6 @@ public class MessageAdapter extends ArrayAdapter { Toast.makeText(activity,R.string.no_application_found_to_display_location,Toast.LENGTH_SHORT).show(); } - public void updatePreferences() { - this.mIndicateReceived = activity.indicateReceived(); - this.mUseWhiteBackground = activity.useWhiteBackground(); - } - public interface OnContactPictureClicked { void onContactPictureClicked(Message message); } -- cgit v1.2.3