Version 2.0.0-beta3

Author: Ville Orkas

app/build.gradle

@@ -9,7 +9,7 @@ android {
     minSdkVersion 9
     targetSdkVersion 23
     versionCode = 2000
-    versionName = "2.0.0-beta2"
+    versionName = "2.0.0-beta3"
   }
   buildTypes {
     release {

app/src/main/java/com/unity3d/ads/example/UnityAdsExample.java

@@ -10,6 +10,7 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.unity3d.ads.IUnityAdsListener;
@@ -76,6 +77,7 @@ public void onClick(View v) {
 		final Button initializeButton = (Button) findViewById(R.id.unityads_example_initialize_button);
 		final EditText gameIdEdit = (EditText) findViewById(R.id.unityads_example_gameid_edit);
 		final CheckBox testModeCheckbox = (CheckBox) findViewById(R.id.unityads_example_testmode_checkbox);
+		final TextView statusText = (TextView) findViewById(R.id.unityads_example_statustext);
 
 		SharedPreferences preferences = getSharedPreferences("Settings", MODE_PRIVATE);
 		gameIdEdit.setText(preferences.getString("gameId", defaultGameId));
@@ -93,6 +95,7 @@ public void onClick(View v) {
 				gameIdEdit.setEnabled(false);
 				testModeCheckbox.setEnabled(false);
 
+				statusText.setText("Initializing...");
 				UnityAds.initialize(self, gameId, unityAdsListener, testModeCheckbox.isChecked());
 
 				// store entered gameid in app settings
@@ -174,6 +177,9 @@ private class UnityAdsListener implements IUnityAdsListener {
 
 		@Override
 		public void onUnityAdsReady(final String zoneId) {
+			TextView statusText = (TextView) findViewById(R.id.unityads_example_statustext);
+			statusText.setText("");
+
 			DeviceLog.debug("onUnityAdsReady: " + zoneId);
 			Utilities.runOnUiThread(new Runnable() {
 				@Override
@@ -216,6 +222,9 @@ public void onUnityAdsFinish(String zoneId, UnityAds.FinishState result) {
 		public void onUnityAdsError(UnityAds.UnityAdsError error, String message) {
 			DeviceLog.debug("onUnityAdsError: " + error + " - " + message);
 			toast("Error", error + " " + message);
+
+			TextView statusText = (TextView) findViewById(R.id.unityads_example_statustext);
+			statusText.setText(error + " - " + message);
 		}
 
 		private void toast(String callback, String msg) {

app/src/main/res/layout/unityads_example_layout.xml

@@ -123,4 +123,19 @@
 
     </LinearLayout>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:id="@+id/unityads_example_statustext"
+        android:layout_below="@+id/unityads_example_button_container"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:textAlignment="center"
+        android:textColor="#ffffff"
+        android:gravity="center" />
+
 </RelativeLayout>

lib/build.gradle

@@ -13,7 +13,7 @@ android {
     minSdkVersion 9
     targetSdkVersion 23
     versionCode = 2000
-    versionName = "2.0.0-beta2"
+    versionName = "2.0.0-beta3"
 
     setProperty("archivesBaseName", "unity-ads")
 

lib/src/androidTest/java/com/unity3d/ads/test/hybrid/HybridTest.java

@@ -61,6 +61,7 @@ public void run() {
     Configuration configuration = new Configuration();
     final Class[] apiClassList = {
       com.unity3d.ads.api.AdUnit.class,
+      com.unity3d.ads.api.Broadcast.class,
       com.unity3d.ads.api.Cache.class,
       com.unity3d.ads.api.Connectivity.class,
       com.unity3d.ads.api.DeviceInfo.class,

lib/src/androidTest/java/com/unity3d/ads/test/unit/BroadcastTest.java

@@ -17,6 +17,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +34,11 @@ public void setup() {
 		ClientProperties.setApplicationContext(InstrumentationRegistry.getTargetContext());
 	}
 
+	@After
+	public void cleanup() {
+		BroadcastMonitor.removeAllBroadcastListeners();
+	}
+
 	@Test
 	public void testOneReceiver() {
 		final String testAction = "com.unity3d.ads.ACTION_TEST";

lib/src/androidTest/java/com/unity3d/ads/test/unit/EnvironmentCheckTest.java

@@ -21,4 +21,9 @@ public void testIsEnvironmentCheckOk() {
 	public void testProGuardTest() {
 		assertTrue("Environment check for ProGuard failed", EnvironmentCheck.testProGuard());
 	}
+
+	@Test
+	public void testCacheDirectory() {
+		assertTrue("Environment check for cache directory failed", EnvironmentCheck.testCacheDirectory());
+	}
 }

lib/src/main/java/com/unity3d/ads/UnityAds.java

@@ -119,6 +119,11 @@ public static void initialize(final Activity activity, final String gameId, fina
 			DeviceLog.info("Initializing Unity Ads " + SdkProperties.getVersionName() + " (" + SdkProperties.getVersionCode() + ") with game id " + gameId + " in production mode");
 		}
 
+		ClientProperties.setGameId(gameId);
+		ClientProperties.setListener(listener);
+		ClientProperties.setApplicationContext(activity.getApplicationContext());
+		SdkProperties.setTestMode(testMode);
+
 		if(EnvironmentCheck.isEnvironmentOk()) {
 			DeviceLog.info("Unity Ads environment check OK");
 		} else {
@@ -129,11 +134,6 @@ public static void initialize(final Activity activity, final String gameId, fina
 			return;
 		}
 
-		ClientProperties.setGameId(gameId);
-		ClientProperties.setListener(listener);
-		ClientProperties.setApplicationContext(activity.getApplicationContext());
-		SdkProperties.setTestMode(testMode);
-
 		Configuration configuration = new Configuration();
 		Class[] apiClassList = {
 			com.unity3d.ads.api.AdUnit.class,

lib/src/main/java/com/unity3d/ads/broadcast/BroadcastMonitor.java

@@ -35,14 +35,14 @@ public static void addBroadcastListener(String name, String dataScheme, String[]
 	public static void removeBroadcastListener(String name) {
 		if(_eventReceivers != null && _eventReceivers.containsKey(name)) {
 			ClientProperties.getApplicationContext().unregisterReceiver(_eventReceivers.get(name));
-			_eventReceivers.remove(_eventReceivers.get(name));
+			_eventReceivers.remove(name);
 		}
 	}
 
 	public static void removeAllBroadcastListeners() {
 		if(_eventReceivers != null) {
 			for(String key : _eventReceivers.keySet()) {
-				removeBroadcastListener(key);
+				ClientProperties.getApplicationContext().unregisterReceiver(_eventReceivers.get(key));
 			}
 
 			_eventReceivers = null;

lib/src/main/java/com/unity3d/ads/cache/CacheDirectory.java

@@ -0,0 +1,118 @@
+package com.unity3d.ads.cache;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Environment;
+
+import com.unity3d.ads.log.DeviceLog;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+public class CacheDirectory {
+	private static final String TEST_FILE_NAME = "UnityAdsTest.txt";
+
+	private String _cacheDirName;
+	private boolean _initialized = false;
+	private File _cacheDirectory = null;
+
+	public CacheDirectory(String cacheDirName) {
+		_cacheDirName = cacheDirName;
+	}
+
+	public File getCacheDirectory(Context context) {
+		if(_initialized) {
+			return _cacheDirectory;
+		} else {
+			_initialized = true;
+
+			if(Build.VERSION.SDK_INT > 18) {
+				if(Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+					File externalCache = createCacheDirectory(context.getExternalCacheDir(), _cacheDirName);
+					if(testCacheDirectory(externalCache)) {
+						_cacheDirectory = externalCache;
+						DeviceLog.debug("Unity Ads is using external cache directory: " + externalCache.getAbsolutePath());
+						return _cacheDirectory;
+					}
+				} else {
+					DeviceLog.debug("External media not mounted");
+				}
+			}
+
+			File internalCache = context.getFilesDir();
+			if(testCacheDirectory(internalCache)) {
+				_cacheDirectory = internalCache;
+				DeviceLog.debug("Unity Ads is using internal cache directory: " + internalCache.getAbsolutePath());
+				return _cacheDirectory;
+			}
+
+			DeviceLog.error("Unity Ads failed to initialize cache directory");
+			return null;
+		}
+	}
+
+	public File createCacheDirectory(File baseDir, String newDir) {
+		if(baseDir == null) {
+			return null;
+		}
+
+		File directory = new File(baseDir, newDir);
+
+		directory.mkdirs();
+
+		if(directory.isDirectory()) {
+			return directory;
+		} else {
+			return null;
+		}
+	}
+
+	public boolean testCacheDirectory(File directory) {
+		if(directory == null || !directory.isDirectory()) {
+			return false;
+		}
+
+		try {
+			final byte[] inData = "test".getBytes("UTF-8");
+			byte[] outData = new byte[inData.length];
+			File testFile = new File(directory, TEST_FILE_NAME);
+
+			FileOutputStream fos = new FileOutputStream(testFile);
+			fos.write(inData);
+			fos.flush();
+			fos.close();
+
+			if(directory.listFiles() == null) {
+				DeviceLog.debug("Failed to list files in directory " + directory.getAbsolutePath());
+				return false;
+			}
+
+			FileInputStream fis = new FileInputStream(testFile);
+			int readCount = fis.read(outData, 0, outData.length);
+			fis.close();
+
+			if(!testFile.delete()) {
+				DeviceLog.debug("Failed to delete testfile " + testFile.getAbsoluteFile());
+				return false;
+			}
+
+			if(readCount != outData.length) {
+				DeviceLog.debug("Read buffer size mismatch");
+				return false;
+			}
+
+			String result = new String(outData, "UTF-8");
+
+			if(result.equals("test")) {
+				return true;
+			} else {
+				DeviceLog.debug("Read buffer content mismatch");
+				return false;
+			}
+		} catch(Exception e) {
+			DeviceLog.debug("Unity Ads exception while testing cache directory " + directory.getAbsolutePath() + ": " + e.getMessage());
+			return false;
+		}
+	}
+}