From 9f7a151c1dff6320eb8681be66dff9b145a09ad3 Mon Sep 17 00:00:00 2001 From: Zeeshan Syed Date: Mon, 22 Jun 2020 19:41:05 +0530 Subject: [PATCH 1/2] included VPN network in network check --- .../java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt b/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt index 150da29..fad9d2a 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt +++ b/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt @@ -23,6 +23,7 @@ class NetworkHelper @Inject constructor(@ApplicationContext private val context: activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true + activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> true else -> false } } else { @@ -32,6 +33,7 @@ class NetworkHelper @Inject constructor(@ApplicationContext private val context: ConnectivityManager.TYPE_WIFI -> true ConnectivityManager.TYPE_MOBILE -> true ConnectivityManager.TYPE_ETHERNET -> true + ConnectivityManager.TYPE_VPN -> true else -> false } From fefff06c4af2bf0817789d32ef71bc3caefe35a2 Mon Sep 17 00:00:00 2001 From: Zeeshan Syed Date: Mon, 22 Jun 2020 19:42:00 +0530 Subject: [PATCH 2/2] suppressed deprecation warning for ConnectivityManager --- .../main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt b/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt index fad9d2a..2dab3d1 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt +++ b/app/src/main/java/com/mindorks/framework/mvvm/utils/NetworkHelper.kt @@ -11,6 +11,7 @@ import javax.inject.Singleton @Singleton class NetworkHelper @Inject constructor(@ApplicationContext private val context: Context) { + @Suppress("DEPRECATION") fun isNetworkConnected(): Boolean { var result = false val connectivityManager =