Merge pull request #3095 from PiwwowPants/feature/full-address-in-compose

Added a check for showing correspondent name to RecipientSelectView
This commit is contained in:
cketti 2018-01-19 01:05:28 +01:00 committed by GitHub
commit 7c3b90b356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -32,6 +32,7 @@ import android.widget.ListPopupWindow;
import android.widget.ListView;
import android.widget.TextView;
import com.fsck.k9.K9;
import com.fsck.k9.R;
import com.fsck.k9.activity.AlternateRecipientAdapter;
import com.fsck.k9.activity.AlternateRecipientAdapter.AlternateRecipientListener;
@ -605,7 +606,8 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem
}
public String getDisplayNameOrAddress() {
String displayName = getDisplayName();
final String displayName = K9.showCorrespondentNames() ? getDisplayName() : null;
if (displayName != null) {
return displayName;
}