Merge pull request #116 from adjust/attribution_handler

Attribution handler
adjust · May 8, 2015 · 18d8932 · 18d8932
2 parents 2203cc3 + e2eecb2
commit 18d8932
Show file tree

Hide file tree

Showing 20 changed files with 340 additions and 83 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.5"
+        versionName "4.0.6"
     }
 }
 

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -9,6 +9,7 @@
 
 package com.adjust.sdk;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -89,6 +90,25 @@ public static ActivityHandler getInstance(AdjustConfig adjustConfig) {
             return null;
         }
 
+        if (adjustConfig.processName != null) {
+            int currentPid = android.os.Process.myPid();
+            ActivityManager manager = (ActivityManager) adjustConfig.context.getSystemService(Context.ACTIVITY_SERVICE);
+
+            if (manager == null) {
+                return null;
+            }
+
+            for (ActivityManager.RunningAppProcessInfo processInfo : manager.getRunningAppProcesses()) {
+                if (processInfo.pid == currentPid) {
+                    if (!processInfo.processName.equalsIgnoreCase(adjustConfig.processName)) {
+                        AdjustFactory.getLogger().info("Skipping initialization in background process (%s)", processInfo.processName);
+                        return null;
+                    }
+                    break;
+                }
+            }
+        }
+
         ActivityHandler activityHandler = new ActivityHandler(adjustConfig);
         return activityHandler;
     }
