Removed default tag. Cleanup and many warnings removed.

Heyzap · Jun 11, 2018 · 12a8066 · 12a8066
1 parent 433bde2
commit 12a8066
Show file tree

Hide file tree

Showing 14 changed files with 259 additions and 233 deletions.
diff --git a/Assets/Plugins/Android/Heyzap/AndroidManifest.xml b/Assets/Plugins/Android/Heyzap/AndroidManifest.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.heyzap">
-  <application>
-    <activity android:name="com.heyzap.sdk.ads.MediationTestActivity" />
-    <activity android:name="com.heyzap.sdk.ads.HeyzapProxyActivity" />
-    <activity android:name="com.heyzap.sdk.ads.VASTActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
-    <activity android:name="com.heyzap.sdk.ads.HeyzapInterstitialActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
-    <activity android:name="com.heyzap.sdk.ads.HeyzapVideoActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
-    <receiver android:name="com.heyzap.sdk.ads.PackageAddedReceiver">
-    <intent-filter>
-      <data android:scheme="package"/>
-      <action android:name="android.intent.action.PACKAGE_ADDED"/>
-     </intent-filter>
-    </receiver>
-  </application>
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-sdk android:minSdkVersion="9" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-sdk android:minSdkVersion="14" />
+
+    <application>
+        <activity android:name="com.heyzap.sdk.ads.MediationTestActivity" />
+        <activity android:name="com.heyzap.sdk.ads.HeyzapProxyActivity" />
+        <activity android:name="com.heyzap.sdk.ads.VASTActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
+        <activity android:name="com.heyzap.sdk.ads.HeyzapInterstitialActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
+        <activity android:name="com.heyzap.sdk.ads.HeyzapVideoActivity" android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize" />
+        <receiver android:name="com.heyzap.sdk.ads.PackageAddedReceiver">
+            <intent-filter>
+                <data android:scheme="package" />
+                <action android:name="android.intent.action.PACKAGE_ADDED" />
+            </intent-filter>
+        </receiver>
+    </application>
+
 </manifest>
