Skip to content

Commit 58f9359

Browse files
Adoka3710Adoka3710
authored
Fix warnings in AdMob plugin and PermissionsUtil (#129)
* Fix warning * Fix warning * Fix warning * Merg and fix warning * Add comments what to replace * Fix warning permissions util
1 parent ff5c1c9 commit 58f9359

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎platform/android/java/lib/src/com/crossbow/library/PermissionsUtil.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import android.os.Environment
1212
import android.provider.Settings
1313
import android.util.Log
1414
import java.util.ArrayList
15-
import java.util.List
15+
import kotlin.collections.List
1616
import androidx.core.content.ContextCompat
1717

1818
/**
@@ -40,7 +40,7 @@ object PermissionsUtil {
4040
if (name == "RECORD_AUDIO" && ContextCompat.checkSelfPermission(
4141
activity,
4242
Manifest.permission.RECORD_AUDIO
43-
) !== PackageManager.PERMISSION_GRANTED
43+
) != PackageManager.PERMISSION_GRANTED
4444
) {
4545
activity.requestPermissions(
4646
arrayOf(Manifest.permission.RECORD_AUDIO),
@@ -51,7 +51,7 @@ object PermissionsUtil {
5151
if (name == "CAMERA" && ContextCompat.checkSelfPermission(
5252
activity,
5353
Manifest.permission.CAMERA
54-
) !== PackageManager.PERMISSION_GRANTED
54+
) != PackageManager.PERMISSION_GRANTED
5555
) {
5656
activity.requestPermissions(
5757
arrayOf(Manifest.permission.CAMERA),
@@ -62,7 +62,7 @@ object PermissionsUtil {
6262
if (name == "VIBRATE" && ContextCompat.checkSelfPermission(
6363
activity,
6464
Manifest.permission.VIBRATE
65-
) !== PackageManager.PERMISSION_GRANTED
65+
) != PackageManager.PERMISSION_GRANTED
6666
) {
6767
activity.requestPermissions(
6868
arrayOf(Manifest.permission.VIBRATE),
@@ -122,11 +122,11 @@ object PermissionsUtil {
122122
val permissionInfo: PermissionInfo =
123123
getPermissionInfo(activity, manifestPermission)
124124
val protectionLevel: Int =
125-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) permissionInfo.getProtection() else permissionInfo.protectionLevel
125+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) permissionInfo.getProtection() else permissionInfo.protectionLevel // 'protectionLevel: Int' is deprecated. Deprecated in Java
126126
if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(
127127
activity,
128128
manifestPermission
129-
) !== PackageManager.PERMISSION_GRANTED
129+
) != PackageManager.PERMISSION_GRANTED
130130
) {
131131
requestedPermissions.add(manifestPermission)
132132
}
@@ -172,11 +172,11 @@ object PermissionsUtil {
172172
val permissionInfo: PermissionInfo =
173173
getPermissionInfo(activity, manifestPermission)
174174
val protectionLevel: Int =
175-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) permissionInfo.getProtection() else permissionInfo.protectionLevel
175+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) permissionInfo.getProtection() else permissionInfo.protectionLevel // 'protectionLevel: Int' is deprecated. Deprecated in Java
176176
if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(
177177
activity,
178178
manifestPermission
179-
) === PackageManager.PERMISSION_GRANTED
179+
) == PackageManager.PERMISSION_GRANTED
180180
) {
181181
grantedPermissions.add(manifestPermission)
182182
}

‎plugins/admob/android/src/com/crossbow/admob/AdMob.kt‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,18 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
162162
) {
163163
if (!aIsInitialized) {
164164
aIsForChildDirectedTreatment = pIsForChildDirectedTreatment
165-
aConsentInformation = UserMessagingPlatform.getConsentInformation(aActivity)
165+
aConsentInformation = UserMessagingPlatform.getConsentInformation(aActivity!!)
166166
aIsTestEuropeUserConsent = pIsTestEuropeUserConsent
167167
setMobileAdsRequestConfiguration(
168168
aIsForChildDirectedTreatment,
169169
pMaxAdContentRating,
170170
pIsReal
171-
) //First call MobileAds.setRequestConfiguration https://groups.google.com/g/google-admob-ads-sdk/c/17oVu0sABjs
172-
MobileAds.initialize(aActivity) { initializationStatus ->
171+
) // First call MobileAds.setRequestConfiguration https://groups.google.com/g/google-admob-ads-sdk/c/17oVu0sABjs
172+
MobileAds.initialize(aActivity!!) { initializationStatus ->
173173
val statusGADMobileAds: Int = Objects.requireNonNull(
174174
initializationStatus.getAdapterStatusMap()
175-
.get("com.google.android.gms.ads.MobileAds")
176-
)!!.getInitializationState().ordinal
175+
.get("com.google.android.gms.ads.MobileAds")!!
176+
).getInitializationState().ordinal
177177
if (statusGADMobileAds == 0) {
178178
aIsInitialized = false
179179
} else if (statusGADMobileAds == 1) {
@@ -186,22 +186,22 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
186186

187187
@ExposedToCrossbow
188188
fun request_user_consent() {
189-
aConsentInformation = UserMessagingPlatform.getConsentInformation(aActivity)
189+
aConsentInformation = UserMessagingPlatform.getConsentInformation(aActivity!!)
190190
val paramsBuilder: ConsentRequestParameters.Builder =
191191
ConsentRequestParameters.Builder().setTagForUnderAgeOfConsent(aIsForChildDirectedTreatment)
192192
val params: ConsentRequestParameters
193193
params =
194194
if (aIsTestEuropeUserConsent) //https://developers.google.com/admob/ump/android/quick-start#testing
195195
{
196-
val debugSettings: ConsentDebugSettings = ConsentDebugSettings.Builder(aActivity)
196+
val debugSettings: ConsentDebugSettings = ConsentDebugSettings.Builder(aActivity!!)
197197
.setDebugGeography(ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_EEA)
198198
.addTestDeviceHashedId(deviceId)
199199
.build()
200200
paramsBuilder.setConsentDebugSettings(debugSettings).build()
201201
} else {
202202
paramsBuilder.build()
203203
}
204-
aConsentInformation!!.requestConsentInfoUpdate(aActivity, params,
204+
aConsentInformation!!.requestConsentInfoUpdate(aActivity!!, params,
205205
{
206206
if (aConsentInformation!!.isConsentFormAvailable()) {
207207
emitSignal("consent_info_update_success", "Consent Form Available")
@@ -236,16 +236,16 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
236236
aActivity!!.runOnUiThread(Runnable {
237237
if (aIsInitialized) {
238238
if (aAdView != null) destroy_banner()
239-
aAdView = AdView(aActivity)
240-
aAdView!!.setAdUnitId(pAdUnitId)
239+
aAdView = AdView(aActivity!!)
240+
aAdView!!.setAdUnitId(pAdUnitId!!)
241241
when (pSize) {
242242
"BANNER" -> aAdView!!.setAdSize(AdSize.BANNER)
243243
"LARGE_BANNER" -> aAdView!!.setAdSize(AdSize.LARGE_BANNER)
244244
"MEDIUM_RECTANGLE" -> aAdView!!.setAdSize(AdSize.MEDIUM_RECTANGLE)
245245
"FULL_BANNER" -> aAdView!!.setAdSize(AdSize.FULL_BANNER)
246246
"LEADERBOARD" -> aAdView!!.setAdSize(AdSize.LEADERBOARD)
247247
"ADAPTIVE" -> aAdView!!.setAdSize(adSizeAdaptive)
248-
else -> aAdView!!.setAdSize(AdSize.SMART_BANNER)
248+
else -> aAdView!!.setAdSize(AdSize.SMART_BANNER) // Replaced by getCurrentOrientationAnchoredAdaptiveBannerAdSize(Context, int)
249249
}
250250
aAdSize =
251251
aAdView!!.getAdSize() //store AdSize of banner due a bug (throws error when do aAdView!!.getAdSize() called by Crossbow)
@@ -296,11 +296,11 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
296296
if (pPosition == 0) //BOTTOM
297297
{
298298
aCrossbowLayoutParams!!.gravity = Gravity.BOTTOM
299-
if (pRespectSafeArea) aAdView!!.setY(-safeArea.bottom as Float) //Need to validate if this value will be positive or negative
299+
if (pRespectSafeArea) aAdView!!.setY(-safeArea.bottom.toFloat()) // Need to validate if this value will be positive or negative
300300
} else if (pPosition == 1) //TOP
301301
{
302302
aCrossbowLayoutParams!!.gravity = Gravity.TOP
303-
if (pRespectSafeArea) aAdView!!.setY(safeArea.top as Float)
303+
if (pRespectSafeArea) aAdView!!.setY(safeArea.top.toFloat())
304304
}
305305
aCrossbowLayout!!.addView(aAdView, aCrossbowLayoutParams)
306306
aAdView!!.loadAd(adRequest)
@@ -326,7 +326,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
326326
fun show_banner() {
327327
aActivity!!.runOnUiThread(Runnable {
328328
if (aIsInitialized && aAdView != null) {
329-
if (aAdView!!.getVisibility() !== View.VISIBLE) {
329+
if (aAdView!!.getVisibility() == View.VISIBLE) {
330330
aAdView!!.setVisibility(View.VISIBLE)
331331
aAdView!!.resume()
332332
}
@@ -338,7 +338,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
338338
fun hide_banner() {
339339
aActivity!!.runOnUiThread(Runnable {
340340
if (aIsInitialized && aAdView != null) {
341-
if (aAdView!!.getVisibility() !== View.GONE) {
341+
if (aAdView!!.getVisibility() == View.GONE) {
342342
aAdView!!.setVisibility(View.GONE)
343343
aAdView!!.pause()
344344
}
@@ -363,14 +363,14 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
363363
@ExposedToCrossbow
364364
fun get_banner_width_in_pixels(): Int {
365365
return if (aIsInitialized && aAdSize != null) {
366-
aAdSize!!.getWidthInPixels(aActivity)
366+
aAdSize!!.getWidthInPixels(aActivity!!)
367367
} else 0
368368
}
369369

370370
@ExposedToCrossbow
371371
fun get_banner_height_in_pixels(): Int {
372372
return if (aIsInitialized && aAdSize != null) {
373-
aAdSize!!.getHeightInPixels(aActivity)
373+
aAdSize!!.getHeightInPixels(aActivity!!)
374374
} else 0
375375
}
376376

@@ -381,8 +381,8 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
381381
aActivity!!.runOnUiThread(Runnable {
382382
if (aIsInitialized) {
383383
InterstitialAd.load(
384-
aActivity,
385-
pAdUnitId,
384+
aActivity!!,
385+
pAdUnitId!!,
386386
adRequest,
387387
object : InterstitialAdLoadCallback() {
388388
override fun onAdLoaded(interstitialAd: InterstitialAd) {
@@ -428,7 +428,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
428428
aActivity!!.runOnUiThread(Runnable {
429429
if (aIsInitialized) {
430430
if (aInterstitialAd != null) {
431-
aInterstitialAd!!.show(aActivity)
431+
aInterstitialAd!!.show(aActivity!!)
432432
}
433433
}
434434
})
@@ -440,7 +440,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
440440
fun load_rewarded(pAdUnitId: String?) {
441441
aActivity!!.runOnUiThread(Runnable {
442442
if (aIsInitialized) {
443-
RewardedAd.load(aActivity, pAdUnitId, adRequest, object : RewardedAdLoadCallback() {
443+
RewardedAd.load(aActivity!!, pAdUnitId!!, adRequest, object : RewardedAdLoadCallback() {
444444
override fun onAdFailedToLoad(loadAdError: LoadAdError) {
445445
// Handle the error.
446446
aRewardedAd = null
@@ -481,7 +481,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
481481
aIsRewardedLoaded = false
482482
}
483483
})
484-
aRewardedAd!!.show(aActivity) { rewardItem ->
484+
aRewardedAd!!.show(aActivity!!) { rewardItem ->
485485
// Handle the reward.
486486
emitSignal(
487487
"user_earned_rewarded",
@@ -499,8 +499,8 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
499499
aActivity!!.runOnUiThread(Runnable {
500500
if (aIsInitialized) {
501501
RewardedInterstitialAd.load(
502-
aActivity,
503-
pAdUnitId,
502+
aActivity!!,
503+
pAdUnitId!!,
504504
adRequest,
505505
object : RewardedInterstitialAdLoadCallback() {
506506
override fun onAdFailedToLoad(loadAdError: LoadAdError) {
@@ -548,7 +548,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
548548
aIsRewardedInterstitialLoaded = false
549549
}
550550
})
551-
aRewardedInterstitialAd!!.show(aActivity) { rewardItem ->
551+
aRewardedInterstitialAd!!.show(aActivity!!) { rewardItem ->
552552
// Handle the reward.
553553
emitSignal(
554554
"user_earned_rewarded",
@@ -563,12 +563,12 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
563563

564564
private fun loadConsentForm() {
565565
UserMessagingPlatform.loadConsentForm(
566-
aActivity,
566+
aActivity!!,
567567
{ consentForm ->
568568
var consentStatusMsg = ""
569-
if (aConsentInformation!!.getConsentStatus() === ConsentInformation.ConsentStatus.REQUIRED) {
569+
if (aConsentInformation!!.getConsentStatus() == ConsentInformation.ConsentStatus.REQUIRED) {
570570
consentForm.show(
571-
aActivity
571+
aActivity!!
572572
) { formError ->
573573
loadConsentForm()
574574
emitSignal("consent_form_dismissed")
@@ -619,13 +619,13 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
619619
}
620620

621621
private val adRequest: AdRequest
622-
private get() {
622+
get() {
623623
val adRequestBuilder = AdRequest.Builder()
624624
return adRequestBuilder.build()
625625
}
626626

627627
private val safeArea: Rect
628-
private get() {
628+
get() {
629629
val safeInsetRect = Rect()
630630
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
631631
return safeInsetRect
@@ -648,20 +648,20 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
648648
// Determine the screen width (less decorations) to use for the ad width.
649649
private val adSizeAdaptive: AdSize
650650
// If the ad hasn't been laid out, default to the full screen width.
651-
private get() {
651+
get() {
652652
// Determine the screen width (less decorations) to use for the ad width.
653-
val display: Display = aActivity!!.getWindowManager().getDefaultDisplay()
653+
val display: Display = aActivity!!.getWindowManager().getDefaultDisplay() // getDefaultDisplay() method was deprecated in API level 30. Use Context#getDisplay() instead.
654654
val outMetrics = DisplayMetrics()
655655
display.getMetrics(outMetrics)
656-
val density: Float = outMetrics.density
656+
val density: Float = outMetrics.density
657657
var adWidthPixels: Float = aCrossbowLayout!!.getWidth().toFloat()
658658

659659
// If the ad hasn't been laid out, default to the full screen width.
660660
if (adWidthPixels == 0f) {
661661
adWidthPixels = outMetrics.widthPixels.toFloat()
662662
}
663663
val adWidth = (adWidthPixels / density).toInt()
664-
return AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(aActivity, adWidth)
664+
return AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(aActivity!!, adWidth)
665665
}
666666

667667
/**
@@ -695,7 +695,7 @@ class AdMob(crossbow: Crossbow) : CrossbowPlugin(crossbow) {
695695
* @return String Device ID
696696
*/
697697
private val deviceId: String
698-
private get() {
698+
get() {
699699
val android_id = Settings.Secure.getString(
700700
aActivity!!.getContentResolver(),
701701
Settings.Secure.ANDROID_ID

0 commit comments

Comments
 (0)