refactor(core-logging): replace timber by core logging legacy (7cec3184) · Commits · e / os / Mail

core/android/network/build.gradle.kts

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@ android {
		dependencies {
		api(projects.core.common)

		implementation(libs.timber)
		implementation(projects.core.logging.api)
		implementation(projects.core.logging.implLegacy)

		testImplementation(projects.core.testing)
		testImplementation(libs.robolectric)

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ package net.thunderbird.core.android.network
		import android.net.ConnectivityManager.NetworkCallback
		import android.net.Network
		import android.net.NetworkRequest
		import timber.log.Timber
		import net.thunderbird.core.logging.legacy.Log
		import android.net.ConnectivityManager as SystemConnectivityManager

		@Suppress("DEPRECATION")
		@@ -16,12 +16,12 @@ internal class ConnectivityManagerApi21(

		private val networkCallback = object : NetworkCallback() {
		override fun onAvailable(network: Network) {
		Timber.v("Network available: $network")
		Log.v("Network available: $network")
		notifyIfConnectivityHasChanged()
		}

		override fun onLost(network: Network) {
		Timber.v("Network lost: $network")
		Log.v("Network lost: $network")
		notifyIfConnectivityHasChanged()
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ import android.net.NetworkCapabilities
		import android.net.NetworkRequest
		import android.os.Build
		import androidx.annotation.RequiresApi
		import timber.log.Timber
		import net.thunderbird.core.logging.legacy.Log
		import android.net.ConnectivityManager as SystemConnectivityManager

		@RequiresApi(Build.VERSION_CODES.M)
		@@ -19,12 +19,12 @@ internal class ConnectivityManagerApi23(

		private val networkCallback = object : NetworkCallback() {
		override fun onAvailable(network: Network) {
		Timber.v("Network available: $network")
		Log.v("Network available: $network")
		notifyIfActiveNetworkOrConnectivityHasChanged()
		}

		override fun onLost(network: Network) {
		Timber.v("Network lost: $network")
		Log.v("Network lost: $network")
		notifyIfActiveNetworkOrConnectivityHasChanged()
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ import android.net.Network
		import android.net.NetworkCapabilities
		import android.os.Build
		import androidx.annotation.RequiresApi
		import timber.log.Timber
		import net.thunderbird.core.logging.legacy.Log
		import android.net.ConnectivityManager as SystemConnectivityManager

		@RequiresApi(Build.VERSION_CODES.N)
		@@ -17,7 +17,7 @@ internal class ConnectivityManagerApi24(

		private val networkCallback = object : NetworkCallback() {
		override fun onAvailable(network: Network) {
		Timber.v("Network available: $network")
		Log.v("Network available: $network")
		synchronized(this@ConnectivityManagerApi24) {
		isNetworkAvailable = true
		notifyOnConnectivityChanged()
		@@ -25,7 +25,7 @@ internal class ConnectivityManagerApi24(
		}

		override fun onLost(network: Network) {
		Timber.v("Network lost: $network")
		Log.v("Network lost: $network")
		synchronized(this@ConnectivityManagerApi24) {
		isNetworkAvailable = false
		notifyOnConnectivityLost()

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ dependencies {

		implementation(libs.appauth)
		implementation(libs.androidx.compose.material3)
		implementation(libs.timber)

		testImplementation(projects.core.ui.compose.testing)
		}