hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
3 changed files with 11 additions and 0 deletions
Showing only changes of commit c4bda2baf1 - Show all commits

View file

@ -833,6 +833,12 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
PopupMenu popup = new PopupMenu(this, view); PopupMenu popup = new PopupMenu(this, view);
popup.inflate(R.menu.verification_choices); popup.inflate(R.menu.verification_choices);
popup.setOnMenuItemClickListener(menuItem -> { popup.setOnMenuItemClickListener(menuItem -> {
if (menuItem.getItemId() == R.id.blind_trust) {
conversation.verifyOtrFingerprint();
xmppConnectionService.syncRosterToDisk(conversation.getAccount());
return true;
}
Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class); Intent intent = new Intent(ConversationsActivity.this, VerifyOTRActivity.class);
intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT); intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString()); intent.putExtra("contact", conversation.getContact().getJid().asBareJid().toString());

View file

@ -9,4 +9,8 @@
android:id="@+id/manual_verification" android:id="@+id/manual_verification"
android:title="@string/manually_verify" /> android:title="@string/manually_verify" />
<item
android:id="@+id/blind_trust"
android:title="@string/otr_blind_trust" />
</menu> </menu>

View file

@ -1169,6 +1169,7 @@
<string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string> <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string>
<string name="could_not_verify_fingerprint">Could not verify fingerprint</string> <string name="could_not_verify_fingerprint">Could not verify fingerprint</string>
<string name="manually_verify">Manually verify</string> <string name="manually_verify">Manually verify</string>
<string name="otr_blind_trust">Blind trust</string>
<string name="secrets_do_not_match">Secrets do not match</string> <string name="secrets_do_not_match">Secrets do not match</string>
<string name="ask_question">Ask question</string> <string name="ask_question">Ask question</string>
<string name="verify">Verify</string> <string name="verify">Verify</string>