From feee2e588476f2037e2f94722dfde085c26e0361 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Tue, 18 Jun 2019 22:18:11 -0400
Subject: [PATCH] remove java dependencies from CMakeLists; wip
 MoneroTransferRequest.toPropertyTree()

---
 CMakeLists.txt                   |  3 ---
 src/wallet/MoneroWalletModel.cpp | 21 +++++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49ae587..eb00c05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,6 @@ set(MONERO_CORE "submodules/monero-core")
 set(MONERO_CORE_SRC "${MONERO_CORE}/src")
 
 # header includes
-include_directories("$ENV{JAVA_HOME}")
-include_directories("$ENV{JAVA_HOME}/include")
-include_directories("$ENV{JAVA_HOME}/include/darwin")
 include_directories(src/)
 include_directories(${MONERO_CORE}/contrib/epee/include)
 include_directories(${MONERO_CORE}/external/)
diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp
index ff9e969..b1f3e4c 100644
--- a/src/wallet/MoneroWalletModel.cpp
+++ b/src/wallet/MoneroWalletModel.cpp
@@ -97,7 +97,14 @@ namespace monero {
   boost::property_tree::ptree MoneroTransferRequest::toPropertyTree() const {
     //cout << "MoneroTransferRequest::toPropertyTree(node)" << endl;
     boost::property_tree::ptree node = MoneroTransfer::toPropertyTree();
+    if (isIncoming != boost::none) node.put("isIncoming", *isIncoming);
+    if (address != boost::none) node.put("address", *address);
+    // TODO: handle addresses
     if (subaddressIndex != boost::none) node.put("subaddressIndex", *subaddressIndex);
+    // TODO: handle subaddress indices
+    // TODO: handle destinations
+    if (hasDestinations != boost::none) node.put("hasDestinations", *hasDestinations);
+    if (txRequest != boost::none) node.add_child("txRequest", (*txRequest)->toPropertyTree());
     return node;
   }
 
@@ -132,18 +139,12 @@ namespace monero {
   bool MoneroTransferRequest::meetsCriteria(MoneroTransfer* transfer) const {
     //cout << "meetsCriteria()" << endl;
 
-    //cout << "Common fields" << endl;
-
     // filter on common fields
     if (isIncoming != boost::none && *isIncoming != *transfer->isIncoming) return false;
     if (getIsOutgoing() != boost::none && *getIsOutgoing() != *transfer->getIsOutgoing()) return false;
     if (amount != boost::none && *amount != *transfer->amount) return false;
     if (accountIndex != boost::none && *accountIndex != *transfer->accountIndex) return false;
 
-    //cout << "incoming fields" << endl;
-
-    // TODO: could instead Monerotransfer->meetsCriteria(const MoneroTxRequest& req) and use inheritance instead of instanceof
-
     // filter on incoming fields
     MoneroIncomingTransfer* inTransfer = dynamic_cast<MoneroIncomingTransfer*>(transfer);
     if (inTransfer != nullptr) {
@@ -154,14 +155,10 @@ namespace monero {
       if (!subaddressIndices.empty() && find(subaddressIndices.begin(), subaddressIndices.end(), *inTransfer->subaddressIndex) == subaddressIndices.end()) return false;
     }
 
-    //cout << "outgoing fields" << endl;
-
     // filter on outgoing fields
     MoneroOutgoingTransfer* outTransfer = dynamic_cast<MoneroOutgoingTransfer*>(transfer);
     if (outTransfer != nullptr) {
 
-      //cout << "addresses" << endl;
-
       // filter on addresses
       if (address != boost::none && (outTransfer->addresses.empty() || find(outTransfer->addresses.begin(), outTransfer->addresses.end(), address) == outTransfer->addresses.end())) return false;   // TODO: will filter all transfers if they don't contain addresses
       if (!addresses.empty()) {
@@ -177,8 +174,6 @@ namespace monero {
         if (!intersects) return false;  // must have overlapping addresses
       }
 
-      //cout << "subaddress indices" << endl;
-
       // filter on subaddress indices
       if (subaddressIndex != boost::none && (outTransfer->subaddressIndices.empty() || find(outTransfer->subaddressIndices.begin(), outTransfer->subaddressIndices.end(), subaddressIndex) == outTransfer->subaddressIndices.end())) return false;   // TODO: will filter all transfers if they don't contain subaddress indices
       if (!subaddressIndices.empty()) {
@@ -194,8 +189,6 @@ namespace monero {
         if (!intersects) return false;  // must have overlapping subaddress indices
       }
 
-      //cout << "having destinations" << endl;
-
       // filter on having destinations
       if (hasDestinations != boost::none) {
         if (*hasDestinations && outTransfer->destinations.empty()) return false;