mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 09:49:21 +02:00
show 'verified by SELF' as such
core was changed to return SELF from `get_verifier_id()` at https://github.com/deltachat/deltachat-core-rust/pull/4754 - until then, core will return always a contact-id, which is equal to the current state
This commit is contained in:
parent
9fd21b41ea
commit
d208b011c5
5 changed files with 11 additions and 14 deletions
|
@ -1909,15 +1909,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isVerified(JNIEnv *env, job
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getVerifierAddr(JNIEnv *env, jobject obj)
|
|
||||||
{
|
|
||||||
char* temp = dc_contact_get_verifier_addr(get_dc_contact(env, obj));
|
|
||||||
jstring ret = JSTRING_NEW(temp);
|
|
||||||
dc_str_unref(temp);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
JNIEXPORT jint Java_com_b44t_messenger_DcContact_getVerifierId(JNIEnv *env, jobject obj)
|
JNIEXPORT jint Java_com_b44t_messenger_DcContact_getVerifierId(JNIEnv *env, jobject obj)
|
||||||
{
|
{
|
||||||
return dc_contact_get_verifier_id(get_dc_contact(env, obj));
|
return dc_contact_get_verifier_id(get_dc_contact(env, obj));
|
||||||
|
|
|
@ -899,6 +899,7 @@
|
||||||
<string name="contact_not_verified">Cannot verify %1$s.</string>
|
<string name="contact_not_verified">Cannot verify %1$s.</string>
|
||||||
<!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that verified the contact shown. -->
|
<!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that verified the contact shown. -->
|
||||||
<string name="verified_by">Verified by %1$s</string>
|
<string name="verified_by">Verified by %1$s</string>
|
||||||
|
<string name="verified_by_you">Verified by you</string>
|
||||||
<!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
|
<!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
|
||||||
<string name="contact_setup_changed">Changed setup for %1$s.</string>
|
<string name="contact_setup_changed">Changed setup for %1$s.</string>
|
||||||
<string name="verified_group_explain">Verified groups (experimental) provide safety against active attacks. Members are verified with a second factor by other members and messages are always end-to-end-encrypted.</string>
|
<string name="verified_group_explain">Verified groups (experimental) provide safety against active attacks. Members are verified with a second factor by other members and messages are always end-to-end-encrypted.</string>
|
||||||
|
|
|
@ -58,7 +58,6 @@ public class DcContact {
|
||||||
public native boolean wasSeenRecently();
|
public native boolean wasSeenRecently();
|
||||||
public native boolean isBlocked ();
|
public native boolean isBlocked ();
|
||||||
public native boolean isVerified ();
|
public native boolean isVerified ();
|
||||||
public native String getVerifierAddr();
|
|
||||||
public native int getVerifierId ();
|
public native int getVerifierId ();
|
||||||
|
|
||||||
// working with raw c-data
|
// working with raw c-data
|
||||||
|
|
|
@ -313,9 +313,15 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter
|
||||||
itemDataContact = dcContact;
|
itemDataContact = dcContact;
|
||||||
if (!chatIsDeviceTalk) {
|
if (!chatIsDeviceTalk) {
|
||||||
if (dcContact.isVerified()) {
|
if (dcContact.isVerified()) {
|
||||||
String verifiedInfo = context.getString(R.string.verified);
|
int verifierId = dcContact.getVerifierId();
|
||||||
if (!dcContact.getVerifierAddr().isEmpty()) {
|
|
||||||
verifiedInfo = context.getString(R.string.verified_by, dcContact.getVerifierAddr());
|
String verifiedInfo;
|
||||||
|
if (verifierId == DcContact.DC_CONTACT_ID_SELF) {
|
||||||
|
verifiedInfo = context.getString(R.string.verified_by_you);
|
||||||
|
} else if (verifierId != 0) {
|
||||||
|
verifiedInfo = context.getString(R.string.verified_by, dcContext.getContact(verifierId).getAddr());
|
||||||
|
} else {
|
||||||
|
verifiedInfo = context.getString(R.string.verified);
|
||||||
}
|
}
|
||||||
itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_VERIFIED, verifiedInfo, 0, R.drawable.ic_verified));
|
itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_VERIFIED, verifiedInfo, 0, R.drawable.ic_verified));
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,7 +240,7 @@ public class ProfileSettingsFragment extends Fragment
|
||||||
DcContact dcContact = dcContext.getContact(contactId);
|
DcContact dcContact = dcContext.getContact(contactId);
|
||||||
if (dcContact.isVerified()) {
|
if (dcContact.isVerified()) {
|
||||||
int verifierId = dcContact.getVerifierId();
|
int verifierId = dcContact.getVerifierId();
|
||||||
if (verifierId != 0 && verifierId != contactId) {
|
if (verifierId != 0 && verifierId != DcContact.DC_CONTACT_ID_SELF && verifierId != contactId) {
|
||||||
Intent intent = new Intent(getContext(), ProfileActivity.class);
|
Intent intent = new Intent(getContext(), ProfileActivity.class);
|
||||||
intent.putExtra(ProfileActivity.CONTACT_ID_EXTRA, verifierId);
|
intent.putExtra(ProfileActivity.CONTACT_ID_EXTRA, verifierId);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue