@@ -9,6 +9,7 @@ package org.appcelerator.titanium; import java.util.HashMap; import java.util.Iterator; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; @@ -41,9 +42,13 @@ public class TitaniumAnalyticsService extends Service private final static String ANALYTICS_URL = "https://api.appcelerator.net/p/v2/mobile-track"; //private final static String ANALYTICS_URL = "http://192.168.123.102:8000/test"; - private ConnectivityManager connectivityManager; + private static AtomicBoolean sending; + private ConnectivityManager connectivityManager; public TitaniumAnalyticsService() { + if (sending == null) { + this.sending = new AtomicBoolean(false); + } } @Override @@ -65,6 +70,10 @@ public class TitaniumAnalyticsService extends Service public void onStart(Intent intent, final int startId) { super.onStart(intent, startId); + if (!sending.compareAndSet(false, true)) { + Log.i(LCAT, "Send already in progress, skipping intent"); + } + final TitaniumAnalyticsService self = this; Thread t = new Thread(new Runnable(){ @@ -140,6 +149,7 @@ public class TitaniumAnalyticsService extends Service events.clear(); } else { + Log.i(LCAT, "Network unavailable, can't send analytics"); //TODO reset alarm? break; } @@ -150,6 +160,10 @@ public class TitaniumAnalyticsService extends Service } catch (Throwable t) { Log.e(LCAT, "Unhandle exception in analytics thread: ", t); stopSelf(startId); + } finally { + if (!sending.compareAndSet(true, false)) { + Log.w(LCAT, "Expected to be in a sending state. Sending was already false."); + } } } }); @@ -164,7 +178,12 @@ public class TitaniumAnalyticsService extends Service //int subType = netInfo.getSubType(); // TODO change defaults based on implied speed of network - NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo(); + NetworkInfo netInfo = null; + try { + netInfo = connectivityManager.getActiveNetworkInfo(); + } catch (SecurityException e) { + Log.e(LCAT, "Connectivity permissions have been removed from AndroidManifest.xml: " + e.getMessage()); + } if (netInfo != null && netInfo.isConnected() && !netInfo.isRoaming()) { result = true; } android/titanium/src/org/appcelerator/titanium/TitaniumAnalyticsService.java @@ -91,12 +91,17 @@ public class TitaniumApplication Log.e(LCAT, "Error loading tiapp.xml", e); } - analyticsIntent = new Intent(this, TitaniumAnalyticsService.class); - TitaniumPlatformHelper.initialize(this); - analyticsModel = new TitaniumAnalyticsModel(this); - needsEnrollEvent = analyticsModel.needsEnrollEvent(); + if (appInfo.collectAnalytics()) { + analyticsIntent = new Intent(this, TitaniumAnalyticsService.class); + analyticsModel = new TitaniumAnalyticsModel(this); + needsEnrollEvent = analyticsModel.needsEnrollEvent(); + } else { + needsEnrollEvent = false; + needsStartEvent = false; + Log.i(LCAT, "Analytics have been disabled"); + } } @Override @@ -202,6 +207,12 @@ public class TitaniumApplication public synchronized void postAnalyticsEvent(TitaniumAnalyticsEvent event) { + if (!appInfo.collectAnalytics()) { + if (DBG) { + Log.i(LCAT, "Analytics are disabled, ignoring postAnalyticsEvent"); + } + return; + } if (DBG) { StringBuilder sb = new StringBuilder(); @@ -244,8 +255,10 @@ public class TitaniumApplication } public void sendAnalytics() { - if (startService(analyticsIntent) == null) { - Log.w(LCAT, "Analytics service not found."); + if (analyticsIntent != null) { + if (startService(analyticsIntent) == null) { + Log.w(LCAT, "Analytics service not found."); + } } } android/titanium/src/org/appcelerator/titanium/TitaniumApplication.java @@ -82,6 +82,7 @@ public class TiAppXmlHandler extends DefaultHandler } else { if ("id".compareTo(localName) == 0 || "name".compareTo(localName) == 0 || "version".compareTo(localName) == 0 || "icon".compareTo(localName) == 0 || + "analytics".compareTo(localName) == 0 || /* Properties unsupported on Android */ "persistent-wifi".compareTo(localName) == 0 || "prerendered-icon".compareTo(localName) == 0 || @@ -193,7 +194,9 @@ public class TiAppXmlHandler extends DefaultHandler tai.setAppCopyright(getTextAndClear()); } else if ("url".compareTo(localName) == 0) { tai.setAppURL(getTextAndClear()); - } else if ("property".compareTo(localName) == 0) { + } else if( "analytics".compareTo(localName) == 0) { + tai.setCollectAnalytics(getTextAndClear()); + } else if ("property".compareTo(localName) == 0) { if (currentPropertyName == null) { Log.e(LCAT, "property element missing name attribute value: " + currentText.toString()); clearText(); android/titanium/src/org/appcelerator/titanium/config/TiAppXmlHandler.java @@ -50,6 +50,7 @@ public class TitaniumAppInfo protected String appCopyright; protected String appGUID; protected String appPublisher; + protected boolean appCollectAnalytics; protected HashMap<String, TitaniumWindowInfo> windows; protected ArrayList<TitaniumModuleInfo> modules; @@ -91,6 +92,8 @@ public class TitaniumAppInfo String versionString = systemProperties.getString("ti.version", "0.0.0"); systemProperties.setString(PROP_NETWORK_USER_AGENT, NETWORK_USER_AGENT + " Titanium/" + versionString); + appCollectAnalytics = true; + if (DBG) { Log.d(LCAT, "Default Titanium system properties loaded."); } @@ -197,6 +200,16 @@ public class TitaniumAppInfo return this.appURL; } + public boolean collectAnalytics() { + return appCollectAnalytics; + } + + public void setCollectAnalytics(String collectAnalytics) { + if (collectAnalytics != null) { + appCollectAnalytics = Boolean.parseBoolean(collectAnalytics); + } + } + public ArrayList<TitaniumWindowInfo> getWindows() { ArrayList<TitaniumWindowInfo> ws = new ArrayList<TitaniumWindowInfo>(windows.values()); Collections.sort(ws); android/titanium/src/org/appcelerator/titanium/config/TitaniumAppInfo.java @@ -41,6 +41,12 @@ public class TitaniumAnalytics extends TitaniumBaseModule implements ITitaniumAn public void addEvent (String type, String event, String data) { - app.postAnalyticsEvent(TitaniumAnalyticsEventFactory.createEvent(type, event, data)); + if (app.getAppInfo().collectAnalytics()) { + app.postAnalyticsEvent(TitaniumAnalyticsEventFactory.createEvent(type, event, data)); + } else { + if (DBG) { + Log.i(LCAT, "Ignoring addEvent, analytics have been disabled"); + } + } } } \ No newline at end of file android/titanium/src/org/appcelerator/titanium/module/TitaniumAnalytics.java @@ -6,7 +6,6 @@ <url>appcelerator.com</url> <copyright>2009 by nwright</copyright> <description>Mobile Unit Test App</description> - <icon>appicon.png</icon> <windows> <window> demos/KitchenSink/tiapp.xml 173a64ca7e03ddfe17f34643603d5abf97b500b7 donthorp don@donthorp.net http://github.com/appcelerator/titanium_mobile/commit/fbdc59d9b2c9597b64b04710b96962a877ffc161 fbdc59d9b2c9597b64b04710b96962a877ffc161 2009-11-15T12:36:59-08:00 2009-11-15T12:36:59-08:00 [#246 state:resolved] Added ability to turn off analytics via tiapp.xml 2ee437782829bad1e67179b917ce74939f47c3c7 donthorp don@donthorp.net