Fix dodgy string equality check in java, was using ref not value equa…

…lity, other minor tweaks
Tw1ddle · Jul 4, 2018 · 0d1aa38 · 0d1aa38
1 parent 28a4091
commit 0d1aa38
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/dependencies/samcodes-admob/src/com/samcodes/admob/AdMobExtension.java b/dependencies/samcodes-admob/src/com/samcodes/admob/AdMobExtension.java
@@ -114,7 +114,7 @@ public static void refreshBanner(final String id) {
 			public void run() {
 				AdRequest request = null;
 
-				if(testDeviceId != "null") {
+				if(!testDeviceId.equals("null")) {
 					request = new AdRequest.Builder().addTestDevice(AdRequest.DEVICE_ID_EMULATOR).addTestDevice(testDeviceId).build();
 				} else {
 					request = new AdRequest.Builder().addTestDevice(AdRequest.DEVICE_ID_EMULATOR).build();
@@ -204,7 +204,7 @@ public static void cacheInterstitial(final String id) {
 				public void run() {
 					AdRequest request = null;
 
-					if(testDeviceId != "null") {
+					if(!testDeviceId.equals("null")) {
 						request = new AdRequest.Builder().addTestDevice(AdRequest.DEVICE_ID_EMULATOR).addTestDevice(testDeviceId).build();
 					} else {
 						request = new AdRequest.Builder().addTestDevice(AdRequest.DEVICE_ID_EMULATOR).build();
@@ -251,7 +251,7 @@ public void run() {
 		});
 	}
 
-	private static InterstitialAd addInterstitialForUnitId(final String id) {		
+	private static InterstitialAd addInterstitialForUnitId(final String id) {
 		final InterstitialAd ad = new InterstitialAd(mainActivity);
 
 		if(ad.getAdUnitId() == null) {
@@ -274,7 +274,6 @@ private static AdView addBannerViewForUnitId(final String id) {
 			ad.setAdUnitId(id);
 		}
 
-		// TODO could look up options set from Haxe here
 		ad.setAdSize(AdSize.SMART_BANNER);
 
 		unitIdToBannerView.put(id, ad);