athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup! NetworkProvider: improvements + workaround for Android L

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2025-02-26 12:07:21 +08:00
committed by Rahul Patel
parent 9561f617d7
commit 3d8706da0b
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt
View File

@@ -43,8 +43,7 @@ import javax.inject.Singleton
@Singleton @Singleton
class NetworkProvider @Inject constructor(@ApplicationContext private val context: Context) { class NetworkProvider @Inject constructor(@ApplicationContext private val context: Context) {
private val connectivityManager = private val connectivityManager = context.getSystemService<ConnectivityManager>()!!
context.getSystemService<ConnectivityManager>() as ConnectivityManager
val status: Flow<NetworkStatus> val status: Flow<NetworkStatus>
get() = callbackFlow { get() = callbackFlow {
@@ -71,9 +70,15 @@ class NetworkProvider @Inject constructor(@ApplicationContext private val contex
awaitClose { connectivityManager.unregisterNetworkCallback(networkCallback) } awaitClose { connectivityManager.unregisterNetworkCallback(networkCallback) }
} else { } else {
val receiver = NetworkBroadcastReceiver { isConnected -> val receiver = NetworkBroadcastReceiver { isConnected ->
trySend(if (isConnected) NetworkStatus.AVAILABLE else NetworkStatus.UNAVAILABLE).isSuccess val status = if (isConnected) {
NetworkStatus.AVAILABLE
} else {
NetworkStatus.UNAVAILABLE
}
trySend(status).isSuccess
} }
@Suppress("DEPRECATION")
context.registerReceiver( context.registerReceiver(
receiver, receiver,
IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION) IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
@@ -82,4 +87,4 @@ class NetworkProvider @Inject constructor(@ApplicationContext private val contex
awaitClose { context.unregisterReceiver(receiver) } awaitClose { context.unregisterReceiver(receiver) }
} }
}.distinctUntilChanged() }.distinctUntilChanged()
} }

21
app/src/main/java/com/aurora/store/data/receiver/NetworkBroadcastReceiver.kt
View File

@@ -1,18 +1,29 @@
/*
* SPDX-FileCopyrightText: 2025 Aurora OSS
* SPDX-FileCopyrightText: 2025 The Calyx Institute
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package com.aurora.store.data.receiver package com.aurora.store.data.receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.ConnectivityManager import android.net.ConnectivityManager
import androidx.core.content.getSystemService
/**
* Broadcast receiver for network status for API 21 & 22
* @param callback Callback when the network status changes
*/
@Suppress("DEPRECATION")
class NetworkBroadcastReceiver(private val callback: (Boolean) -> Unit) : BroadcastReceiver() {
class NetworkBroadcastReceiver(
private val callback: (Boolean) -> Unit
) : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(context: Context?, intent: Intent?) {
val connectivityManager = context?.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager val connectivityManager = context?.getSystemService<ConnectivityManager>()
val networkInfo = connectivityManager?.activeNetworkInfo val networkInfo = connectivityManager?.activeNetworkInfo
val isConnected = networkInfo?.isConnectedOrConnecting == true val isConnected = networkInfo?.isConnectedOrConnecting == true
callback(isConnected) callback(isConnected)
} }
} }