Change summary
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 33
src/main/res/drawable-hdpi/ic_lock_black_18dp.png | 0
src/main/res/drawable-hdpi/ic_lock_white_18dp.png | 0
src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png | 0
src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png | 0
src/main/res/drawable-mdpi/ic_lock_black_18dp.png | 0
src/main/res/drawable-mdpi/ic_lock_white_18dp.png | 0
src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png | 0
src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png | 0
src/main/res/drawable-xhdpi/ic_lock_black_18dp.png | 0
src/main/res/drawable-xhdpi/ic_lock_white_18dp.png | 0
src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png | 0
src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png | 0
src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png | 0
src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png | 0
21 files changed, 13 insertions(+), 20 deletions(-)
Detailed changes
@@ -211,31 +211,24 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
if (message.getEncryption() == Message.ENCRYPTION_NONE) {
viewHolder.indicator.setVisibility(View.GONE);
} else {
- viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp);
- viewHolder.indicator.setVisibility(View.VISIBLE);
+ boolean verified = false;
if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
- FingerprintStatus status = message.getConversation()
+ final FingerprintStatus status = message.getConversation()
.getAccount().getAxolotlService().getFingerprintTrust(
message.getFingerprint());
-
- if(status == null || (type == SENT ? !status.isTrusted() : (!status.isVerified() && inValidSession))) {
- viewHolder.indicator.setColorFilter(0xffc64545);
- viewHolder.indicator.setAlpha(1.0f);
- } else {
- viewHolder.indicator.clearColorFilter();
- if (darkBackground) {
- viewHolder.indicator.setAlpha(0.7f);
- } else {
- viewHolder.indicator.setAlpha(0.57f);
- }
+ if (status != null && status.isVerified()) {
+ verified = true;
}
+ }
+ if (verified) {
+ viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_verified_user_white_18dp : R.drawable.ic_verified_user_black_18dp);
} else {
- viewHolder.indicator.clearColorFilter();
- if (darkBackground) {
- viewHolder.indicator.setAlpha(0.7f);
- } else {
- viewHolder.indicator.setAlpha(0.57f);
- }
+ viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp);
+ }
+ if (darkBackground) {
+ viewHolder.indicator.setAlpha(0.7f);
+ } else {
+ viewHolder.indicator.setAlpha(0.57f);
}
}