Remove GetRatingFromBareKey() again sync
authorThomas
Thu, 27 Jun 2019 16:12:09 +0200
branchsync
changeset 3511986adbdc30a
parent 350 1f1864ea1490
child 352 e21fa36e4183
Remove GetRatingFromBareKey() again
CpEpEngine.cpp
CpEpEngine.h
pEpCOMServerAdapter.idl
     1.1 --- a/CpEpEngine.cpp	Tue Jun 25 20:45:24 2019 +0200
     1.2 +++ b/CpEpEngine.cpp	Thu Jun 27 16:12:09 2019 +0200
     1.3 @@ -1743,25 +1743,6 @@
     1.4  	return S_OK;
     1.5  }
     1.6  
     1.7 -STDMETHODIMP CpEpEngine::GetRatingFromBareKey(BSTR fpr, pEpRating *rating)
     1.8 -{
     1.9 -	assert(fpr);
    1.10 -
    1.11 -	if (!fpr)
    1.12 -		return E_INVALIDARG;
    1.13 -
    1.14 -	string _fpr = utf8_string(fpr);
    1.15 -
    1.16 -	PEP_rating _rating;
    1.17 -	PEP_STATUS status = ::get_rating_from_bare_key(session(), _fpr.c_str(), &_rating);
    1.18 -	if (status != PEP_STATUS_OK)
    1.19 -		return FAIL(L"cannot get key rating for user", status);
    1.20 -
    1.21 -	*rating = (pEpRating)_rating;
    1.22 -
    1.23 -	return S_OK;
    1.24 -}
    1.25 -
    1.26  STDMETHODIMP CpEpEngine::DeliverHandshakeResult(enum SyncHandshakeResult result, SAFEARRAY *identities_sharing)
    1.27  {
    1.28  	sync_handshake_result _result = (sync_handshake_result)result;
     2.1 --- a/CpEpEngine.h	Tue Jun 25 20:45:24 2019 +0200
     2.2 +++ b/CpEpEngine.h	Thu Jun 27 16:12:09 2019 +0200
     2.3 @@ -273,7 +273,6 @@
     2.4  
     2.5  	STDMETHOD(GetKeyRatingForUser)(BSTR userId, BSTR fpr, pEpRating *rating);
     2.6  	STDMETHOD(GetKeyRating)(BSTR fpr, pEpComType *commType);
     2.7 -	STDMETHOD(GetRatingFromBareKey)(BSTR fpr, pEpRating *rating);
     2.8  
     2.9  	// sync API
    2.10  	STDMETHOD(DeliverHandshakeResult)(enum SyncHandshakeResult result, SAFEARRAY *identities_sharing);
     3.1 --- a/pEpCOMServerAdapter.idl	Tue Jun 25 20:45:24 2019 +0200
     3.2 +++ b/pEpCOMServerAdapter.idl	Thu Jun 27 16:12:09 2019 +0200
     3.3 @@ -493,9 +493,6 @@
     3.4  
     3.5  	// Get the comm type a bare key has
     3.6  	[id(53)] HRESULT GetKeyRating([in] BSTR fpr, [out, retval] pEpComType *commType);
     3.7 -
     3.8 -	// Get the rating a bare key has
     3.9 -	[id(54)] HRESULT GetRatingFromBareKey([in] BSTR fpr, [out, retval] pEpRating *rating);
    3.10  };
    3.11  
    3.12  [