narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed click area for pgp key in contact details

Browse source
This commit is contained in:
Daniel Gultsch 2017-04-25 15:23:01 +02:00
parent e6eb58f2d7
commit 4d1308e138
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -505,26 +505,23 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
}
key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
view.setOnClickListener(new OnClickListener() {
final OnClickListener openKey = new OnClickListener() {
@Override
public void onClick(View v) {
PgpEngine pgp = ContactDetailsActivity.this.xmppConnectionService
.getPgpEngine();
if (pgp != null) {
PendingIntent intent = pgp.getIntentForKey(contact);
if (intent != null) {
try {
startIntentSenderForResult(
intent.getIntentSender(), 0, null, 0,
0, 0);
} catch (SendIntentException e) {
}
}
PgpEngine pgp = ContactDetailsActivity.this.xmppConnectionService.getPgpEngine();
try {
startIntentSenderForResult(
pgp.getIntentForKey(contact).getIntentSender(), 0, null, 0,
0, 0);
} catch (Throwable e) {
Toast.makeText(ContactDetailsActivity.this,R.string.openpgp_error,Toast.LENGTH_SHORT).show();
}
}
});
};
view.setOnClickListener(openKey);
key.setOnClickListener(openKey);
keyType.setOnClickListener(openKey);
keys.addView(view);
}
keysWrapper.setVisibility(hasKeys ? View.VISIBLE : View.GONE);

2
src/main/res/layout/contact.xml
View file

@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"
android:fontFamily="monospace"
android:visibility="gone" />

6
src/main/res/layout/contact_key.xml
View file

@ -23,7 +23,8 @@
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"
android:longClickable="true"/>
android:longClickable="true"
android:clickable="true"/>
<TextView
android:id="@+id/key_type"
@ -34,7 +35,8 @@
android:maxLines="1"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeInfo"
android:longClickable="true"/>
android:longClickable="true"
android:clickable="true"/>
<TextView
android:id="@+id/key_trust"