Skip to content

Commit 71128ac

Browse files
author
Unity Ads Travis
committed
Release 2.0.7
1 parent 4dfac79 commit 71128ac

File tree

5 files changed

+33
-14
lines changed

5 files changed

+33
-14
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,8 @@ sonar:
5858

5959
javadoc:
6060
./gradlew :lib:generateReleaseJavadoc
61+
62+
zip: release
63+
cp lib/build/outputs/aar/unity-ads-release.aar unity-ads.aar
64+
zip -9r builds.zip unity-ads.aar
65+
rm unity-ads.aar

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.unity3d.ads.example"
99
minSdkVersion 9
1010
targetSdkVersion 23
11-
versionCode = 2006
12-
versionName = "2.0.6"
11+
versionCode = 2007
12+
versionName = "2.0.7"
1313
}
1414
buildTypes {
1515
release {

lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
defaultConfig {
1313
minSdkVersion 9
1414
targetSdkVersion 23
15-
versionCode = 2006
16-
versionName = "2.0.6"
15+
versionCode = 2007
16+
versionName = "2.0.7"
1717

1818
setProperty("archivesBaseName", "unity-ads")
1919

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.junit.BeforeClass;
1515
import org.junit.Test;
1616
import org.junit.runner.RunWith;
17-
import static org.junit.Assert.assertTrue;
18-
import static org.junit.Assert.assertEquals;
17+
import static org.junit.Assert.*;
18+
1919
import java.util.HashMap;
2020

2121
@RunWith(AndroidJUnit4.class)
@@ -109,6 +109,17 @@ public void testMetaDataBaseClassWithCategory () throws Exception {
109109
}
110110
}
111111

112+
@Test
113+
public void testCommitWithoutMetaDataSet () throws Exception {
114+
WebViewApp.setCurrentApp(new MetaDataWebApp());
115+
MetaData metaData = new MetaData(ClientProperties.getApplicationContext());
116+
metaData.setCategory("test");
117+
metaData.commit();
118+
119+
assertNull("Entries should still be null", metaData.getEntries());
120+
}
121+
122+
112123
private class MetaDataWebApp extends WebViewApp {
113124
public Object[] PARAMS = null;
114125
public Enum EVENT_CATEOGRY = null;

lib/src/main/java/com/unity3d/ads/metadata/MetaData.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,20 @@ public void commit () {
4949
if (StorageManager.init(_context)) {
5050
Storage storage = StorageManager.getStorage(StorageManager.StorageType.PUBLIC);
5151

52-
for (String key : _metaData.keySet()) {
53-
if (storage != null) {
54-
storage.set(key, _metaData.get(key));
52+
if (_metaData != null) {
53+
for (String key : _metaData.keySet()) {
54+
if (storage != null) {
55+
storage.set(key, _metaData.get(key));
56+
}
5557
}
56-
}
5758

58-
if (storage != null) {
59-
storage.writeStorage();
60-
storage.sendEvent(StorageEvent.SET, _metaData);
59+
if (storage != null) {
60+
storage.writeStorage();
61+
storage.sendEvent(StorageEvent.SET, _metaData);
62+
}
6163
}
62-
} else {
64+
}
65+
else {
6366
DeviceLog.error("Unity Ads could not commit metadata due to storage error");
6467
}
6568
}

0 commit comments

Comments
 (0)