Merge pull request #135 from adjust/state_protection

State protection
adjust · Jul 17, 2015 · 371059a · 371059a
2 parents 2c079dd + 7635a7d
commit 371059a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 10 deletions.
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.9"
+        versionName "4.1.0"
     }
 }
 

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -155,7 +155,10 @@ public void setEnabled(boolean enabled) {
         }
 
         this.enabled = enabled;
-        if (activityState != null) {
+
+        if (activityState == null) {
+            trackSubsessionStart();
+        } else {
             activityState.enabled = enabled;
             writeActivityState();
         }
@@ -209,6 +212,10 @@ public void setOfflineMode(boolean offline) {
 
         this.offline = offline;
 
+        if (activityState == null) {
+            trackSubsessionStart();
+        }
+
         updateStatus(offline,
                 "Pausing package and attribution handler to put in offline mode",
                 "Package and attribution handler remain paused because the SDK is disabled",

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

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.9'
+    //compile 'com.adjust.sdk:adjust-android:4.1.0'
 }
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.9</version>
+    <version>4.1.0</version>
     <packaging>jar</packaging>
     <name>Adjust Android SDK</name>
     <url>https://github.com/adjust/android_sdk</url>

diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityHandler.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityHandler.java
@@ -585,7 +585,7 @@ public void testDisable() {
         config.setLogLevel(LogLevel.ERROR);
 
         // start activity handler with config
-        ActivityHandler activityHandler = getActivityHandler(config);
+        ActivityHandler activityHandler = ActivityHandler.getInstance(config);
 
         // check that is true by default
         assertUtil.isTrue(activityHandler.isEnabled());

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

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

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.9
+4.1.0
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 4.0.9 from 3.6.2
+## Migrate your adjust SDK for Android to 4.1.0 from 3.6.2
 
 ### The Application class