diff --git a/Assets/Plugins/Heyzap/HZBannerAd.cs b/Assets/Plugins/Heyzap/HZBannerAd.cs
@@ -39,7 +39,7 @@ public class HZBannerAd : MonoBehaviour {
         public delegate void AdDisplayListener(string state, string tag);
 
         private static AdDisplayListener adDisplayListener;
-        private static HZBannerAd _instance = null;
+        private static HZBannerAd _instance;
 
         // these are reproduced here for convenience since they were here in old SDK versions
         /// <summary>

diff --git a/Assets/Plugins/Heyzap/HZDemographics.cs b/Assets/Plugins/Heyzap/HZDemographics.cs
@@ -37,7 +37,7 @@ namespace Heyzap {
     /// </summary>
     public class HZDemographics : MonoBehaviour {
 
-        private static HZDemographics _instance = null;
+        private static HZDemographics _instance;
 
         public enum Gender {
             UNKNOWN,

diff --git a/Assets/Plugins/Heyzap/HZIncentivizedAd.cs b/Assets/Plugins/Heyzap/HZIncentivizedAd.cs
@@ -38,7 +38,7 @@ public class HZIncentivizedAd : MonoBehaviour {
 
         public delegate void AdDisplayListener(string state, string tag);
         private static AdDisplayListener adDisplayListener;
-        private static HZIncentivizedAd _instance = null;
+        private static HZIncentivizedAd _instance;
 
         //provided since JS can't use default parameters
         /// <summary>
@@ -52,8 +52,6 @@ public static void Fetch() {
         /// </summary>
         /// <param name="tag">The ad tag to fetch an ad for.</param>
         public static void Fetch(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     HZIncentivizedAdAndroid.Fetch(tag);
@@ -107,8 +105,6 @@ public static bool IsAvailable() {
         /// </summary>
         /// <returns><c>true</c>, if an ad is available, <c>false</c> otherwise.</returns>
         public static bool IsAvailable(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     return HZIncentivizedAdAndroid.IsAvailable(tag);

diff --git a/Assets/Plugins/Heyzap/HZInterstitialAd.cs b/Assets/Plugins/Heyzap/HZInterstitialAd.cs
@@ -37,7 +37,7 @@ public class HZInterstitialAd : MonoBehaviour {
 
         public delegate void AdDisplayListener(string state, string tag);
         private static AdDisplayListener adDisplayListener;
-        private static HZInterstitialAd _instance = null;
+        private static HZInterstitialAd _instance;
 
         //provided since JS can't use default parameters
         /// <summary>
@@ -80,8 +80,6 @@ public static void Fetch() {
         /// </summary>
         /// <param name="tag">The ad tag to fetch an ad for.</param>
         public static void Fetch(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     HZInterstitialAdAndroid.Fetch(tag);
@@ -107,8 +105,6 @@ public static bool IsAvailable() {
         /// </summary>
         /// <returns><c>true</c>, if an ad is available, <c>false</c> otherwise.</returns>
         public static bool IsAvailable(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     return HZInterstitialAdAndroid.IsAvailable(tag);

diff --git a/Assets/Plugins/Heyzap/HZOfferwallAd.cs b/Assets/Plugins/Heyzap/HZOfferwallAd.cs
@@ -46,7 +46,7 @@ public class HZOfferWallAd : MonoBehaviour {
         public delegate void VirtualCurrencyErrorListener(string errorMsg);
         private static VirtualCurrencyErrorListener virtualCurrencyErrorListener;
 
-        private static HZOfferWallAd _instance = null;
+        private static HZOfferWallAd _instance;
 
         //provided since JS can't use default parameters
         /// <summary>
@@ -88,8 +88,6 @@ public static void Fetch() {
         /// </summary>
         /// <param name="tag">The ad tag to fetch an ad for.</param>
         public static void Fetch(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     HZOfferWallAdAndroid.Fetch(tag);
@@ -115,8 +113,6 @@ public static bool IsAvailable() {
         /// </summary>
         /// <returns><c>true</c>, if an ad is available, <c>false</c> otherwise.</returns>
         public static bool IsAvailable(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     return HZOfferWallAdAndroid.IsAvailable(tag);

diff --git a/Assets/Plugins/Heyzap/HZShowOptions.cs b/Assets/Plugins/Heyzap/HZShowOptions.cs
@@ -17,14 +17,10 @@ public string Tag {
                 return tag;
             }
             set {
-                if (value != null) {
-                    tag = value;
-                } else {
-                    tag = HeyzapAds.DEFAULT_TAG;
-                }
+                tag = value;
             }
         }
-        private string tag = HeyzapAds.DEFAULT_TAG;     
+        private string tag;
     }
 
     /// <summary>
@@ -108,4 +104,4 @@ public bool ShouldCloseAfterFirstClick {
         }
         private bool shouldCloseAfterFirstClick = HZOfferWallShowOptions.DEFAULT_SHOULD_CLOSE_AFTER_FIRST_CLICK;
     }
-}
+}
diff --git a/Assets/Plugins/Heyzap/HZVideoAd.cs b/Assets/Plugins/Heyzap/HZVideoAd.cs
@@ -39,7 +39,7 @@ public class HZVideoAd : MonoBehaviour {
 
         public delegate void AdDisplayListener(string state, string tag);
         private static AdDisplayListener adDisplayListener;
-        private static HZVideoAd _instance = null;
+        private static HZVideoAd _instance;
 
         //provided since JS can't use default parameters
         /// <summary>
@@ -81,8 +81,6 @@ public static void Fetch() {
         /// </summary>
         /// <param name="tag">The ad tag to fetch an ad for.</param>
         public static void Fetch(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     HZVideoAdAndroid.Fetch(tag);
@@ -108,8 +106,6 @@ public static bool IsAvailable() {
         /// </summary>
         /// <returns><c>true</c>, if an ad is available, <c>false</c> otherwise.</returns>
         public static bool IsAvailable(string tag) {
-            tag = HeyzapAds.TagForString(tag);
-
             #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE)
                 #if UNITY_ANDROID
                     return HZVideoAdAndroid.IsAvailable(tag);

diff --git a/Assets/Plugins/Heyzap/HeyzapAds.cs b/Assets/Plugins/Heyzap/HeyzapAds.cs
@@ -38,7 +38,7 @@ public class HeyzapAds : MonoBehaviour {
         public delegate void NetworkCallbackListener(string network, string callback);
 
         private static NetworkCallbackListener networkCallbackListener;
-        private static HeyzapAds _instance = null;
+        private static HeyzapAds _instance;
 
         #region Flags for the call to HeyzapAds.StartWithOptions()
         /// <summary>
@@ -76,8 +76,6 @@ public class HeyzapAds : MonoBehaviour {
         /// </summary>
         public const int FLAG_CHILD_DIRECTED_ADS = 1 << 6; // 64
         #endregion
-
-        public const string DEFAULT_TAG = "default";
 
         #region String constants to expect in Ad Listener & network callbacks
         // `NetworkCallback` is a bit of a misnomer. The callback constants here are both for "network callbacks" and for ad listener callbacks. We should refactor these into two classes in the next major SDK.
@@ -300,7 +298,7 @@ public static void HideDebugLogs() {
         /// </summary>
         public static void ShowThirdPartyDebugLogs() {
             #if UNITY_IPHONE && !UNITY_EDITOR
-            HeyzapAdsIOS.ShowThirdPartyDebugLogs();
+                HeyzapAdsIOS.ShowThirdPartyDebugLogs();
             #endif
         }
 
@@ -310,7 +308,7 @@ public static void ShowThirdPartyDebugLogs() {
         /// </summary>
         public static void HideThirdPartyDebugLogs() {
             #if UNITY_IPHONE && !UNITY_EDITOR
-            HeyzapAdsIOS.HideThirdPartyDebugLogs();
+                HeyzapAdsIOS.HideThirdPartyDebugLogs();
             #endif
         }
 
@@ -337,7 +335,7 @@ public static void SetBundleIdentifier(string bundleID) {
         /// <param name="device_id">The Device ID that FAN prints to the iOS console</param>
         public static void AddFacebookTestDevice(string device_id) {
             #if UNITY_IPHONE && !UNITY_EDITOR
-            HeyzapAdsIOS.AddFacebookTestDevice(device_id);
+                HeyzapAdsIOS.AddFacebookTestDevice(device_id);
             #endif
         }
         #endregion
@@ -354,21 +352,13 @@ protected static void SetNetworkCallback(string network, string callback) {
             }
         }
 
-        public static void InitReceiver(){
+        public static void InitReceiver() {
             if (_instance == null) {
                 GameObject receiverObject = new GameObject("HeyzapAds");
                 DontDestroyOnLoad(receiverObject);
                 _instance = receiverObject.AddComponent<HeyzapAds>();
             }
         }
-
-        public static string TagForString(string tag) {
-            if (tag == null) {
-                tag = HeyzapAds.DEFAULT_TAG;
-            }
-
-            return tag;
-        }
         #endregion
     }