Merge pull request #55 from adjust/development

New response data fields

Author: nonelse

Adjust/build.gradle

@@ -25,7 +25,7 @@ android {
   compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
   defaultConfig {
     versionCode 11
-    versionName '3.3.3'
+    versionName '3.3.4'
     minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
     targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
   }

Adjust/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>adjust-android</artifactId>
   <groupId>com.adjust.sdk</groupId>
-  <version>3.3.3</version>
+  <version>3.3.4</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Adjust/src/com/adjust/sdk/ActivityHandler.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-06-25.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 
@@ -113,11 +113,6 @@ private void initActivityHandler(Activity activity) {
         enabled = true;
 
         logger = AdjustFactory.getLogger();
-
-        String gpsAdid = Util.getGpsAdid(context);
-        if (gpsAdid == null) {
-            logger.info("Unable to get Google Play Services Advertising ID at start time");
-        }
     }
 
     public void setSdkPrefix(String sdkPrefx) {
@@ -283,6 +278,11 @@ private void initInternal(boolean fromBundle) {
         fbAttributionId = Util.getAttributionId(context);
         userAgent = Util.getUserAgent(context);
 
+        String gpsAdid = Util.getGpsAdid(context);
+        if (gpsAdid == null) {
+            logger.info("Unable to get Google Play Services Advertising ID at start time");
+        }
+
         packageHandler = AdjustFactory.getPackageHandler(this, context, dropOfflineActivities);
 
         readActivityState();

Adjust/src/com/adjust/sdk/ActivityPackage.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-06-25.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 

Adjust/src/com/adjust/sdk/ActivityState.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-06-25.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 

Adjust/src/com/adjust/sdk/Adjust.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2012-10-11.
-//  Copyright (c) 2012-2013 adeven. All rights reserved.
+//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 
@@ -68,13 +68,13 @@ public static void setOnFinishedListener(OnFinishedListener listener) {
     /**
      * Tell Adjust that a particular event has happened.
      * <p/>
-     * In your dashboard at http://adjust.io you can assign a callback URL to each
+     * In your dashboard at http://adjust.com you can assign a callback URL to each
      * event type. That URL will get called every time the event is triggered. On
      * top of that you can pass a set of parameters to the following method that
      * will be forwarded to these callbacks.
      *
      * @param eventToken The Event Token for this kind of event. They are created
-     *                   in the dashboard at http://adjust.io and should be six characters long.
+     *                   in the dashboard at http://adjust.com and should be six characters long.
      * @param parameters An optional dictionary containing the callback parameters.
      *                   Provide key-value-pairs to be forwarded to your callbacks.
      */

Adjust/src/com/adjust/sdk/Constants.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by keyboardsurfer on 2013-11-08.
-//  Copyright (c) 2012-2013 adeven. All rights reserved.
+//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 
@@ -19,7 +19,7 @@ public interface Constants {
     int THIRTY_MINUTES = 30 * ONE_MINUTE;
 
     String BASE_URL   = "https://app.adjust.io";
-    String CLIENT_SDK = "android3.3.3";
+    String CLIENT_SDK = "android3.3.4";
     String LOGTAG     = "Adjust";
 
     String SESSION_STATE_FILENAME    = "AdjustIoActivityState";

Adjust/src/com/adjust/sdk/LogCatLogger.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-04-18.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 

Adjust/src/com/adjust/sdk/PackageBuilder.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-06-25.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //
 

Adjust/src/com/adjust/sdk/PackageHandler.java

@@ -3,7 +3,7 @@
 //  Adjust
 //
 //  Created by Christian Wellenbrock on 2013-06-25.
-//  Copyright (c) 2013 adeven. All rights reserved.
+//  Copyright (c) 2013 adjust GmbH. All rights reserved.
 //  See the file MIT-LICENSE for copying permission.
 //