From 465184b9d8317d4829ed4060fb0b1d4698ada053 Mon Sep 17 00:00:00 2001 From: rachytski Date: Tue, 17 Apr 2012 18:13:40 +0400 Subject: [PATCH] [android] implemented UniqueClientId --- .../jni/com/mapswithme/platform/Platform.cpp | 48 +++++++++++++++++++ platform/platform.cpp | 30 ++++++++++++ platform/platform.hpp | 15 ++---- platform/platform.pro | 2 + platform/platform_android.cpp | 5 -- platform/platform_ios.mm | 15 +----- platform/platform_mac.mm | 13 +---- 7 files changed, 86 insertions(+), 42 deletions(-) create mode 100644 platform/platform.cpp diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index abec4e52d4..b93524de67 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -2,6 +2,7 @@ #include "../core/jni_helper.hpp" +#include "../../../../../platform/settings.hpp" #include "../../../../../base/logging.hpp" #include "../../../../../std/algorithm.hpp" @@ -83,6 +84,53 @@ int Platform::PreCachingDepth() const return m_impl->m_preCachingDepth; } +string Platform::UniqueClientId() const +{ + string res; + if (!Settings::Get("UniqueClientID", res)) + { + JNIEnv * env = jni::GetEnv(); + if (!env) + { + LOG(LWARNING, ("Can't get JNIEnv")); + return ""; + } + + jclass uuidClass = env->FindClass("java/util/UUID"); + ASSERT(uuidClass, ("Can't find java class java/util/UUID")); + + jmethodID randomUUIDId = env->GetStaticMethodID(uuidClass, "randomUUID", "()Ljava/util/UUID;"); + ASSERT(randomUUIDId, ("Can't find static java/util/UUID.randomUUIDId() method")); + + jobject uuidInstance = env->CallStaticObjectMethod(uuidClass, randomUUIDId); + ASSERT(uuidInstance, ("UUID.randomUUID() returned NULL")); + + jmethodID toStringId = env->GetMethodID(uuidClass, "toString", "()Ljava/lang/String;"); + ASSERT(toStringId, ("Can't find java/util/UUID.toString() method")); + + jstring uuidString = (jstring)env->CallObjectMethod(uuidInstance, toStringId); + ASSERT(uuidString, ("UUID.toString() returned NULL")); + + char const * uuidUtf8 = env->GetStringUTFChars(uuidString, 0); + + string result("en"); + + if (uuidUtf8 != 0) + { + result = uuidUtf8; + env->ReleaseStringUTFChars(uuidString, uuidUtf8); + } + + result = HashUniqueID(result); + + Settings::Set("UniqueClientID", result); + } + + Settings::Get("UniqueClientID", res); + + return res; +} + namespace android { Platform::~Platform() diff --git a/platform/platform.cpp b/platform/platform.cpp new file mode 100644 index 0000000000..8c6ea64a17 --- /dev/null +++ b/platform/platform.cpp @@ -0,0 +1,30 @@ +#include "platform.hpp" + +#include "../coding/sha2.hpp" +#include "../coding/base64.hpp" + +string Platform::ReadPathForFile(string const & file) const +{ + string fullPath = m_writableDir + file; + if (!IsFileExistsByFullPath(fullPath)) + { + fullPath = m_resourcesDir + file; + if (!IsFileExistsByFullPath(fullPath)) + MYTHROW(FileAbsentException, ("File doesn't exist", fullPath)); + } + return fullPath; +} + +string Platform::HashUniqueID(string const & s) +{ + // generate sha2 hash for UUID + string const hash = sha2::digest256(s, false); + // xor it + size_t const offset = hash.size() / 4; + string xoredHash; + for (size_t i = 0; i < offset; ++i) + xoredHash.push_back(hash[i] ^ hash[i + offset] ^ hash[i + offset * 2] ^ hash[i + offset * 3]); + // and use base64 encoding + return base64::encode(xoredHash); +} + diff --git a/platform/platform.hpp b/platform/platform.hpp index 7cb1be9269..ae49facd59 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -35,17 +35,10 @@ protected: /// Internal function to use files from writable dir /// if they override the same file in the resources dir - string ReadPathForFile(string const & file) const - { - string fullPath = m_writableDir + file; - if (!IsFileExistsByFullPath(fullPath)) - { - fullPath = m_resourcesDir + file; - if (!IsFileExistsByFullPath(fullPath)) - MYTHROW(FileAbsentException, ("File doesn't exist", fullPath)); - } - return fullPath; - } + string ReadPathForFile(string const & file) const; + + /// Hash some unique string into uniform format. + static string HashUniqueID(string const & s); public: Platform(); diff --git a/platform/platform.pro b/platform/platform.pro index a3a33970dc..16b52c7f88 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -66,3 +66,5 @@ SOURCES += \ video_timer.cpp \ http_request.cpp \ chunks_download_strategy.cpp \ + platform.cpp + diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index ffe505bea9..5a569b593b 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -154,11 +154,6 @@ bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size) return false; } -string Platform::UniqueClientId() const -{ - return "@TODO"; -} - bool Platform::IsFeatureSupported(string const & feature) const { // @TODO add Search feature support diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index 40f2374aed..4b8ba58db2 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -238,22 +238,9 @@ static string GetMacAddress() return result; } -static string GetUniqueHashedId() -{ - // generate sha2 hash for mac address - string const hash = sha2::digest256(GetMacAddress() + GetDeviceUid(), false); - // xor it - size_t const offset = hash.size() / 4; - string xoredHash; - for (size_t i = 0; i < offset; ++i) - xoredHash.push_back(hash[i] ^ hash[i + offset] ^ hash[i + offset * 2] ^ hash[i + offset * 3]); - // and use base64 encoding - return base64::encode(xoredHash); -} - string Platform::UniqueClientId() const { - return GetUniqueHashedId(); + return HashUniqueID(GetMacAddress() + GetDeviceUid()); } bool Platform::IsFeatureSupported(string const & feature) const diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm index f422680434..931cb19fa2 100644 --- a/platform/platform_mac.mm +++ b/platform/platform_mac.mm @@ -2,9 +2,6 @@ #include "../base/logging.hpp" -#include "../coding/sha2.hpp" -#include "../coding/base64.hpp" - #include "../std/target_os.hpp" #include @@ -105,15 +102,7 @@ string Platform::UniqueClientId() const CFStringGetCString(uuidCf, buf, 512, kCFStringEncodingUTF8); CFRelease(uuidCf); - // generate sha2 hash for UUID - string const hash = sha2::digest256(buf, false); - // xor it - size_t const offset = hash.size() / 4; - string xoredHash; - for (size_t i = 0; i < offset; ++i) - xoredHash.push_back(hash[i] ^ hash[i + offset] ^ hash[i + offset * 2] ^ hash[i + offset * 3]); - // and use base64 encoding - return base64::encode(xoredHash); + return HashUniqueID(buf); } static void PerformImpl(void * obj)