kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed non-working downloaded country statistics and missing UserID

Browse source
This commit is contained in:
Alex Zolotarev 2012-04-18 21:15:15 +03:00 • committed by Alex Zolotarev
parent f6b797bf10
commit 26aa1bef9b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/jni/com/mapswithme/platform/HttpThread.cpp
View file

@ -4,6 +4,8 @@
#include "../maps/DownloadUI.hpp"
#include "Platform.hpp"
class HttpThread
{
private:
@ -23,11 +25,15 @@ public:
jclass klass = env->FindClass("com/mapswithme/maps/downloader/DownloadChunkTask");
ASSERT(klass, ("Can't find java class com/mapswithme/maps/downloader/DownloadChunkTask"));
jmethodID methodId = env->GetMethodID(klass, "<init>", "(JLjava/lang/String;JJJLjava/lang/String;)V");
jmethodID methodId = env->GetMethodID(klass, "<init>", "(JLjava/lang/String;JJJLjava/lang/String;Ljava/lang/String;)V");
ASSERT(methodId, ("Can't find java constructor in com/mapswithme/maps/downloader/DownloadChunkTask"));
// User id is always the same, so do not waste time on every chunk call
static string uniqueUserId = GetPlatform().UniqueClientId();
m_self = env->NewGlobalRef(env->NewObject(klass, methodId, reinterpret_cast<jlong>(&cb),
env->NewStringUTF(url.c_str()), beg, end, expectedFileSize, env->NewStringUTF(pb.c_str())));
env->NewStringUTF(url.c_str()), beg, end, expectedFileSize, env->NewStringUTF(pb.c_str()),
env->NewStringUTF(uniqueUserId.c_str())));
methodId = env->GetMethodID(klass, "start", "()V");
ASSERT(methodId, ("Can't find java method 'start' in com/mapswithme/maps/downloader/DownloadChunkTask"));

19
android/src/com/mapswithme/maps/downloader/DownloadChunkTask.java
View file

@ -7,8 +7,6 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import com.mapswithme.maps.MWMActivity;
import android.os.AsyncTask;
import android.util.Log;
@ -22,6 +20,7 @@ class DownloadChunkTask extends AsyncTask<Void, byte [], Void>
private long m_end;
private long m_expectedFileSize;
private String m_postBody;
private String m_userAgent;
private final int NOT_SET = -1;
private final int IO_ERROR = -2;
@ -32,7 +31,8 @@ class DownloadChunkTask extends AsyncTask<Void, byte [], Void>
native void onWrite(long httpCallbackID, long beg, byte [] data, long size);
native void onFinish(long httpCallbackID, long httpCode, long beg, long end);
public DownloadChunkTask(long httpCallbackID, String url, long beg, long end, long expectedFileSize, String postBody)
public DownloadChunkTask(long httpCallbackID, String url, long beg, long end, long expectedFileSize,
String postBody, String userAgent)
{
m_httpCallbackID = httpCallbackID;
m_url = url;
@ -40,6 +40,7 @@ class DownloadChunkTask extends AsyncTask<Void, byte [], Void>
m_end = end;
m_expectedFileSize = expectedFileSize;
m_postBody = postBody;
m_userAgent = userAgent;
}
@Override
@ -93,11 +94,13 @@ class DownloadChunkTask extends AsyncTask<Void, byte [], Void>
return null;
}
urlConnection.setChunkedStreamingMode(0);
urlConnection.setUseCaches(false);
urlConnection.setConnectTimeout(15 * 1000);
urlConnection.setReadTimeout(15 * 1000);
// Set user agent with unique client id
urlConnection.setRequestProperty("User-Agent", m_userAgent);
// use Range header only if we don't download whole file from start
if (!(m_beg == 0 && m_end < 0))
{
@ -107,12 +110,14 @@ class DownloadChunkTask extends AsyncTask<Void, byte [], Void>
urlConnection.setRequestProperty("Range", String.format("bytes=%d-", m_beg));
}
if (m_postBody.length() != 0)
if (m_postBody.length() > 0)
{
urlConnection.setDoOutput(true);
urlConnection.setRequestProperty("Content-Type", "application/json");
byte[] utf8 = m_postBody.getBytes("UTF-8");
urlConnection.setFixedLengthStreamingMode(utf8.length);
final DataOutputStream os = new DataOutputStream(urlConnection.getOutputStream());
os.writeChars(m_postBody);
os.write(utf8);
os.flush();
}
if (isCancelled())