diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e2fdb3cd6..810242ac0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -7,6 +7,7 @@
+
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e665fca79..bf63c235c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -132,6 +132,7 @@
- @drawable/ic_document_large_light
- @drawable/conversation_list_item_background
+ - #ffcccccc
- @color/core_light_90
- @color/core_light_60
- @color/core_light_35
@@ -275,6 +276,7 @@
- @drawable/ic_document_large_dark
- @drawable/conversation_list_item_background_dark
+ - #ff333333
- #ffdddddd
- #ffdddddd
- @color/core_dark_55
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index be7a05f50..49fcc6c56 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
import android.content.Context;
import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.RippleDrawable;
@@ -38,6 +39,7 @@ import android.widget.TextView;
import com.amulyakhare.textdrawable.TextDrawable;
import com.annimon.stream.Stream;
+import com.b44t.messenger.DcChat;
import com.b44t.messenger.DcLot;
import com.b44t.messenger.DcMsg;
@@ -305,8 +307,19 @@ public class ConversationListItem extends RelativeLayout
private void setRippleColor(Recipient recipient) {
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
- ((RippleDrawable)(getBackground()).mutate())
- .setColor(ColorStateList.valueOf(recipient.getColor().toConversationColor(getContext())));
+ if(threadId==DcChat.DC_CHAT_ID_DEADDROP) {
+ TypedArray ta = getContext().obtainStyledAttributes(new int[] { R.attr.conversation_list_deaddrop_bg_color});
+ setBackgroundColor(ta.getColor(0, 0xffffffff));
+ ta.recycle();
+ }
+ else {
+ TypedArray ta = getContext().obtainStyledAttributes(new int[] { R.attr.conversation_list_item_background});
+ setBackground(ta.getDrawable(0));
+ ta.recycle();
+
+ ((RippleDrawable)(getBackground()).mutate())
+ .setColor(ColorStateList.valueOf(recipient.getColor().toConversationColor(getContext())));
+ }
}
}
diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index 16b740bef..05bf6e1db 100644
--- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -415,7 +415,7 @@ public class ApplicationDcContext extends DcContext {
case DC_EVENT_GET_STRING:
String s;
switch( (int)data1 ) { // the integers are defined in the core and used only here, an enum or sth. like that won't have a big benefit
- case 8: s = context.getString(R.string.contact_request); break;
+ case 8: s = context.getString(R.string.menu_deaddrop); break;
case 13: s = context.getString(R.string.default_status_text); break;
case 42: s = context.getString(R.string.autocrypt__asm_subject); break;
case 43: s = context.getString(R.string.autocrypt__asm_general_body); break;