varnitgoyal95/alfred-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TP-12345 | minSdk 21 → 23 (#166)

Browse Source
This commit is contained in:
Shivam Goyal
2024-05-14 11:29:41 -07:00
committed by GitHub
parent 0ec4feeb50
commit fedcb3f22b
4 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -12,7 +12,7 @@ android {
defaultConfig {
applicationId 'com.navi.alfred.demo'
minSdk 21
minSdk 23
targetSdk 33
versionCode VERSION_CODE
versionName VERSION_NAME

2
navi-alfred/build.gradle
View File

@@ -13,7 +13,7 @@ android {
compileSdk 34
defaultConfig {
minSdk 21
minSdk 23
targetSdk 33
consumerProguardFiles "consumer-rules.pro"

7
navi-alfred/src/main/java/com/navi/alfred/utils/DeviceMetricsUtils.kt
View File

@@ -77,12 +77,7 @@ fun getNetworkStrength(context: Context): Float {
try {
val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val netInfo = cm.activeNetworkInfo ?: return 0f
val nc =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
cm.getNetworkCapabilities(cm.activeNetwork)
} else {
return 0f
}
val nc = cm.getNetworkCapabilities(cm.activeNetwork)
return nc?.linkUpstreamBandwidthKbps?.toFloat() ?: 0f
} catch (e: Exception) {
e.log()

27
navi-alfred/src/main/java/com/navi/alfred/utils/NetworkUtils.kt
View File

@@ -10,7 +10,6 @@ package com.navi.alfred.utils
import android.content.Context
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
import android.os.Build
import com.google.gson.JsonParseException
import com.navi.alfred.AlfredManager
import com.navi.alfred.model.ErrorMessage
@@ -41,23 +40,15 @@ internal fun handleException(e: Throwable): ErrorMessage {
}
internal fun isNetworkAvailable(): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val connectivityManager =
AlfredManager.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE)
as ConnectivityManager
val network = connectivityManager.activeNetwork ?: return false
val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
return when {
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
else -> false
}
} else {
val connectivityManager =
AlfredManager.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE)
as ConnectivityManager
val networkInfo = connectivityManager.activeNetworkInfo
return networkInfo != null && networkInfo.isConnected
val connectivityManager =
AlfredManager.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE)
as ConnectivityManager
val network = connectivityManager.activeNetwork ?: return false
val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
return when {
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
else -> false
}
}