Browse Source

pollForEvents(timeout) removed from API. pollForEvents2(session_id, timeout) renamed in pollForEvents(session_id,timeout) in API. Bump API version to 0.20.0. version name: "(42) Gotha".

JSON-152
Roker 2 years ago
parent
commit
db00725360
2 changed files with 12 additions and 4 deletions
  1. +4
    -2
      server/ev_server.cc
  2. +8
    -2
      server/server_version.cc

+ 4
- 2
server/ev_server.cc View File

@ -137,8 +137,10 @@ const FunctionMap functions = {
FP( "Event Listener & Results", new Separator ),
FP( "deliverHandshakeResult" , new Func<PEP_STATUS, In_Pep_Session, In<sync_handshake_result>, In<const identity_list*> > (&deliverHandshakeResult) ),
FP( "pollForEvents" , new Func<js::Array, In<JsonAdapter*,ParamFlag::NoInput>, In<unsigned>> (&JsonAdapter::pollForEvents) ),
FP( "pollForEvents2" , new Func<js::Array, In<JsonAdapter*,ParamFlag::NoInput>, In<std::string>, In<unsigned>> (&JsonAdapter::pollForEvents2) ),
// TODO: session_id shall be removed as soon as we find a way to make it automatic again.
// 'std::this_thread::id'' as ID did not work as expected. :-(
// FP( "pollForEvents" , new Func<js::Array, In<JsonAdapter*,ParamFlag::NoInput>, In<unsigned>> (&JsonAdapter::pollForEvents) ),
FP( "pollForEvents" , new Func<js::Array, In<JsonAdapter*,ParamFlag::NoInput>, In<std::string>, In<unsigned>> (&JsonAdapter::pollForEvents2) ),
FP( "create_session" , new Func<std::string>(&JsonAdapter::create_session)),
FP( "close_session" , new Func<void, In<JsonAdapter*,ParamFlag::NoInput>, In<std::string>> (&JsonAdapter::close_session) ),


+ 8
- 2
server/server_version.cc View File

@ -70,7 +70,10 @@ static const std::string VersionName =
// So we got a new exit with the same number:
// "(39) Eisenach"; // JSON-118: fix to_json() for KeySync callbacks to avoid crashes. Add attachment support in interactive.js \o/
// "(40) Eisenach-Ost"; // remove all Enigmail leftovers. Bump API version to 0.17.0
"(40b) Sättelstädt"; // JSON-139: support for NULL pointers in "const char*" parameters: In<c_string, NullOkay>
// "(40b) Sättelstädt"; // JSON-139: support for NULL pointers in "const char*" parameters: In<c_string, NullOkay>
// 41a,b were skipped, intentionally
"(42) Gotha"; // JSON-152: 2-parameter version of pollForEvents().
} // end of anonymous namespace
////////////////////////////////////////////////////////////////////////////
@ -100,7 +103,10 @@ const ServerVersion& server_version()
//static const ServerVersion sv(0,18,1); // JSON-130: some data members in pEp_identity added
//static const ServerVersion sv(0,18,2); // JSON-135: Add mime_encode_message() and mime_decode_message() to the JSON API
//static const ServerVersion sv(0,18,3); // JSON-137: Add outgoing_message_rating_preview() to the JSON API
static const ServerVersion sv(0,18,4); // JSON-141: fix handling of parameters of type PEP_rating
//static const ServerVersion sv(0,18,4); // JSON-141: fix handling of parameters of type PEP_rating
// 0.19 was skipped intentionally.
static const ServerVersion sv(0,20,0); // JSON-152: 2-parameter version of pollForEvents().
return sv;
}


Loading…
Cancel
Save