lthn/blockchain
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjusted macros for both android and ios

Browse source
This commit is contained in:
cryptozoidberg 2020-02-18 07:45:59 +01:00
parent fa3c922c6f
commit 89b15a9dc2
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
4 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(VERSION "1.0")
# endif()
if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
add_definitions(-DIOS_BUILD)
add_definitions(-DMOBILE_WALLET_BUILD)
if(CMAKE_SYSTEM_NAME STREQUAL "Android")
message("Android sdk prefix: ${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}")
message("Android CMAKE_CXX_COMPILER prefix: ${CMAKE_CXX_COMPILER}")

10
src/wallet/plain_wallet_api.cpp
View file

@ -12,7 +12,12 @@
std::atomic<bool> initialized(false);
#define ANDROID_PACKAGE_NAME "zano_mobile"
#ifdef IOS_BUILD
#define HOME_FOLDER "Documents"
#elif ANDROID_BUILD
#define HOME_FOLDER "files"
#endif
#define WALLETS_FOLDER_NAME "wallets"
#define GENERAL_INTERNAL_ERRROR_INSTANCE "GENERAL_INTERNAL_ERROR: WALLET INSTNACE NOT FOUND"
@ -30,10 +35,13 @@ namespace plain_wallet
#ifdef WIN32
return "";
#endif // WIN32
#ifdef IOS_BUILD
char buffer[1000] = {0};
strcpy(buffer, getenv("HOME"));
return buffer;
#elif ANDROID_BUILD
return "/data/data/ "ANDROID_PACKAGE_NAME
#endif
}
std::string get_wallets_folder()

34
src/wallet/wallets_manager.cpp
View file

