Merge pull request #42 from brave-intl/recover

Saves new paymentId; Uses result instead of boolean
brave · Aug 13, 2018 · 2bfcc97 · 2bfcc97
2 parents 2d9b7f6 + bf2ec96
commit 2bfcc97
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/include/bat/ledger/ledger_client.h b/include/bat/ledger/ledger_client.h
@@ -63,7 +63,7 @@ class LEDGER_EXPORT LedgerClient {
   virtual void OnPromotion(ledger::Promo) = 0;
   virtual void GetPromotionCaptcha() = 0;
   virtual void OnPromotionCaptcha(const std::string& image) = 0;
-  virtual void OnRecoverWallet(bool error, double balance) = 0;
+  virtual void OnRecoverWallet(Result result, double balance) = 0;
 
   virtual std::unique_ptr<ledger::LedgerURLLoader> LoadURL(
       const std::string& url,

diff --git a/src/bat_client.cc b/src/bat_client.cc
@@ -892,7 +892,7 @@ void BatClient::recoverWallet(const std::string& passPhrase) {
   int result = bip39_mnemonic_to_bytes(nullptr, passPhrase.c_str(), &newSeed.front(), newSeed.size(), &written);
   LOG(ERROR) << "!!!recoverWallet result == " << result << "!!!result size == " << written;
   if (0 != result || 0 == written) {
-    ledger_->OnRecoverWallet(true, 0);
+    ledger_->OnRecoverWallet(ledger::Result::ERROR, 0);
     return;
   }
   state_->walletInfo_.keyInfoSeed_ = newSeed;
@@ -918,7 +918,7 @@ void BatClient::recoverWalletPublicKeyCallback(bool result, const std::string& r
   LOG(ERROR) << "!!!recoverWalletPublicKeyCallback == " << response;
 
   if (!result) {
-    ledger_->OnRecoverWallet(true, 0);
+    ledger_->OnRecoverWallet(ledger::Result::ERROR, 0);
     return;
   }
 
@@ -931,21 +931,23 @@ void BatClient::recoverWalletPublicKeyCallback(bool result, const std::string& r
                              std::bind(&BatClient::recoverWalletCallback,
                                        this,
                                        _1,
-                                       _2));
+                                       _2,
+                                       recoveryId));
 }
 
-void BatClient::recoverWalletCallback(bool result, const std::string& response) {
+void BatClient::recoverWalletCallback(bool result, const std::string& response, const std::string& recoveryId) {
   LOG(ERROR) << "!!!recoverWalletCallback == " << response;
 
   if (!result) {
-    ledger_->OnRecoverWallet(true, 0);
+    ledger_->OnRecoverWallet(ledger::Result::ERROR, 0);
     return;
   }
 
   braveledger_bat_helper::getJSONWalletInfo(response, state_->walletInfo_, state_->fee_currency_, state_->fee_amount_, state_->days_);
   braveledger_bat_helper::getJSONRecoverWallet(response, state_->walletProperties_.balance_, state_->walletProperties_.probi_);
+  state_->walletInfo_.paymentId_ = recoveryId;
   saveState();
-  ledger_->OnRecoverWallet(false, state_->walletProperties_.balance_);
+  ledger_->OnRecoverWallet(ledger::Result::OK, state_->walletProperties_.balance_);
 }
 
 void BatClient::getPromotion(const std::string& lang, const std::string& forPaymentId) {

diff --git a/src/bat_client.h b/src/bat_client.h
@@ -53,7 +53,7 @@ class BatClient {
   void getPromotionCallback(bool result, const std::string& response);
   void setPromotionCallback(bool result, const std::string& response);
   void recoverWalletPublicKeyCallback(bool result, const std::string& response);
-  void recoverWalletCallback(bool result, const std::string& response);
+  void recoverWalletCallback(bool result, const std::string& response, const std::string& paymentId);
   void prepareBatch(const braveledger_bat_helper::BALLOT_ST& ballot, const braveledger_bat_helper::TRANSACTION_ST& transaction);
   void prepareBatchCallback(bool result, const std::string& response);
   void proofBatch(const std::vector<braveledger_bat_helper::BATCH_PROOF>& batchProof);

diff --git a/src/ledger_impl.cc b/src/ledger_impl.cc
@@ -351,8 +351,8 @@ void LedgerImpl::RecoverWallet(const std::string& passPhrase) const {
   bat_client_->recoverWallet(passPhrase);
 }
 
-void LedgerImpl::OnRecoverWallet(bool error, double balance) {
-  ledger_client_->OnRecoverWallet(error ? ledger::Result::ERROR :
+void LedgerImpl::OnRecoverWallet(ledger::Result result, double balance) {
+  ledger_client_->OnRecoverWallet(result ? ledger::Result::ERROR :
                                           ledger::Result::OK,
                                   balance);
 }

diff --git a/src/ledger_impl.h b/src/ledger_impl.h
@@ -86,7 +86,7 @@ class LedgerImpl : public ledger::Ledger,
 
   std::string GetWalletPassphrase() const override;
   void RecoverWallet(const std::string& passPhrase) const override;
-  void OnRecoverWallet(bool error, double balance);
+  void OnRecoverWallet(ledger::Result result, double balance);
 
   std::unique_ptr<ledger::LedgerURLLoader> LoadURL(const std::string& url,
       const std::vector<std::string>& headers,