From 0c89fd7e6e9234b2321d06cdd84468bfaa7e6858 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@codingmart.com>
Date: Thu, 16 Apr 2020 17:43:30 +0530
Subject: [PATCH 1/2] Upgraded the Connectivity Checker class, for newer
 version(from marshmallow)

---
 .../java/io/plaidapp/dagger/HomeModule.kt     |  2 +-
 .../plaidapp/core/ui/ConnectivityChecker.kt   | 38 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/plaidapp/dagger/HomeModule.kt b/app/src/main/java/io/plaidapp/dagger/HomeModule.kt
index 0344fe96c..f2fd63d38 100644
--- a/app/src/main/java/io/plaidapp/dagger/HomeModule.kt
+++ b/app/src/main/java/io/plaidapp/dagger/HomeModule.kt
@@ -83,7 +83,7 @@ abstract class HomeModule {
         fun connectivityChecker(activity: Activity): ConnectivityChecker? {
             val connectivityManager = activity.getSystemService<ConnectivityManager>()
             return if (connectivityManager != null) {
-                ConnectivityChecker(connectivityManager)
+                ConnectivityChecker(connectivityManager,activity.applicationContext)
             } else {
                 null
             }
diff --git a/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt b/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
index bbd4721e6..7f7ba7f57 100644
--- a/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
+++ b/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
@@ -16,11 +16,13 @@
 
 package io.plaidapp.core.ui
 
+import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkInfo
 import android.net.NetworkRequest
+import android.os.Build
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LiveData
@@ -39,7 +41,8 @@ import androidx.lifecycle.OnLifecycleEvent
  * connected, we stop listening to connectivity.¬
  */
 class ConnectivityChecker(
-    private val connectivityManager: ConnectivityManager
+    private val connectivityManager: ConnectivityManager,
+    private val context: Context
 ) : LifecycleObserver {
 
     private var monitoringConnectivity = false
@@ -71,8 +74,7 @@ class ConnectivityChecker(
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun startMonitoringConnectivity() {
-        val activeNetworkInfo: NetworkInfo? = connectivityManager.activeNetworkInfo
-        val connected = activeNetworkInfo != null && activeNetworkInfo.isConnected
+        val connected = isInternetAvailable()
         _connectedStatus.postValue(connected)
         if (!connected) {
             // we don't have internet connection, so we listen to notifications in connection status
@@ -84,4 +86,34 @@ class ConnectivityChecker(
             monitoringConnectivity = true
         }
     }
+
+    private fun isInternetAvailable(): Boolean {
+        var result = false
+        val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val networkCapabilities = connectivityManager.activeNetwork ?: return false
+            val actNw =
+                connectivityManager.getNetworkCapabilities(networkCapabilities) ?: return false
+            result = when {
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+                else -> false
+            }
+        } else {
+            connectivityManager.run {
+                connectivityManager.activeNetworkInfo?.run {
+                    result = when (type) {
+                        ConnectivityManager.TYPE_WIFI -> true
+                        ConnectivityManager.TYPE_MOBILE -> true
+                        ConnectivityManager.TYPE_ETHERNET -> true
+                        else -> false
+                    }
+
+                }
+            }
+        }
+        return result
+    }
 }

From 01a13c19486c302964a55bbd8da92ca2c7f6c5c2 Mon Sep 17 00:00:00 2001
From: abhinav <abhinav@codingmart.com>
Date: Fri, 17 Apr 2020 16:36:44 +0530
Subject: [PATCH 2/2] Second commit

---
 core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt b/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
index 7f7ba7f57..67764901f 100644
--- a/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
+++ b/core/src/main/java/io/plaidapp/core/ui/ConnectivityChecker.kt
@@ -114,6 +114,7 @@ class ConnectivityChecker(
                 }
             }
         }
+
         return result
     }
 }