Release 3.4.8

Unity-Technologies · Aug 6, 2020 · 16bb091 · 16bb091
1 parent c70247b
commit 16bb091
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 78 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.unity3d.ads.example"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode = 3460
-        versionName = "3.4.6"
+        versionCode = 3480
+        versionName = "3.4.8"
     }
 
     flavorDimensions "arEnabled"

diff --git a/unity-ads/build.gradle b/unity-ads/build.gradle
@@ -16,7 +16,7 @@ ext {
     siteUrl = 'https://github.com/Unity-Technologies/unity-ads-android'
     gitUrl = 'https://github.com/Unity-Technologies/unity-ads-android.git'
 
-    libraryVersion = '3.4.6'
+    libraryVersion = '3.4.8'
 
     developerId = 'sbankhead'
     developerName = 'Steven Bankhead'
@@ -50,8 +50,8 @@ android {
     All SDK with version numbers with last two digits >= 50 will be treated
     as China SDK for filtering in the backend.
     */
-    versionCode = 3460
-    versionName = "3.4.6"
+    versionCode = 3480
+    versionName = "3.4.8"
 
     setProperty("archivesBaseName", "unity-ads")
 

diff --git a/unity-ads/src/main/java/com/unity3d/services/core/connectivity/ConnectivityMonitor.java b/unity-ads/src/main/java/com/unity3d/services/core/connectivity/ConnectivityMonitor.java
@@ -101,7 +101,11 @@ private static void initConnectionStatus() {
 
 			if(!_wifi) {
 				TelephonyManager tm = (TelephonyManager)ClientProperties.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-				_networkType = tm.getNetworkType();
+				try {
+					_networkType = tm.getNetworkType();
+				} catch (SecurityException ex) {
+					DeviceLog.warning("Unity Ads was not able to get current network type due to missing permission");
+				}
 			}
 		} else {
 			_connected = 0;
@@ -159,7 +163,13 @@ public static void connectionStatusChanged() {
 		if(ni != null && ni.isConnected()) {
 			boolean wifiStatus = ni.getType() == ConnectivityManager.TYPE_WIFI;
 			TelephonyManager tm = (TelephonyManager)ClientProperties.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-			int mobileNetworkType = tm.getNetworkType();
+			int mobileNetworkType = -1;
+
+			try {
+				mobileNetworkType = tm.getNetworkType();
+			} catch (SecurityException ex) {
+				DeviceLog.warning("Unity Ads was not able to get current network type due to missing permission");
+			}
 
 			// If wifi status and network type have not changed, ignore this event. If wifi is on, mobile network type does not need to match.
 			if(wifiStatus == _wifi && (mobileNetworkType == _networkType || _wifi)) {

diff --git a/unity-ads/src/main/java/com/unity3d/services/core/device/Device.java b/unity-ads/src/main/java/com/unity3d/services/core/device/Device.java
@@ -121,7 +121,11 @@ public static boolean isUsingWifi () {
 	public static int getNetworkType() {
 		if (ClientProperties.getApplicationContext() != null) {
 			TelephonyManager tm = (TelephonyManager)ClientProperties.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-			return tm.getNetworkType();
+			try {
+				return tm.getNetworkType();
+			} catch (SecurityException ex) {
+				DeviceLog.warning("Unity Ads was not able to get current network type due to missing permission");
+			}
 		}
 
 		return -1;