Fixing bool handling in JNI and updating example GUI

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -116,43 +116,16 @@ public void trackEvent (AdjustEvent adjustEvent)
 
 		public bool isEnabled ()
 		{
-			var ajo = ajcAdjust.CallStatic<AndroidJavaObject> ("isEnabled");
-			return ConvertBoolFromJava (ajo) ?? false;
+			return ajcAdjust.CallStatic<bool> ("isEnabled");
 		}
 
 		public void setEnabled(bool enabled) {
-			ajcAdjust.CallStatic ("setEnabled", ConvertBoolToJava(enabled));
+			ajcAdjust.CallStatic ("setEnabled", enabled);
 		}
 
 		public void setOfflineMode(bool enabled)
 		{
-			ajcAdjust.CallStatic ("setOfflineMode", ConvertBoolToJava (enabled));
-		}
-
-		#endregion
-
-		#region Private & helper methods
-
-		private AndroidJavaObject ConvertBoolToJava(bool value) 
-		{
-			AndroidJavaObject javaBool = new AndroidJavaObject ("java.lang.Boolean", value.ToString ().ToLower ());
-
-			return javaBool;
-		}
-
-		private bool? ConvertBoolFromJava (AndroidJavaObject ajo)
-		{
-			if (ajo == null) {
-				return null;
-			}
-
-			var sBool = ajo.Call<string> ("toString");
-			
-			try {
-				return Convert.ToBoolean (sBool);
-			} catch (FormatException) {
-				return null;
-			}
+			ajcAdjust.CallStatic ("setOfflineMode", enabled);
 		}
 
 		#endregion

Assets/Adjust/ExampleGUI/ExampleGUI.cs

@@ -1,40 +1,56 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Runtime.InteropServices;
 
 using UnityEngine;
+using UnityEngine.UI;
 using com.adjust.sdk;
 
 public class ExampleGUI : MonoBehaviour
 {
-	private int nr_buttons = 5;
-	private static bool? isEnabled;
+	private int nr_buttons = 8;
+
+	private static bool isEnabled;
+	private bool showPopUp = false;
+
+	private string txtManualLaunch = "Manual Launch";
+	private string txtSetOfflineMode = "Turn Offline Mode ON";
+	private string txtSetEnabled = "Disable SDK";
 
 	void OnGUI ()
 	{
-		if (GUI.Button (new Rect (0, Screen.height * 0 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Manual Launch")) {
-			AdjustConfig adjustConfig = new AdjustConfig ("{YourAppToken}", AdjustEnvironment.Sandbox);
-			adjustConfig.setLogLevel (AdjustLogLevel.Verbose);
-			adjustConfig.setAttributionChangedDelegate (this.attributionChangedDelegate);
-			
-			Adjust.start (adjustConfig);
-			isEnabled = true;
+		if (showPopUp) {
+			GUI.Window(0, new Rect((Screen.width / 2) - 150, (Screen.height / 2) - 65, 300, 130), showGUI, "Is SDK enabled?");
+		}
+
+		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.setLogLevel (AdjustLogLevel.Verbose);
+				adjustConfig.setAttributionChangedDelegate (this.attributionChangedDelegate);
+				
+				Adjust.start (adjustConfig);
+				isEnabled = true;
+
+				txtManualLaunch = "SDK Launched";
+			}
 		}
 
 		if (GUI.Button (new Rect (0, Screen.height * 1 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Track Simple Event")) {
-			AdjustEvent adjustEvent = new AdjustEvent ("{EventToken}");
+			AdjustEvent adjustEvent = new AdjustEvent ("{YourEventToken}");
 
 			Adjust.trackEvent (adjustEvent);
 		}
 
 		if (GUI.Button (new Rect (0, Screen.height * 2 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Track Revenue Event")) {
-			AdjustEvent adjustEvent = new AdjustEvent ("{EventToken}");
+			AdjustEvent adjustEvent = new AdjustEvent ("{YourEventToken}");
 			adjustEvent.setRevenue (0.25, "EUR");
 
 			Adjust.trackEvent (adjustEvent);
 		}
 
 		if (GUI.Button (new Rect (0, Screen.height * 3 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Track Callback Event")) {
-			AdjustEvent adjustEvent = new AdjustEvent ("{EventToken}");
+			AdjustEvent adjustEvent = new AdjustEvent ("{YourEventToken}");
 
 			adjustEvent.addCallbackParameter ("key", "value");
 			adjustEvent.addCallbackParameter ("foo", "bar");
@@ -43,14 +59,58 @@ void OnGUI ()
 		}
 
 		if (GUI.Button (new Rect (0, Screen.height * 4 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Track Partner Event")) {
-			AdjustEvent adjustEvent = new AdjustEvent ("{EventToken}");
+			AdjustEvent adjustEvent = new AdjustEvent ("{YourEventToken}");
 
 			adjustEvent.addPartnerParameter ("key", "value");
 			adjustEvent.addPartnerParameter ("foo", "bar");
 
 			Adjust.trackEvent (adjustEvent);
 		}
+
+		if (GUI.Button (new Rect (0, Screen.height * 5 / nr_buttons, Screen.width, Screen.height / nr_buttons), txtSetOfflineMode)) {
+			if (string.Equals(txtSetOfflineMode, "Turn Offline Mode ON", StringComparison.OrdinalIgnoreCase)) {
+				Adjust.setOfflineMode(true);
+
+				txtSetOfflineMode = "Turn Offline Mode OFF";
+			} else {
+				Adjust.setOfflineMode(false);
+
+				txtSetOfflineMode = "Turn Offline Mode ON";
+			}
+		}
+
+		if (GUI.Button (new Rect (0, Screen.height * 6 / nr_buttons, Screen.width, Screen.height / nr_buttons), txtSetEnabled)) {
+			if (string.Equals(txtSetEnabled, "Disable SDK", StringComparison.OrdinalIgnoreCase)) {
+				Adjust.setEnabled(false);
+
+				txtSetEnabled = "Enable SDK";
+			} else {
+				Adjust.setEnabled(true);
+
+				txtSetEnabled = "Disable SDK";
+			}
+		}
+
+		if (GUI.Button (new Rect (0, Screen.height * 7 / nr_buttons, Screen.width, Screen.height / nr_buttons), "Is SDK Enabled?")) {
+			isEnabled = Adjust.isEnabled();
+
+			showPopUp = true;
+		}
 	}
+
+	void showGUI(int windowID)
+    {
+
+    	if (isEnabled) {
+        	GUI.Label(new Rect(65, 40, 200, 30), "Adjust SDK is ENABLED!");
+    	} else {
+    		GUI.Label(new Rect(65, 40, 200, 30), "Adjust SDK is DISABLED!");
+    	}
+       
+        if (GUI.Button(new Rect(90, 75, 120, 40), "OK")) {
+            showPopUp = false;
+        }
+    }
 
 	public void attributionChangedDelegate (AdjustAttribution attribution)
 	{