@ -6,7 +6,7 @@
#include "wallets_manager.h"
#include "currency_core/alias_helper.h"
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
#include "core_fast_rpc_proxy.h"
#include "currency_core/core_tools.h"
#endif
@ -33,7 +33,7 @@ auto& name = it->second.w;
wallets_manager::wallets_manager():m_pview(&m_view_stub),
m_stop_singal_sent(false),
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
m_ccore(&m_cprotocol),
m_cprotocol(m_ccore, &m_p2psrv),
m_p2psrv(m_cprotocol),
@ -52,7 +52,7 @@ wallets_manager::wallets_manager():m_pview(&m_view_stub),
m_is_pos_allowed(false),
m_qt_logs_enbaled(false)
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
m_offers_service.set_disabled(true);
#endif
//m_ccore.get_blockchain_storage().get_attachment_services_manager().add_service(&m_offers_service);
@ -107,7 +107,7 @@ bool wallets_manager::init(int argc, char* argv[], view::i_view* pview_handler)
// setup custom callstack retrieving function
epee::misc_utils::get_callstack(tools::get_callstack);
//#ifndef IOS_BUILD
//#ifndef MOBILE_WALLET_BUILD
// setup custom terminate functions
std::set_terminate(&terminate_handler_func);
//#endif
@ -139,7 +139,7 @@ bool wallets_manager::init(int argc, char* argv[], view::i_view* pview_handler)
command_line::add_arg(desc_cmd_sett, arg_remote_node);
command_line::add_arg(desc_cmd_sett, arg_enable_qt_logs);
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
currency::core::init_options(desc_cmd_sett);
currency::core_rpc_server::init_options(desc_cmd_sett);
nodetool::node_server<currency::t_currency_protocol_handler<currency::core> >::init_options(desc_cmd_sett);
@ -299,7 +299,7 @@ std::string wallets_manager::get_config_folder()
bool wallets_manager::init_local_daemon()
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
view::daemon_status_info dsi = AUTO_VAL_INIT(dsi);
dsi.pos_difficulty = dsi.pos_difficulty = "---";
dsi.daemon_network_state = currency::COMMAND_RPC_GET_INFO::daemon_network_state_loading_core;
@ -374,7 +374,7 @@ bool wallets_manager::init_local_daemon()
bool wallets_manager::deinit_local_daemon()
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
view::daemon_status_info dsi = AUTO_VAL_INIT(dsi);
dsi.daemon_network_state = currency::COMMAND_RPC_GET_INFO::daemon_network_state_unloading_core;
m_pview->update_daemon_status(dsi);
@ -585,7 +585,7 @@ void wallets_manager::init_wallet_entry(wallet_vs_options& wo, uint64_t id)
wo.core_conf = currency::get_default_core_runtime_config();
else
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
wo.core_conf = m_ccore.get_blockchain_storage().get_core_runtime_config();
#else
LOG_ERROR("Unexpected location reached");
@ -623,7 +623,7 @@ std::string wallets_manager::get_fav_offers(const std::list<bc_services::offer_i
{
if (m_remote_node_mode)
return API_RETURN_CODE_FAIL;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
currency::blockchain_storage& bcs = m_ccore.get_blockchain_storage();
m_offers_service.get_offers_by_id(hashes, offers);
@ -638,7 +638,7 @@ std::string wallets_manager::get_my_offers(const bc_services::core_offers_filter
{
if (m_remote_node_mode)
return API_RETURN_CODE_FAIL;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
CRITICAL_REGION_LOCAL(m_wallets_lock);
while (true)
{
@ -697,7 +697,7 @@ std::string wallets_manager::open_wallet(const std::wstring& path, const std::st
}
else
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
w->set_core_proxy(std::shared_ptr<tools::i_core_proxy>(new tools::core_fast_rpc_proxy(m_rpc_server)));
#else
LOG_ERROR("Unexpected location reached");
@ -777,7 +777,7 @@ std::string wallets_manager::generate_wallet(const std::wstring& path, const std
}
else
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
w->set_core_proxy(std::shared_ptr<tools::i_core_proxy>(new tools::core_fast_rpc_proxy(m_rpc_server)));
#else
LOG_ERROR("Unexpected location reached");
@ -817,7 +817,7 @@ std::string wallets_manager::get_mining_estimate(uint64_t amuont_coins,
{
if (m_remote_node_mode)
return API_RETURN_CODE_FAIL;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
m_ccore.get_blockchain_storage().get_pos_mining_estimate(amuont_coins, time, estimate_result, pos_coins_and_pos_diff_rate, days);
return API_RETURN_CODE_OK;
#else
@ -840,7 +840,7 @@ std::string wallets_manager::is_valid_brain_restore_data(const std::string& brai
else
return API_RETURN_CODE_FALSE;
}
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
void wallets_manager::subscribe_to_core_events(currency::i_core_event_handler* pevents_handler)
{
@ -864,7 +864,7 @@ std::string wallets_manager::restore_wallet(const std::wstring& path, const std:
}
else
{
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
w->set_core_proxy(std::shared_ptr<tools::i_core_proxy>(new tools::core_fast_rpc_proxy(m_rpc_server)));
#else
LOG_ERROR("Unexpected location reached");
@ -933,7 +933,7 @@ std::string wallets_manager::get_aliases(view::alias_set& al_set)
if (m_remote_node_mode)
return API_RETURN_CODE_OVERFLOW;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
if (m_ccore.get_blockchain_storage().get_aliases_count() > API_MAX_ALIASES_COUNT)
return API_RETURN_CODE_OVERFLOW;
@ -1523,7 +1523,7 @@ std::string wallets_manager::get_offers_ex(const bc_services::core_offers_filter
{
if (m_remote_node_mode)
return API_RETURN_CODE_FAIL;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
//TODO: make it proxy-like call
//m_ccore.get_blockchain_storage().get_offers_ex(cof, offers, total_count);
m_offers_service.get_offers_ex(cof, offers, total_count, m_ccore.get_blockchain_storage().get_core_runtime_config().get_core_time());

6
src/wallet/wallets_manager.h
View file

@ -19,7 +19,7 @@ using namespace epee;
#include "console_handler.h"
#include "p2p/net_node.h"
#include "currency_core/checkpoints_create.h"
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
#include "currency_core/currency_core.h"
#include "currency_core/bc_offers_service.h"
#include "rpc/core_rpc_server.h"
@ -142,7 +142,7 @@ public:
std::string transfer(size_t wallet_id, const view::transfer_params& tp, currency::transaction& res_tx);
std::string get_config_folder();
std::string is_valid_brain_restore_data(const std::string& brain_text);
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
void subscribe_to_core_events(currency::i_core_event_handler* pevents_handler);
//void unsubscribe_to_core_events();
#endif
@ -186,7 +186,7 @@ private:
std::string m_data_dir;
view::gui_options m_ui_opt;
#ifndef IOS_BUILD
#ifndef MOBILE_WALLET_BUILD
//daemon stuff
bc_services::bc_offers_service m_offers_service;
currency::core m_ccore;