Merge pull request #1542

60fe1b61 Add parse_uri to wallet2_api (MoroccanMalinois)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:47:42 -08:00
commit c6ec939626
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 8 additions and 0 deletions

View file

@ -1087,6 +1087,11 @@ void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction
} }
bool WalletImpl::parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error)
{
return m_wallet->parse_uri(uri, address, payment_id, amount, tx_description, recipient_name, unknown_parameters, error);
}
} // namespace } // namespace
namespace Bitmonero = Monero; namespace Bitmonero = Monero;

View file

@ -109,6 +109,7 @@ public:
virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const; virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const;
virtual void startRefresh(); virtual void startRefresh();
virtual void pauseRefresh(); virtual void pauseRefresh();
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error);
private: private:
void clearStatus(); void clearStatus();

View file

@ -469,6 +469,8 @@ struct Wallet
* \return true if the signature verified, false otherwise * \return true if the signature verified, false otherwise
*/ */
virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0; virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
}; };
/** /**