Skip to content

Commit 6d9ce24

Browse files
committed
api!: return boolean value from dc_contact_is_verified()
1 parent a4e577d commit 6d9ce24

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

deltachat-ffi/deltachat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5338,8 +5338,7 @@ int dc_contact_is_blocked (const dc_contact_t* contact);
53385338
*
53395339
* @memberof dc_contact_t
53405340
* @param contact The contact object.
5341-
* @return 0: contact is not verified.
5342-
* 2: SELF and contact have verified their fingerprints in both directions.
5341+
* @return 1=contact is verified, 0=contact is not verified.
53435342
*/
53445343
int dc_contact_is_verified (dc_contact_t* contact);
53455344

deltachat-ffi/src/lib.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4333,17 +4333,10 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
43334333
let ffi_contact = &*contact;
43344334
let ctx = &*ffi_contact.context;
43354335

4336-
if block_on(ffi_contact.contact.is_verified(ctx))
4336+
block_on(ffi_contact.contact.is_verified(ctx))
43374337
.context("is_verified failed")
43384338
.log_err(ctx)
4339-
.unwrap_or_default()
4340-
{
4341-
// Return value is essentially a boolean,
4342-
// but we return 2 for true for backwards compatibility.
4343-
2
4344-
} else {
4345-
0
4346-
}
4339+
.unwrap_or_default() as libc::c_int
43474340
}
43484341

43494342
#[no_mangle]

python/src/deltachat/contact.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def unblock(self):
7373

7474
def is_verified(self) -> bool:
7575
"""Return True if the contact is verified."""
76-
return lib.dc_contact_is_verified(self._dc_contact) == 2
76+
return bool(lib.dc_contact_is_verified(self._dc_contact))
7777

7878
def get_verifier(self, contact) -> Optional["Contact"]:
7979
"""Return the address of the contact that verified the contact."""

0 commit comments

Comments
 (0)