AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] implemented UniqueClientId

Browse source
This commit is contained in:
rachytski 2012-04-17 18:13:40 +04:00 • committed by Alex Zolotarev
parent 7964b599dd
commit 465184b9d8
7 changed files with 86 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -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()

30
platform/platform.cpp Normal file
View file

@ -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);
}

15
platform/platform.hpp
View file

@ -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();

2
platform/platform.pro
View file

@ -66,3 +66,5 @@ SOURCES += \
video_timer.cpp \
http_request.cpp \
chunks_download_strategy.cpp \
platform.cpp

5
platform/platform_android.cpp
View file

@ -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

15
platform/platform_ios.mm
View file

@ -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

13
platform/platform_mac.mm
View file

@ -2,9 +2,6 @@
#include "../base/logging.hpp"
#include "../coding/sha2.hpp"
#include "../coding/base64.hpp"
#include "../std/target_os.hpp"
#include <IOKit/IOKitLib.h>
@ -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)