Merge pull request #53 from adjust/foreground_background

Foreground background

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
 	public class AdjustAndroid : IAdjust
 	{
-		private const string sdkPrefix = "unity4.0.3";
+		private const string sdkPrefix = "unity4.0.4";
 		private AndroidJavaClass ajcAdjust;
 		private AndroidJavaObject ajoCurrentActivity;
 		private AttributionChangeListener onAttributionChangedListener;
@@ -84,11 +84,11 @@ public void start (AdjustConfig adjustConfig)
 
 			ajoAdjustConfig.Call ("setSdkPrefix", sdkPrefix);
 
+			// Since INSTALL_REFERRER is not triggering SDK initialisation, call onResume after onCreate.
+			// OnApplicationPause doesn't get called first time the scene loads, so call to onResume is needed.
+			
 			ajcAdjust.CallStatic ("onCreate", ajoAdjustConfig);
-
-			if (adjustConfig.startAutomatically == true) {
-				ajcAdjust.CallStatic ("onResume");
-			}
+			ajcAdjust.CallStatic ("onResume");
 		}
 
 		public void trackEvent (AdjustEvent adjustEvent)

Assets/Adjust/Android/adjust-android.jar

@@ -26,7 +26,6 @@ void OnGUI ()
 		if (GUI.Button (new Rect (0, Screen.height * 0 / nr_buttons, Screen.width, Screen.height / nr_buttons), txtManualLaunch)) {
 			if (!string.Equals(txtManualLaunch, "SDK Launched", StringComparison.OrdinalIgnoreCase)) {
 				AdjustConfig adjustConfig = new AdjustConfig ("{YourAppToken}", AdjustEnvironment.Sandbox);
-				adjustConfig.setStartAutomatically(true);
 				adjustConfig.setLogLevel (AdjustLogLevel.Verbose);
 				adjustConfig.setAttributionChangedDelegate (this.attributionChangedDelegate);
 

Assets/Adjust/Android/adjust-android.jar.meta

@@ -8,7 +8,6 @@ public class AdjustConfig
 		internal string sceneName;
 		internal string defaultTracker;
 
-		internal bool? startAutomatically;
 		internal bool? eventBufferingEnabled;
 
 		internal AdjustLogLevel? logLevel;
@@ -26,7 +25,6 @@ public AdjustConfig (string appToken, AdjustEnvironment environment)
 			this.sceneName = "";
 			this.appToken = appToken;
 			this.environment = environment;
-			this.startAutomatically = false;
 			this.macMd5TrackingEnabled = false;
 			this.processName = "";
 		}
@@ -36,11 +34,6 @@ public void setLogLevel (AdjustLogLevel logLevel)
 			this.logLevel = logLevel;
 		}
 
-		public void setStartAutomatically (bool shouldStartAutomatically)
-		{
-			this.startAutomatically = shouldStartAutomatically;
-		}
-
 		public void setDefaultTracker (string defaultTracker)
 		{
 			this.defaultTracker = defaultTracker;

Assets/Adjust/ExampleGUI/ExampleGUI.cs

@@ -88,7 +88,7 @@
  * @param delegate The delegate that might implement the optional delegate
  *     methods like adjustAttributionChanged:
  */
-@property (nonatomic, retain) NSObject<AdjustDelegate> *delegate;
+@property (nonatomic, weak) NSObject<AdjustDelegate> *delegate;
 @property (nonatomic, assign) BOOL hasDelegate;
 
 - (BOOL) isValid;

Assets/Adjust/Unity/AdjustConfig.cs

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
 	public class AdjustiOS : IAdjust
 	{
-		private const string sdkPrefix = "unity4.0.3";
+		private const string sdkPrefix = "unity4.0.4";
 
 		#region External methods
 

Assets/Adjust/iOS/ADJConfig.h

@@ -1 +1 @@
-4.0.3
+4.0.4

Assets/Adjust/iOS/Adjust.a

@@ -1,22 +1,22 @@
-## Migrate your adjust SDK for Unity3d to 4.0.3 from 3.4.4
+## Migrate your adjust SDK for Unity3d to 4.0.4 from 3.4.4
 
-N.B. At the moment, SDK 4.0.3 for Unity supports Android and iOS, but not Windows. If you are planning to release your Unity app on Windows, please migrate to 4.0.3 only when we add full support for Windows.
+N.B. At the moment, SDK 4.0.4 for Unity supports Android and iOS, but not Windows. If you are planning to release your Unity app on Windows, please migrate to 4.0.4 only when we add full support for Windows.
 
 ### Migration procedure
 
-Starting from version 4.0.3, the structure of this repository is adjusted to Unity 5. All files which are part of the
+Starting from version 4.0.4, the structure of this repository is adjusted to Unity 5. All files which are part of the
 adjust SDK are now moved to the `Assets/Adjust` folder, since Unity 5 allows that native files can now be placed 
 outside of `Assets/Plugins` folder. This is done so that adjust files are no longer mixed with files you may be 
 keeping in `Assets/Plugins` folder.
 
 For migration purposes, we have prepared two Unity packages:
 
-  * `Adjust_v4.0.3_Unity_4.unitypackage` (for Unity 4 users)
-  * `Adjust_v4.0.3_Unity_5.unitypackage` (for Unity 5 users)
+  * `Adjust_v4.0.4_Unity_4.unitypackage` (for Unity 4 users)
+  * `Adjust_v4.0.4_Unity_5.unitypackage` (for Unity 5 users)
 
 and the adjust SDK uninstall script written in Python (`adjust_uninstall.py`).
 
-Migration to version 4.0.3 of our SDK requires the following steps:
+Migration to version 4.0.4 of our SDK requires the following steps:
 
 1. Copy the `adjust_uninstall.py` script to your root Unity project directory and run it. This script should
 delete all adjust source files from the previous SDK version you had.