@@ -140,6 +160,7 @@ public void setEnabled(boolean enabled) {
         this.enabled = enabled;
         if (activityState != null) {
             activityState.enabled = enabled;
+            writeActivityState();
         }
         if (enabled) {
             if (toPause()) {
@@ -441,10 +462,17 @@ private void processSession() {
     }
 
     private void checkAttributionState() {
-        // if there is no attribution saved, or there is one being asked
-        if (attribution == null || activityState.askingAttribution) {
-            getAttributionHandler().getAttribution();
+        // if it's a new session
+        if (activityState.subsessionCount <= 1) {
+            return;
         }
+
+        // if there is already an attribution saved and there was no attribution being asked
+        if (attribution != null && !activityState.askingAttribution) {
+            return;
+        }
+
+        getAttributionHandler().getAttribution();
     }
 
     private void endInternal() {
@@ -457,8 +485,8 @@ private void endInternal() {
     }
 
     private void trackEventInternal(AdjustEvent event) {
+        if (!isEnabled()) return;
         if (!checkEvent(event)) return;
-        if (!activityState.enabled) return;
 
         long now = System.currentTimeMillis();
 
@@ -749,7 +777,8 @@ private IAttributionHandler getAttributionHandler() {
             ActivityPackage attributionPackage = getAttributionPackage();
             attributionHandler = AdjustFactory.getAttributionHandler(this,
                     attributionPackage,
-                    toPause());
+                    toPause(),
+                    adjustConfig.hasListener());
         }
         return attributionHandler;
     }

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -9,6 +9,7 @@ public class AdjustConfig {
     Context context;
     String appToken;
     String environment;
+    String processName;
     LogLevel logLevel;
     String sdkPrefix;
     Boolean eventBufferingEnabled;
@@ -47,6 +48,8 @@ public void setSdkPrefix(String sdkPrefix) {
         this.sdkPrefix = sdkPrefix;
     }
 
+    public void setProcessName(String processName) { this.processName = processName; }
+
     public void setDefaultTracker(String defaultTracker) {
         this.defaultTracker = defaultTracker;
     }

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustFactory.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustFactory.java
@@ -90,11 +90,12 @@ public static IActivityHandler getActivityHandler(AdjustConfig config) {
 
     public static IAttributionHandler getAttributionHandler(IActivityHandler activityHandler,
                                                             ActivityPackage attributionPackage,
-                                                            boolean startPaused) {
+                                                            boolean startPaused,
+                                                            boolean hasListener) {
         if (attributionHandler == null) {
-            return new AttributionHandler(activityHandler, attributionPackage, startPaused);
+            return new AttributionHandler(activityHandler, attributionPackage, startPaused, hasListener);
         }
-        attributionHandler.init(activityHandler, attributionPackage, startPaused);
+        attributionHandler.init(activityHandler, attributionPackage, startPaused, hasListener);
         return attributionHandler;
     }
 

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustInstance.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustInstance.java
@@ -77,7 +77,7 @@ public void setOfflineMode(boolean enabled) {
 
     private boolean checkActivityHandler() {
         if (activityHandler == null) {
-            getLogger().error("Please initialize Adjust by calling 'onCreate' before");
+            getLogger().error("Adjust not initialized correctly");
             return false;
         } else {
             return true;

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AttributionHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AttributionHandler.java
@@ -26,23 +26,27 @@ public class AttributionHandler implements IAttributionHandler {
     private ScheduledFuture waitingTask;
     private HttpClient httpClient;
     private boolean paused;
+    private boolean hasListener;
 
     public AttributionHandler(IActivityHandler activityHandler,
                               ActivityPackage attributionPackage,
-                              boolean startPaused) {
+                              boolean startPaused,
+                              boolean hasListener) {
         scheduler = Executors.newSingleThreadScheduledExecutor();
         logger = AdjustFactory.getLogger();
         httpClient = Util.getHttpClient();
-        init(activityHandler, attributionPackage, startPaused);
+        init(activityHandler, attributionPackage, startPaused, hasListener);
     }
 
     @Override
     public void init(IActivityHandler activityHandler,
                      ActivityPackage attributionPackage,
-                     boolean startPaused) {
+                     boolean startPaused,
+                     boolean hasListener) {
         this.activityHandler = activityHandler;
         this.attributionPackage = attributionPackage;
         this.paused = startPaused;
+        this.hasListener = hasListener;
     }
 
     @Override
@@ -72,6 +76,9 @@ public void resumeSending() {
 
     private void getAttribution(int delayInMilliseconds) {
         if (waitingTask != null) {
+            if (waitingTask.getDelay(TimeUnit.MILLISECONDS) > delayInMilliseconds) {
+                return;
+            }
             waitingTask.cancel(false);
         }
 
@@ -110,6 +117,9 @@ private void checkAttributionInternal(JSONObject jsonResponse) {
     }
 
     private void getAttributionInternal() {
+        if (!hasListener) {
+            return;
+        }
         if (paused) {
             logger.debug("Attribution Handler is paused");
             return;

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

diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/IAttributionHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/IAttributionHandler.java
@@ -8,7 +8,8 @@
 public interface IAttributionHandler {
     public void init(IActivityHandler activityHandler,
                      ActivityPackage attributionPackage,
-                     boolean startPaused);
+                     boolean startPaused,
+                     boolean hasListener);
 
     public void getAttribution();
 

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.5'
+    //compile 'com.adjust.sdk:adjust-android:4.0.6'
 }
diff --git a/Adjust/example/proguard-rules.pro b/Adjust/example/proguard-rules.pro
@@ -30,7 +30,7 @@
 -keep class com.google.android.gms.ads.identifier.** { *; }
 
 #-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
-#    com.google.android.gms.ads.identifier.AdvertisingIdClient.Info getAdvertisingIdInfo (android.content.Contextxt);
+#    com.google.android.gms.ads.identifier.AdvertisingIdClient.Info getAdvertisingIdInfo (android.content.Context);
 #}
 #-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient.Info {
 #    String getId ();

diff --git a/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java b/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java
@@ -30,6 +30,9 @@ public void onCreate() {
         // set default tracker
         //config.setDefaultTracker("{YourDefaultTracker}");
 
+        // set process name
+        //config.setProcessName("com.adjust.example");
+
         // set attribution delegate
         config.setOnAttributionChangedListener(new OnAttributionChangedListener() {
             @Override

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.5</version>
+    <version>4.0.6</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/MockAttributionHandler.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/MockAttributionHandler.java
@@ -21,8 +21,12 @@ public MockAttributionHandler(MockLogger testLogger) {
     }
 
     @Override
-    public void init(IActivityHandler activityHandler, ActivityPackage attributionPackage, boolean startPaused) {
-        testLogger.test(prefix + "init, startPaused: " + startPaused);
+    public void init(IActivityHandler activityHandler,
+                     ActivityPackage attributionPackage,
+                     boolean startPaused,
+                     boolean hasListener) {
+        testLogger.test(prefix + "init, startPaused: " + startPaused +
+                ", hasListener: " + hasListener);
         this.activityHandler = activityHandler;
         this.attributionPackage = attributionPackage;
     }