Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 23:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

use ConfirmIdentityDialog instead of ReceiveKeyDialog

Browse Source 
also switch to AppCompatDialog
This commit is contained in:
agrajaghh
2015-05-21 19:13:03 +02:00
committed by Moxie Marlinspike
parent f1e8357131
commit 72bd6d5844
5 changed files with 21 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@@ -43,6 +43,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.MmsSmsDatabase;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord;
@@ -369,10 +370,21 @@ public class ConversationItem extends LinearLayout {
contactPhoto.setVisibility(View.VISIBLE);
}
private IdentityKeyMismatch getKeyMismatch(final MessageRecord record) {
if (record.isIdentityMismatchFailure()) {
for (final IdentityKeyMismatch mismatch : record.getIdentityKeyMismatches()) {
if (mismatch.getRecipientId() == record.getIndividualRecipient().getRecipientId()) {
return mismatch;
}
}
}
return null;
}
/// Event handlers
private void handleKeyExchangeClicked() {
ReceiveKeyDialog.build(context, masterSecret, messageRecord).show();
new ConfirmIdentityDialog(context, masterSecret, messageRecord, getKeyMismatch(messageRecord)).show();
}
private class ThumbnailClickListener implements ThumbnailView.ThumbnailClickListener {