Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-12-22 20:57:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

No Internet Connection Fix

Browse Source
This commit is contained in:
shabinder 2021-04-19 18:54:21 +05:30
parent e2de7e9f6a
commit 289ada76b0
5 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/dependency-injection/src/androidMain/kotlin/com/shabinder/common/di/AndroidNetworkObserver.kt
View File

@ -27,13 +27,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.lifecycle.LiveData
import com.shabinder.common.database.appContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.coroutines.*
import java.io.IOException
import java.lang.Exception
import java.net.InetSocketAddress
import javax.net.SocketFactory
const val TAG = "C-Manager"
@ -89,7 +86,7 @@ class ConnectionLiveData(context: Context = appContext) : LiveData<Boolean>() {
if (hasInternetCapability == true) {
// check if this network actually has internet
CoroutineScope(Dispatchers.IO).launch {
val hasInternet = DoesNetworkHaveInternet.execute(network.socketFactory)
val hasInternet = DoesNetworkHaveInternet.execute(network)
if (hasInternet) {
withContext(Dispatchers.Main) {
Log.d(TAG, "onAvailable: adding network. $network")
@ -117,19 +114,18 @@ class ConnectionLiveData(context: Context = appContext) : LiveData<Boolean>() {
* If successful, that means we have internet.
*/
object DoesNetworkHaveInternet {
// Make sure to execute this on a background thread.
fun execute(socketFactory: SocketFactory): Boolean {
return try {
suspend fun execute(network: Network): Boolean = withContext(Dispatchers.IO) {
try {
Log.d(TAG, "PINGING google.")
val socket = socketFactory.createSocket() ?: throw IOException("Socket is null.")
val socket = network.socketFactory.createSocket() ?: throw IOException("Socket is null.")
socket.connect(InetSocketAddress("8.8.8.8", 53), 1500)
socket.close()
Log.d(TAG, "PING success.")
true
} catch (e: IOException) {
Log.e(TAG, "No internet connection. $e")
false
}catch (e:Exception){
e.printStackTrace()
// Handle VPN Connection / Google DNS Blocked Cases
isInternetAccessible()
}
}
}

1
common/dependency-injection/src/androidMain/kotlin/com/shabinder/common/di/AudioTagging.kt
View File

@ -18,7 +18,6 @@ package com.shabinder.common.di
import com.shabinder.common.models.TrackDetails
import java.io.File
import com.mp3.jaudiotagger.tag.images.ArtworkFactory
import com.mpatric.mp3agic.ID3v1Tag
import com.mpatric.mp3agic.ID3v24Tag
import com.mpatric.mp3agic.Mp3File

17
common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/Expect.kt
View File

@ -18,7 +18,9 @@ package com.shabinder.common.di
import com.shabinder.common.models.AllPlatforms
import com.shabinder.common.models.TrackDetails
import io.ktor.client.request.*
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
expect fun openPlatform(packageID: String, platformLink: String)
@ -39,3 +41,18 @@ expect suspend fun downloadTracks(
)
expect fun queryActiveTracks()
/*
* Refactor This
* */
suspend fun isInternetAccessible(): Boolean {
return withContext(dispatcherIO) {
try {
ktorHttpClient.head<String>("http://google.com")
true
} catch (e: Exception) {
e.printStackTrace()
false
}
}
}

5
common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/providers/SpotifyProvider.kt
View File

@ -61,15 +61,14 @@ class SpotifyProvider(
null
} else {
logger.d { "Spotify Provider Created with $token" }
httpClient = HttpClient {
HttpClient {
defaultRequest {
header("Authorization", "Bearer ${token.access_token}")
}
install(JsonFeature) {
serializer = kotlinxSerializer
}
}
httpClient
}?.also { httpClient = it }
}
}

17
common/dependency-injection/src/desktopMain/kotlin/com/shabinder/common/di/DesktopActual.kt
View File

@ -47,25 +47,10 @@ actual fun giveDonation() {
actual fun queryActiveTracks() {}
/*
* Refactor This
* */
private suspend fun isInternetAvailable(): Boolean {
return withContext(dispatcherIO) {
try {
ktorHttpClient.head<String>("http://google.com")
true
} catch (e: Exception) {
println(e.message)
false
}
}
}
actual val isInternetAvailable: Boolean
get() {
var result = false
val job = GlobalScope.launch { result = isInternetAvailable() }
val job = GlobalScope.launch { result = isInternetAccessible() }
while (job.isActive) {}
return result
}