Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Downloading file from osmand is market as event 2.

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-20 04:12:50 +02:00
parent dc3a3b8808
commit acf9a6fcee
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/Version.java
View file

@ -46,7 +46,7 @@ public class Version {
public static String getVersionAsURLParam(Context ctx) { public static String getVersionAsURLParam(Context ctx) {
try { try {
return "osmandver=" + URLEncoder.encode(getFullVersion(ctx), "UTF-8"); return "osmandver=" + URLEncoder.encode(getVersionForTracker(ctx), "UTF-8");
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }

4
OsmAnd/src/net/osmand/plus/activities/DownloadFileHelper.java
View file

@ -137,11 +137,11 @@ public class DownloadFileHelper {
out = new FileOutputStream(fileToDownload); out = new FileOutputStream(fileToDownload);
try { try {
if(parts == 1){ if(parts == 1){
URL url = new URL("http://download.osmand.net/download?file="+fileName + "&" + Version.getVersionAsURLParam(ctx)); //$NON-NLS-1$ URL url = new URL("http://download.osmand.net/download?event=2&file="+fileName + "&" + Version.getVersionAsURLParam(ctx)); //$NON-NLS-1$
downloadFile(fileName, out, url, null, indexOfAllFiles, progress, forceWifi); downloadFile(fileName, out, url, null, indexOfAllFiles, progress, forceWifi);
} else { } else {
for(int i=1; i<=parts; i++){ for(int i=1; i<=parts; i++){
URL url = new URL("http://download.osmand.net/download?file="+fileName+"-"+i + "&" + Version.getVersionAsURLParam(ctx)); //$NON-NLS-1$ URL url = new URL("http://download.osmand.net/download?event=2&file="+fileName+"-"+i + "&" + Version.getVersionAsURLParam(ctx)); //$NON-NLS-1$
downloadFile(fileName, out, url, " ["+i+"/"+parts+"]", indexOfAllFiles, progress, forceWifi); downloadFile(fileName, out, url, " ["+i+"/"+parts+"]", indexOfAllFiles, progress, forceWifi);
} }
} }

14
config/site/download.php
View file

@ -72,7 +72,6 @@ function update_count_of_downloads($file) {
} }
} }
if(!isset($_GET['file']) ) { if(!isset($_GET['file']) ) {
header('HTTP/1.0 404 Not Found'); header('HTTP/1.0 404 Not Found');
die(1); die(1);
@ -83,6 +82,17 @@ function update_count_of_downloads($file) {
// old version // old version
// update_count_of_downloads($file) ; // update_count_of_downloads($file) ;
if (!isset($_GET['event']) {
$eventno = 1;
} else {
$eventno = $_GET['event'];
}
if (isset($_GET['osmandver']) {
$app = $_GET['osmandver'];
} else {
$app = 'Download '.$_SERVER['HTTP_USER_AGENT'];
}
$tracker = new GoogleAnalytics\Tracker('UA-28342846-1', 'download.osmand.net'); $tracker = new GoogleAnalytics\Tracker('UA-28342846-1', 'download.osmand.net');
$visitor = new GoogleAnalytics\Visitor(); $visitor = new GoogleAnalytics\Visitor();
$visitor->setIpAddress($_SERVER['REMOTE_ADDR']); $visitor->setIpAddress($_SERVER['REMOTE_ADDR']);
@ -99,7 +109,7 @@ function update_count_of_downloads($file) {
// Track page view // Track page view
$tracker->trackPageview($page, $session, $visitor); $tracker->trackPageview($page, $session, $visitor);
$event = new GoogleAnalytics\Event('Download '.$_SERVER['HTTP_USER_AGENT'], 'App', $file,1); $event = new GoogleAnalytics\Event($app, 'App', $file, $eventno);
$tracker->trackEvent($event, $session, $visitor); $tracker->trackEvent($event, $session, $visitor);
} }
set_time_limit(0); set_time_limit(0);