From 50b6d380b6e7c9c5537ddcce698e9b8c00c9db0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 2 Nov 2022 16:44:05 +0100
Subject: [PATCH] Fix unexpected error in support ad when no internet (#2030)

---
 .../ui/modules/settings/ads/AdsPresenter.kt   | 21 ++++++++++++-----
 .../io/github/wulkanowy/utils/AdsHelper.kt    | 23 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
index 772d616d..28c98e3c 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
@@ -31,13 +31,22 @@ class AdsPresenter @Inject constructor(
         view?.showLoadingSupportAd(true)
         presenterScope.launch {
             runCatching { adsHelper.getSupportAd() }
-                .onFailure(errorHandler::dispatch)
-                .onSuccess { it?.let { view?.showAd(it) } }
+                .onFailure {
+                    errorHandler.dispatch(it)
 
-            view?.run {
-                showLoadingSupportAd(false)
-                showWatchAdOncePerVisit(true)
-            }
+                    view?.run {
+                        showLoadingSupportAd(false)
+                        showWatchAdOncePerVisit(false)
+                    }
+                }
+                .onSuccess {
+                    it?.let { view?.showAd(it) }
+
+                    view?.run {
+                        showLoadingSupportAd(false)
+                        showWatchAdOncePerVisit(true)
+                    }
+                }
         }
     }
 
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
index c536e221..d5f65b46 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -1,8 +1,12 @@
 package io.github.wulkanowy.utils
 
 import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.getSystemService
 import com.google.ads.mediation.admob.AdMobAdapter
 import com.google.android.gms.ads.*
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
@@ -10,6 +14,7 @@ import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoa
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.BuildConfig
 import io.github.wulkanowy.data.repositories.PreferencesRepository
+import java.net.UnknownHostException
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -28,6 +33,10 @@ class AdsHelper @Inject constructor(
     }
 
     suspend fun getSupportAd(): RewardedInterstitialAd? {
+        if (!context.isInternetConnected()) {
+            throw UnknownHostException()
+        }
+
         val extra = Bundle().apply { putString("npa", "1") }
         val adRequest = AdRequest.Builder()
             .apply {
@@ -84,4 +93,18 @@ class AdsHelper @Inject constructor(
     }
 }
 
+@Suppress("DEPRECATION")
+private fun Context.isInternetConnected(): Boolean {
+    val connectivityManager = getSystemService<ConnectivityManager>() ?: return false
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        val currentNetwork = connectivityManager.activeNetwork
+        val networkCapabilities = connectivityManager.getNetworkCapabilities(currentNetwork)
+
+        networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) == true
+    } else {
+        connectivityManager.activeNetworkInfo?.isConnected == true
+    }
+}
+
 data class AdBanner(val view: View)