diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 9aa583f..d887a6e 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -20,6 +20,7 @@ set( platform.cpp platform.hpp platform_std.cpp + platform_linux.cpp platform_unix_impl.cpp platform_unix_impl.hpp preferred_languages.cpp @@ -31,18 +32,6 @@ set( target_os.hpp ) -if(${PLATFORM_MAC}) - append( - SRC - platform_mac.mm - ) -elseif(${PLATFORM_LINUX}) - append( - SRC - platform_linux.cpp - ) -endif() - geocore_add_test_subdirectory(platform_tests_support) geocore_add_library(${PROJECT_NAME} ${SRC}) diff --git a/platform/platform.hpp b/platform/platform.hpp index d50d7e2..e049204 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -228,18 +228,10 @@ public: unsigned CpuCores() const; - std::string DeviceName() const; - - std::string DeviceModel() const; std::string UniqueClientId() const; - std::string AdvertisingId() const; - std::string MacAddress(bool md5Decoded) const; - - static EConnectionType ConnectionStatus(); - static bool IsConnected() { return ConnectionStatus() != EConnectionType::CONNECTION_NONE; } /// \brief Placing an executable object |task| on a queue of |thread|. Then the object will be /// executed on |thread|. diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp index 55f36cf..3ab1e23 100644 --- a/platform/platform_linux.cpp +++ b/platform/platform_linux.cpp @@ -188,62 +188,4 @@ Platform::Platform() LOG(LDEBUG, ("Writable directory:", m_writableDir)); LOG(LDEBUG, ("Tmp directory:", m_tmpDir)); LOG(LDEBUG, ("Settings directory:", m_settingsDir)); - LOG(LDEBUG, ("Client ID:", UniqueClientId())); -} - -string Platform::UniqueClientId() const -{ - string machineFile = "/var/lib/dbus/machine-id"; - if (IsFileExistsByFullPath("/etc/machine-id")) - machineFile = "/etc/machine-id"; - - if (IsFileExistsByFullPath(machineFile)) - { - string content; - FileReader(machineFile).ReadAsString(content); - return content.substr(0, 32); - } - - return "n0dbus0n0lsb00000000000000000000"; -} - -string Platform::AdvertisingId() const -{ - return {}; -} - -string Platform::MacAddress(bool md5Decoded) const -{ - // Not implemented. - UNUSED_VALUE(md5Decoded); - return {}; -} - -string Platform::DeviceName() const -{ - return GEOCORE_OS_NAME; -} - -string Platform::DeviceModel() const -{ - return {}; -} - -Platform::EConnectionType Platform::ConnectionStatus() -{ - int socketFd = socket(AF_INET, SOCK_STREAM, 0); - SCOPE_GUARD(closeSocket, bind(&close, socketFd)); - if (socketFd < 0) - return EConnectionType::CONNECTION_NONE; - - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(80); - inet_pton(AF_INET, kSomeWorkingWebServer, &addr.sin_addr); - - if (connect(socketFd, reinterpret_cast(&addr), sizeof(addr)) < 0) - return EConnectionType::CONNECTION_NONE; - - return EConnectionType::CONNECTION_WIFI; } diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm deleted file mode 100644 index 7d2f501..0000000 --- a/platform/platform_mac.mm +++ /dev/null @@ -1,144 +0,0 @@ -#include "platform/platform.hpp" - -#include "base/file_name_utils.hpp" -#include "base/logging.hpp" - -#include "platform/target_os.hpp" - -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include - -#import -#import - -Platform::Platform() -{ - // get resources directory path - std::string const resourcesPath = NSBundle.mainBundle.resourcePath.UTF8String; - std::string const bundlePath = NSBundle.mainBundle.bundlePath.UTF8String; - - char const * envResourcesDir = ::getenv("MWM_RESOURCES_DIR"); - char const * envWritableDir = ::getenv("MWM_WRITABLE_DIR"); - - if (envResourcesDir && envWritableDir) - { - m_resourcesDir = envResourcesDir; - m_writableDir = envWritableDir; - } - else if (resourcesPath == bundlePath) - { - // we're the console app, probably unit test, and path is our directory - m_resourcesDir = bundlePath + "/../../data/"; - if (!IsFileExistsByFullPath(m_resourcesDir)) - { - // Check development environment without symlink but with git repo - std::string const repoPath = bundlePath + "/../../../geocore/data/"; - if (IsFileExistsByFullPath(repoPath)) - m_resourcesDir = repoPath; - else - m_resourcesDir = "./data/"; - } - m_writableDir = m_resourcesDir; - } - else - { - m_resourcesDir = resourcesPath + "/"; - // get writable path - // developers can have symlink to data folder - char const * dataPath = "../../../../../data/"; - if (IsFileExistsByFullPath(m_resourcesDir + dataPath)) - m_writableDir = m_resourcesDir + dataPath; - else - { - // Check development environment without symlink but with git repo - dataPath = "../../../../../../geocore/data/"; - if (IsFileExistsByFullPath(m_resourcesDir + dataPath)) - m_writableDir = m_resourcesDir + dataPath; - if (m_writableDir.empty()) - { - auto p = m_resourcesDir.find("/geocore/"); - if (p != std::string::npos) - m_writableDir = m_resourcesDir.substr(0, p) + "/geocore/data/"; - } - } - - if (m_writableDir.empty()) - { - NSArray * dirPaths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES); - NSString * supportDir = [dirPaths objectAtIndex:0]; - m_writableDir = supportDir.UTF8String; - m_writableDir += "/MapsWithMe/"; - ::mkdir(m_writableDir.c_str(), 0755); - } - } - - if (m_resourcesDir.empty()) - m_resourcesDir = "."; - m_resourcesDir = base::AddSlashIfNeeded(m_resourcesDir); - m_writableDir = base::AddSlashIfNeeded(m_writableDir); - - m_settingsDir = m_writableDir; - m_privateDir = m_writableDir; - - NSString * tempDir = NSTemporaryDirectory(); - if (tempDir == nil) - tempDir = @"/tmp"; - m_tmpDir = tempDir.UTF8String; - m_tmpDir += '/'; - - LOG(LDEBUG, ("Resources Directory:", m_resourcesDir)); - LOG(LDEBUG, ("Writable Directory:", m_writableDir)); - LOG(LDEBUG, ("Tmp Directory:", m_tmpDir)); - LOG(LDEBUG, ("Settings Directory:", m_settingsDir)); -} - -std::string Platform::UniqueClientId() const { return {}; } - -std::string Platform::MacAddress(bool md5Decoded) const -{ - // Not implemented. - UNUSED_VALUE(md5Decoded); - return {}; -} - -std::string Platform::DeviceName() const -{ - return GEOCORE_OS_NAME; -} - -std::string Platform::DeviceModel() const -{ - return {}; -} - -Platform::EConnectionType Platform::ConnectionStatus() -{ - struct sockaddr_in zero; - bzero(&zero, sizeof(zero)); - zero.sin_len = sizeof(zero); - zero.sin_family = AF_INET; - SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr*)&zero); - if (!reachability) - return EConnectionType::CONNECTION_NONE; - SCNetworkReachabilityFlags flags; - bool const gotFlags = SCNetworkReachabilityGetFlags(reachability, &flags); - CFRelease(reachability); - if (!gotFlags || ((flags & kSCNetworkReachabilityFlagsReachable) == 0)) - return EConnectionType::CONNECTION_NONE; - SCNetworkReachabilityFlags userActionRequired = kSCNetworkReachabilityFlagsConnectionRequired | kSCNetworkReachabilityFlagsInterventionRequired; - if ((flags & userActionRequired) == userActionRequired) - return EConnectionType::CONNECTION_NONE; - return EConnectionType::CONNECTION_WIFI; -} -