Merge pull request #7 from kissmetrics/autoRecordInstalls-refactor

Refactoring of autoRecordInstalls.

KISSmetricsAPI/src/com/kissmetrics/sdk/ArchiverImpl.java

@@ -41,7 +41,7 @@
 public class ArchiverImpl implements Archiver {
 
 	private static final String  CLIENT_TYPE = "mobile_app";
-	private static final String  USER_AGENT = "kissmetrics-android/2.0";
+	private static final String  USER_AGENT = "kissmetrics-android/2.0.4";
 	private static final String  IDENTITY_PREF = "KISSmetricsIdentity";
 	private static final String  SETTINGS_FILE = "KISSmetricsSettings";
 	private static final String  INSTALL_UUID_KEY = "installUuid";

KISSmetricsAPI/src/com/kissmetrics/sdk/ConnectionImpl.java

@@ -76,7 +76,7 @@ public void sendRecord(final String urlString, final ConnectionDelegate delegate
 			connection.setUseCaches(false);
 			connection.setRequestMethod("GET");
 			connection.setConnectTimeout(CONNECTION_TIMEOUT*1000);
-			connection.setRequestProperty("User-Agent", "KISSmetrics-Android/2.0.3");
+			connection.setRequestProperty("User-Agent", "KISSmetrics-Android/2.0.4");
 			// TODO: Apply any easily obtainable device/OS info to the user agent value 
 
 			// addressing java.io.EOFException

KISSmetricsAPI/src/com/kissmetrics/sdk/KISSmetricsAPI.java

@@ -190,6 +190,18 @@ public void run() {
 		}).start();
 	}
 
+	/**
+	 * @return app version from package info
+	 */
+	private String appVersionName() {
+		try {
+			PackageManager pkgManager = context.getPackageManager();
+			String pkg = context.getPackageName();
+			return pkgManager.getPackageInfo(pkg, 0).versionName;
+		} catch (Exception e) {
+			return null;
+		}
+	}
 
 	/**
 	 * Starts sending to empty the sendQueue when sender is in the 
@@ -311,31 +323,30 @@ public void setDistinct(final String propertyName, final String value) {
 		dataExecutor.execute(trackingRunnables.setDistinct(propertyName,
 				value, ArchiverImpl.sharedArchiver(), this));
 	}
-
+	
 	/**
 	 * Automatically records the following events "Installed App" "Updated App"
 	 */
 	public void autoRecordInstalls() {
 
-		PackageManager pkgManager = context.getPackageManager();
-		String versionName = "";
-
-		try {
-			String pkg = context.getPackageName();
-			versionName = pkgManager.getPackageInfo(pkg, 0).versionName;
+		String versionName = appVersionName();
+
+		if (versionName == null) {
+			versionName = "";
+		} else {
 			setDistinct("App Version", versionName);
-		} catch (Exception e) {
-			// Catch intentionally blank
 		}
 
 		// There is no reliable place to store data that will persist between
 		// app install and uninstall. We use Archiver's settings store.
 		String lastAppVersion = ArchiverImpl.sharedArchiver().getAppVersion();
-
+		
 		if (versionName.equals(lastAppVersion)) {
 			// Most common case. No action required.
 			return;
 		}
+
+		ArchiverImpl.sharedArchiver().archiveAppVersion(versionName);
 
 		if (lastAppVersion == null) {
 			// This is a fresh install
@@ -344,8 +355,6 @@ public void autoRecordInstalls() {
 			// This is an update
 			record("Updated App");
 		}
-
-		ArchiverImpl.sharedArchiver().archiveAppVersion(versionName);
 	}
 
 	/**

KISSmetricsAPIIntegrationTest/src/com/kissmetrics/sdk/ArchiverImplActTest.java

@@ -51,7 +51,7 @@ public class ArchiverImplActTest extends ActivityTestCase {
 	static QueryEncoder queryEncoder;
 
 	static String key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-	static String userAgent = "kissmetrics-android/2.0";
+	static String userAgent = "kissmetrics-android/2.0.4";
 	static String clientType = "mobile_app";