Merge pull request #137 from adjust/check_state

Check state

Author: nonelse

Adjust/adjust/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "4.1.0"
+        versionName "4.1.1"
     }
 }
 

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

@@ -507,6 +507,8 @@ private void processSession() {
     }
 
     private void checkAttributionState() {
+        if (!checkActivityState(activityState)) { return; }
+
         // if it's a new session
         if (activityState.subsessionCount <= 1) {
             return;
@@ -530,6 +532,7 @@ private void endInternal() {
     }
 
     private void trackEventInternal(AdjustEvent event) {
+        if (!checkActivityState(activityState)) return;
         if (!isEnabled()) return;
         if (!checkEvent(event)) return;
 
@@ -710,6 +713,8 @@ private void launchDeeplinkMain(String deeplink) {
     }
 
     private boolean updateActivityState(long now) {
+        if (!checkActivityState(activityState)) { return false; }
+
         long lastInterval = now - activityState.lastActivity;
         // ignore late updates
         if (lastInterval > SESSION_INTERVAL) {
@@ -799,6 +804,14 @@ private boolean checkEvent(AdjustEvent event) {
         return true;
     }
 
+    private boolean checkActivityState(ActivityState activityState) {
+        if (activityState == null) {
+            logger.error("Missing activity state.");
+            return false;
+        }
+        return true;
+    }
+
     private boolean paused() {
         return offline || !isEnabled();
     }

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.1.0";
+    String CLIENT_SDK = "android4.1.1";
     String LOGTAG = "Adjust";
 
     String ACTIVITY_STATE_FILENAME = "AdjustIoActivityState";

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.1.0'
+    //compile 'com.adjust.sdk:adjust-android:4.1.1'
 }

Adjust/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>adjust-android</artifactId>
     <groupId>com.adjust.sdk</groupId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java

@@ -47,7 +47,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.1.0";
+        clientSdk = "android4.1.1";
         suffix = "";
         attribution = new AdjustAttribution();
     }

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.1.0'
+compile 'com.adjust.sdk:adjust-android:4.1.1'
 ```
 
 ### 4. Add Google Play Services

VERSION

@@ -1 +1 @@
-4.1.0
+4.1.1

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 4.1.0 from 3.6.2
+## Migrate your adjust SDK for Android to 4.1.1 from 3.6.2
 
 ### The Application class