Merge pull request #113 from adjust/clone_change

Uglješa Erceg · Uglješa Erceg · commit 14e1616c66a0 · 2015-04-30T14:50:51.000+02:00
Clone change
diff --git a/Adjust/adjust/build.gradle b/Adjust/adjust/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "4.0.4"
+        versionName "4.0.5"
     }
 }
 
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -23,6 +23,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
@@ -523,7 +524,7 @@ private ActivityPackage buildQueryStringClickPackage(String queryString, String
         }
 
         long now = System.currentTimeMillis();
-        Map<String, String> queryStringParameters = new HashMap<String, String>();
+        Map<String, String> queryStringParameters = new LinkedHashMap<String, String>();
         AdjustAttribution queryStringAttribution = new AdjustAttribution();
         boolean hasAdjustTags = false;
 
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java
@@ -84,8 +84,7 @@ public String toString() {
                 stamp(lastActivity), uuid);
     }
 
-    @Override
-    public ActivityState clone() {
+    public ActivityState shallowCopy() {
         try {
             return (ActivityState) super.clone();
         } catch (CloneNotSupportedException e) {
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEvent.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEvent.java
@@ -1,6 +1,7 @@
 package com.adjust.sdk;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -33,7 +34,7 @@ public void addCallbackParameter(String key, String value) {
         if (!isValidParameter(value, "value", "Callback")) return;
 
         if (callbackParameters == null) {
-            callbackParameters = new HashMap<String, String>();
+            callbackParameters = new LinkedHashMap<String, String>();
         }
 
         String previousValue = callbackParameters.put(key, value);
@@ -48,7 +49,7 @@ public void addPartnerParameter(String key, String value) {
         if (!isValidParameter(value, "value", "Partner")) return;
 
         if (partnerParameters == null) {
-            partnerParameters = new HashMap<String, String>();
+            partnerParameters = new LinkedHashMap<String, String>();
         }
 
         String previousValue = partnerParameters.put(key, value);
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java
@@ -27,7 +27,7 @@ public interface Constants {
     String BASE_URL = "https://app.adjust.com";
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.0.4";
+    String CLIENT_SDK = "android4.0.5";
     String LOGTAG = "Adjust";
 
     String ACTIVITY_STATE_FILENAME = "AdjustIoActivityState";
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java b/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java
@@ -59,7 +59,7 @@ class DeviceInfo {
         Configuration configuration = resources.getConfiguration();
         Locale locale = configuration.locale;
         int screenLayout = configuration.screenLayout;
-        boolean isGooglePlayServicesAvailable = Reflection.isGooglePlayServicesAvailable(context);
+        boolean isGooglePlayServicesAvailable = Reflection.getPlayAdId(context) != null;
         String macAddress = getMacAddress(context, isGooglePlayServicesAvailable);
 
         packageName = getPackageName(context);
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java b/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java
@@ -36,7 +36,7 @@ public PackageBuilder(AdjustConfig adjustConfig,
                           long createdAt) {
         this.adjustConfig = adjustConfig;
         this.deviceInfo = deviceInfo;
-        this.activityState = activityState.clone();
+        this.activityState = activityState.shallowCopy();
         this.createdAt = createdAt;
     }
 
diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Reflection.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Reflection.java
@@ -40,22 +40,6 @@ public static Boolean isPlayTrackingEnabled(Context context) {
         }
     }
 
-    public static boolean isGooglePlayServicesAvailable(Context context) {
-        try {
-            Integer isGooglePlayServicesAvailableStatusCode = (Integer) invokeStaticMethod(
-                    "com.google.android.gms.common.GooglePlayServicesUtil",
-                    "isGooglePlayServicesAvailable",
-                    new Class[]{Context.class}, context
-            );
-
-            boolean isGooglePlayServicesAvailable = (Boolean) isConnectionResultSuccess(isGooglePlayServicesAvailableStatusCode);
-
-            return isGooglePlayServicesAvailable;
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
     public static String getMacAddress(Context context) {
         try {
             String macSha1 = (String) invokeStaticMethod(
diff --git a/Adjust/example/build.gradle b/Adjust/example/build.gradle
@@ -28,5 +28,5 @@ dependencies {
     // running mvn package
     //compile fileTree(dir: '../target', include: ['*.jar'])
     // using maven repository
-    //compile 'com.adjust.sdk:adjust-android:4.0.4'
+    //compile 'com.adjust.sdk:adjust-android:4.0.5'
 }
diff --git a/Adjust/pom.xml b/Adjust/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.0.4</version>
+    <version>4.0.5</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>
@@ -23,6 +23,12 @@
             <organization>adjust GmbH</organization>
             <organizationUrl>http://www.adjust.com</organizationUrl>
         </developer>
+        <developer>
+            <name>Ugljesa Erceg</name>
+            <email>ugljesa@adjust.com</email>
+            <organization>adjust GmbH</organization>
+            <organizationUrl>http://www.adjust.com</organizationUrl>
+        </developer>
     </developers>
     <scm>
         <connection>scm:git:git@github.com:adjust/android_sdk.git</connection>
diff --git a/Adjust/test/build.gradle b/Adjust/test/build.gradle
@@ -10,7 +10,12 @@ android {
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
+    compile 'com.google.code.gson:gson:2.2.4'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':adjust')
 }
diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java
@@ -3,6 +3,8 @@
 import com.adjust.sdk.ActivityKind;
 import com.adjust.sdk.ActivityPackage;
 import com.adjust.sdk.AdjustAttribution;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 
 import junit.framework.Assert;
 
@@ -45,7 +47,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.0.4";
+        clientSdk = "android4.0.5";
         suffix = "";
         attribution = new AdjustAttribution();
     }
@@ -104,9 +106,9 @@ public void testEventPackage(String eventToken) {
         // currency
         assertParameterEquals("currency", currency);
         // callback_params
-        assertParameterEquals("callback_params", callbackParams);
+        assertJsonParameterEquals("callback_params", callbackParams);
         // partner_params
-        assertParameterEquals("partner_params", partnerParams);
+        assertJsonParameterEquals("partner_params", partnerParams);
     }
 
     public void testClickPackage(String source) {
@@ -124,7 +126,7 @@ public void testClickPackage(String source) {
         assertParameterEquals("reftag", reftag);
 
         // params
-        assertParameterEquals("params", deepLinkParameters);
+        assertJsonParameterEquals("params", deepLinkParameters);
 
         // click_time
         assertParameterNotNull("click_time");
@@ -178,7 +180,7 @@ private void testDefaultParameters() {
     private void testDeviceInfo() {
         testDeviceInfoIds();
         // fb_id
-        assertParameterNotNull("fb_id");
+        //assertParameterNotNull("fb_id");
         // package_name
         assertParameterNotNull("package_name");
         // app_version
@@ -297,10 +299,24 @@ private void assertParameterEquals(String parameterName, String value) {
             assertParameterNull(parameterName);
             return;
         }
+
         Assert.assertEquals(activityPackage.getExtendedString(),
                 value, parameters.get(parameterName));
     }
 
+    private void assertJsonParameterEquals(String parameterName, String value) {
+        if (value == null) {
+            assertParameterNull(parameterName);
+            return;
+        }
+
+        JsonParser parser = new JsonParser();
+        JsonElement e1 = parser.parse(value);
+        JsonElement e2 = parser.parse(parameters.get(parameterName));
+
+        assertEquals(e1, e2);
+    }
+
     private void assertParameterEquals(String parameterName, int value) {
         Assert.assertEquals(activityPackage.getExtendedString(),
                 value, Integer.parseInt(parameters.get(parameterName)));
diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestRequestHandler.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestRequestHandler.java
@@ -9,6 +9,8 @@
 import com.adjust.sdk.AdjustConfig;
 import com.adjust.sdk.AdjustFactory;
 import com.adjust.sdk.RequestHandler;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 
 /**
  * Created by pfms on 30/01/15.
@@ -204,7 +206,11 @@ private void attributionTest(boolean sendClick) {
 
         assertUtil.info("No message found");
 
-        assertUtil.test("PackageHandler finishedTrackingActivity, {\"attribution\":{\"tracker_token\":\"ttValue\",\"tracker_name\":\"tnValue\",\"network\":\"nValue\",\"campaign\":\"cpValue\",\"adgroup\":\"aValue\",\"creative\":\"ctValue\"}}");
+        JsonParser parser = new JsonParser();
+        JsonElement e1 = parser.parse("{\"attribution\":{\"tracker_token\":\"ttValue\",\"tracker_name\":\"tnValue\",\"network\":\"nValue\",\"campaign\":\"cpValue\",\"adgroup\":\"aValue\",\"creative\":\"ctValue\"}}");
+        JsonElement e2 = parser.parse(mockPackageHandler.jsonResponse.toString());
+
+        assertEquals(e1, e2);
 
         sendNextPackage(sendClick);
     }
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ compile project(":adjust")
 If you are using Maven, add this line instead:
 
 ```
-compile 'com.adjust.sdk:adjust-android:4.0.4'
+compile 'com.adjust.sdk:adjust-android:4.0.5'
 ```
 
 ### 4. Add Google Play Services
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.4
+4.0.5
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 4.0.4 from 3.6.2
+## Migrate your adjust SDK for Android to 4.0.5 from 3.6.2
 
 ### The Application class
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ android {`
`8`	`8`	`minSdkVersion 9`
`9`	`9`	`targetSdkVersion 21`
`10`	`10`	`versionCode 1`
`11`		`- versionName "4.0.4"`
	`11`	`+ versionName "4.0.5"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ public String toString() {`
`84`	`84`	`stamp(lastActivity), uuid);`
`85`	`85`	`}`
`86`	`86`
`87`		`- @Override`
`88`		`- public ActivityState clone() {`
	`87`	`+ public ActivityState shallowCopy() {`
`89`	`88`	`try {`
`90`	`89`	`return (ActivityState) super.clone();`
`91`	`90`	`} catch (CloneNotSupportedException e) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public PackageBuilder(AdjustConfig adjustConfig,`
`36`	`36`	`long createdAt) {`
`37`	`37`	`this.adjustConfig = adjustConfig;`
`38`	`38`	`this.deviceInfo = deviceInfo;`
`39`		`- this.activityState = activityState.clone();`
	`39`	`+ this.activityState = activityState.shallowCopy();`
`40`	`40`	`this.createdAt = createdAt;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ dependencies {`
`28`	`28`	`// running mvn package`
`29`	`29`	`//compile fileTree(dir: '../target', include: ['*.jar'])`
`30`	`30`	`// using maven repository`
`31`		`- //compile 'com.adjust.sdk:adjust-android:4.0.4'`
	`31`	`+ //compile 'com.adjust.sdk:adjust-android:4.0.5'`
`32`	`32`	`}`