diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:47:42 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:47:42 -0800 |
| commit | c6ec93962689393291df0ac89267139f5665a44e (patch) | |
| tree | 57bb592c300378ee3bef750d683ed81c4da8cca1 | |
| parent | Merge pull request #1537 (diff) | |
| parent | Add parse_uri to wallet2_api (diff) | |
| download | monero-c6ec93962689393291df0ac89267139f5665a44e.tar.xz | |
Merge pull request #1542
60fe1b61 Add parse_uri to wallet2_api (MoroccanMalinois)
| -rw-r--r-- | src/wallet/api/wallet.cpp | 5 | ||||
| -rw-r--r-- | src/wallet/api/wallet.h | 1 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 5caa52257..da5f776f4 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -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 Bitmonero = Monero; diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index d245a78d0..6c0b8ef23 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -109,6 +109,7 @@ public: virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const; virtual void startRefresh(); 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: void clearStatus(); diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index e5707ad09..fcb4ef2e8 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -469,6 +469,8 @@ struct Wallet * \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 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; }; /** |