From eddf7b7a49a96d491ae47e6064fafe69234ee8c3 Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 24 Oct 2018 15:31:39 +0200 Subject: [PATCH] correct swap of user_id and username --- src/identity.cc | 4 ++-- src/message.cc | 2 ++ test/basic_doctest.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/identity.cc b/src/identity.cc index 6dc55f7..ae403bf 100644 --- a/src/identity.cc +++ b/src/identity.cc @@ -17,8 +17,8 @@ namespace pEp { Identity::Identity(string address, string username, string user_id, string fpr, int comm_type, string lang, identity_flags_t flags) - : _ident(new_identity(address.c_str(), fpr.c_str(), username.c_str(), - user_id.c_str()), &::free_identity) + : _ident(new_identity(address.c_str(), fpr.c_str(), user_id.c_str(), + username.c_str()), &::free_identity) { if (!_ident) throw bad_alloc(); diff --git a/src/message.cc b/src/message.cc index c58d760..9bc9664 100644 --- a/src/message.cc +++ b/src/message.cc @@ -358,6 +358,8 @@ namespace pEp { static object update(Identity ident) { + if (ident.address().empty()) + throw runtime_error("at least address needed"); update_identity(adapter.session(), ident); return object(ident); } diff --git a/test/basic_doctest.py b/test/basic_doctest.py index 4e70315..a93c20a 100644 --- a/test/basic_doctest.py +++ b/test/basic_doctest.py @@ -1,11 +1,11 @@ """ >>> import pEp ->>> me = pEp.Identity("alice.smith@peptest.ch", "23", "Alice Smith") +>>> me = pEp.Identity("alice.smith@peptest.ch", "Alice Smith", "23") >>> me.username 'Alice Smith' >>> print(me) Alice Smith ->>> you = pEp.Identity("bob.bourne@peptest.ch", "42", "Bob Bourne") +>>> you = pEp.Identity("bob.bourne@peptest.ch", "Bob Bourne", "42") >>> print(you) Bob Bourne >>> m = pEp.outgoing_message(me)