From 3f93731300ba0e1c7a57bce1e44942348bb3a049 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 26 Feb 2015 18:31:22 -0800 Subject: [PATCH] Adapt Conflicts UI to work with single-recipient failures. --- proguard.cfg | 3 +- res/layout/message_details_recipient.xml | 6 ++- .../securesms/ConversationItem.java | 9 ++-- .../securesms/MessageDetailsActivity.java | 7 ++- .../MessageDetailsRecipientAdapter.java | 19 +++++--- .../securesms/MessageRecipientListItem.java | 47 ++++++++++++------- 6 files changed, 59 insertions(+), 32 deletions(-) diff --git a/proguard.cfg b/proguard.cfg index 417bcc16e2..c7d20acd46 100644 --- a/proguard.cfg +++ b/proguard.cfg @@ -1,5 +1,6 @@ -keepattributes ** --keep class !android.support.v7.internal.view.menu.**,!org.spongycastle.asn1.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.x509.**,** {*;} + +-keep class !org.spongycastle.crypto.tls.**,!com.doomonafireball.betterpickers.**,!org.w3c.**,!android.support.v7.internal.view.menu.**,!org.spongycastle.asn1.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.x509.**,!org.spongycastle.crypto.agreement.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.math.**,!org.spongycastle.pqc.**,!org.spongycastle.jcajce.provider.asymmetric.**,!org.apache.http.**,** {*;} -dontpreverify -dontoptimize -dontwarn ** diff --git a/res/layout/message_details_recipient.xml b/res/layout/message_details_recipient.xml index c5c2648ccb..4c5f2117a5 100644 --- a/res/layout/message_details_recipient.xml +++ b/res/layout/message_details_recipient.xml @@ -67,7 +67,8 @@ android:paddingBottom="5dp" android:layout_gravity="center_vertical" android:drawableLeft="@drawable/ic_error_white_18dp" - android:text="FIX" /> + android:text="FIX" + android:visibility="gone"/>