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

removed libGoogleAnalytics dependency

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-13 01:25:43 +02:00
parent 31c63c24a2
commit ade929b0ff
4 changed files with 10 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/.classpath
View file

@ -8,7 +8,6 @@
<classpathentry kind="lib" path="lib/tuprolog.jar"/> <classpathentry kind="lib" path="lib/tuprolog.jar"/>
<classpathentry kind="lib" path="lib/junidecode-0.1.jar"/> <classpathentry kind="lib" path="lib/junidecode-0.1.jar"/>
<classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/> <classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/>
<classpathentry kind="lib" path="lib/libGoogleAnalytics.jar"/>
<classpathentry kind="lib" path="lib/EasyTracker.jar"/> <classpathentry kind="lib" path="lib/EasyTracker.jar"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

BIN
OsmAnd/lib/libGoogleAnalytics.jar
View file

Binary file not shown.

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

@ -51,4 +51,14 @@ public class Version {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
public static String getVersionForTracker(Context ctx) {
String v = Version.getAppName(ctx);
if(Version.isProductionVersion(ctx)){
v = Version.getFullVersion(ctx);
} else {
v +=" test";
}
return v;
}
} }

41
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -44,14 +44,11 @@ import android.app.ProgressDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.graphics.Color; import android.graphics.Color;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.StatFs; import android.os.StatFs;
import android.text.Editable; import android.text.Editable;
@ -70,8 +67,6 @@ import android.widget.Filterable;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.apps.analytics.GoogleAnalyticsTracker;
public class DownloadIndexActivity extends OsmandExpandableListActivity { public class DownloadIndexActivity extends OsmandExpandableListActivity {
/** menus **/ /** menus **/
@ -104,25 +99,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private EditText filterText; private EditText filterText;
private DownloadFileHelper downloadFileHelper = null; private DownloadFileHelper downloadFileHelper = null;
private GoogleAnalyticsTracker tracker;
private void setCustomVarsToTracker(){
tracker.setCustomVar(1, "App", Version.getFullVersion(this));
tracker.setCustomVar(2, "Device", Build.DEVICE);
tracker.setCustomVar(3, "Brand", Build.BRAND);
tracker.setCustomVar(4, "Model", Build.MODEL);
tracker.setCustomVar(5, "Package", getPackageName());
try {
PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
if (info != null) {
tracker.setCustomVar(6, "Version name", info.versionName);
tracker.setCustomVar(7, "Version code", info.versionCode+"");
}
} catch (NameNotFoundException e) {
}
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -133,11 +109,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
CustomTitleBar titleBar = new CustomTitleBar(this, R.string.local_index_download, R.drawable.tab_download_screen_icon); CustomTitleBar titleBar = new CustomTitleBar(this, R.string.local_index_download, R.drawable.tab_download_screen_icon);
setContentView(R.layout.download_index); setContentView(R.layout.download_index);
titleBar.afterSetContentView(); titleBar.afterSetContentView();
tracker = GoogleAnalyticsTracker.getInstance();
// Start the tracker in manual dispatch mode...
tracker.startNewSession(getString(R.string.ga_api_key), 60, this);
setCustomVarsToTracker();
tracker.trackPageView("/download.activity?" +Version.getVersionAsURLParam(this));
downloadFileHelper = new DownloadFileHelper(this); downloadFileHelper = new DownloadFileHelper(this);
findViewById(R.id.DownloadButton).setOnClickListener(new View.OnClickListener(){ findViewById(R.id.DownloadButton).setOnClickListener(new View.OnClickListener(){
@ -365,15 +336,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
case DIALOG_PROGRESS_FILE: case DIALOG_PROGRESS_FILE:
DownloadIndexesAsyncTask task = new DownloadIndexesAsyncTask(new ProgressDialogImplementation(progressFileDlg,true)); DownloadIndexesAsyncTask task = new DownloadIndexesAsyncTask(new ProgressDialogImplementation(progressFileDlg,true));
String[] indexes = entriesToDownload.keySet().toArray(new String[0]); String[] indexes = entriesToDownload.keySet().toArray(new String[0]);
String v = Version.getAppName(this);
if(Version.isProductionVersion(this)){
v = Version.getFullVersion(this);
} else {
v +=" test";
}
for(String index : indexes) {
tracker.trackEvent(v, Version.getAppName(this), index, 1);
}
task.execute(indexes); task.execute(indexes);
break; break;
case DIALOG_PROGRESS_LIST: case DIALOG_PROGRESS_LIST:
@ -557,7 +519,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
tracker.stopSession();
if(isFinishing()){ if(isFinishing()){
downloadFileHelper.setInterruptDownloading(true); downloadFileHelper.setInterruptDownloading(true);
} }
@ -626,8 +587,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
} }
updateLoadedFiles(); updateLoadedFiles();
((DownloadIndexAdapter) getExpandableListAdapter()).notifyDataSetInvalidated(); ((DownloadIndexAdapter) getExpandableListAdapter()).notifyDataSetInvalidated();
tracker.dispatch();
} }
@Override @Override