Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 11:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1581 from G10h4ck/rsidentity_jsonapi

Browse source 
Improve rsidentity JSON API
This commit is contained in:
G10h4ck 2019-08-06 13:20:36 +02:00 • committed by GitHub
commit 420f5f3271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 229 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libretroshare/src/retroshare/rsidentity.h
View file

@ -244,14 +244,22 @@ struct RsIdentityUsage : RsSerializable
CIRCLE_MEMBERSHIP_CHECK = 0x13
} ;
RS_DEPRECATED
RsIdentityUsage( uint16_t service, const RsIdentityUsage::UsageCode& code,
const RsGxsGroupId& gid = RsGxsGroupId(),
const RsGxsMessageId& mid = RsGxsMessageId(),
uint64_t additional_id=0,
const std::string& comment = std::string() );
RsIdentityUsage( RsServiceType service,
RsIdentityUsage::UsageCode code,
const RsGxsGroupId& gid = RsGxsGroupId(),
const RsGxsMessageId& mid = RsGxsMessageId(),
uint64_t additional_id=0,
const std::string& comment = std::string() );
/// Id of the service using that identity, as understood by rsServiceControl
uint16_t mServiceId;
RsServiceType mServiceId;
/** Specific code to use. Will allow forming the correct translated message
* in the GUI if necessary. */
@ -504,6 +512,14 @@ struct RsIdentity : RsGxsIfaceHelper
*/
virtual void setDeleteBannedNodesThreshold(uint32_t days) = 0;
/**
* @brief request details of a not yet known identity to the network
* @jsonapi{development}
* @param[in] id id of the identity to request
* @return false on error, true otherwise
*/
virtual bool requestIdentity(const RsGxsId& id) = 0;
RS_DEPRECATED
virtual bool getGroupSerializedData(

20
libretroshare/src/retroshare/rsinit.h
View file

@ -1,9 +1,8 @@
/*******************************************************************************
* libretroshare/src/retroshare: rsinit.h *
* *
* libretroshare: retroshare core library *
* *
* Copyright 2004-2006 by Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2004-2014 Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2016-2019 Gioacchino Mazzurco <gio@altermundi.net> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
@ -19,8 +18,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#ifndef RETROSHARE_INIT_INTERFACE_H
#define RETROSHARE_INIT_INTERFACE_H
#pragma once
/// RetroShare initialization and login API
// Initialize ok, result >= 0
#define RS_INIT_OK 0 // Initialize ok
@ -30,13 +31,6 @@
#define RS_INIT_BASE_DIR_ERROR -2 // AuthGPG::InitAuth failed
#define RS_INIT_NO_KEYRING -3 // Keyring is empty. Need to import it.
/****
* #define RS_USE_PGPSSL 1
***/
#define RS_USE_PGPSSL 1
#include <stdint.h>
#include <list>
#include <map>
@ -340,5 +334,3 @@ struct RsLoginHelper
*/
bool isLoggedIn();
};
#endif