Merge pull request #5382 from k9mail/close_connections_on_network_change (5a10d08f) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,11 @@ internal class AccountPushController(
		stopBackendPusher()
		}

		fun reconnect() {
		Timber.v("AccountPushController(%s).reconnect()", account.uuid)
		backendPusher?.reconnect()
		}

		private fun startBackendPusher() {
		val backend = backendManager.getBackend(account)
		backendPusher = backend.createPusher(backendPusherCallback).also { backendPusher ->

app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt

+17 −3

Original line number	Diff line number	Diff line
		@@ -13,10 +13,11 @@ import com.fsck.k9.notification.PushNotificationState.WAIT_BACKGROUND_SYNC
		import com.fsck.k9.notification.PushNotificationState.WAIT_NETWORK
		import com.fsck.k9.preferences.BackgroundSync
		import com.fsck.k9.preferences.GeneralSettingsManager
		import java.util.concurrent.Executors
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.GlobalScope
		import kotlinx.coroutines.asCoroutineDispatcher
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.launchIn
		import kotlinx.coroutines.flow.map
		@@ -38,14 +39,17 @@ class PushController internal constructor(
		private val connectivityManager: ConnectivityManager,
		private val accountPushControllerFactory: AccountPushControllerFactory,
		private val coroutineScope: CoroutineScope = GlobalScope,
		private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO
		private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
		) {
		private val lock = Any()
		private var initializationStarted = false
		private val pushers = mutableMapOf<String, AccountPushController>()

		private val autoSyncListener = AutoSyncListener(::onAutoSyncChanged)
		private val connectivityChangeListener = ConnectivityChangeListener(::onConnectivityChanged)
		private val connectivityChangeListener = object : ConnectivityChangeListener {
		override fun onConnectivityChanged() = this@PushController.onConnectivityChanged()
		override fun onConnectivityLost() = this@PushController.onConnectivityLost()
		}

		/**
		* Initialize [PushController].
		@@ -95,6 +99,16 @@ class PushController internal constructor(
		}

		private fun onConnectivityChanged() {
		coroutineScope.launch(coroutineDispatcher) {
		synchronized(lock) {
		for (accountPushController in pushers.values) {
		accountPushController.reconnect()
		}
		}
		}
		}

		private fun onConnectivityLost() {
		launchUpdatePushers()
		}

app/core/src/main/java/com/fsck/k9/network/ConnectivityManager.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@ interface ConnectivityManager {
		fun removeListener(listener: ConnectivityChangeListener)
		}

		fun interface ConnectivityChangeListener {
		interface ConnectivityChangeListener {
		fun onConnectivityChanged()
		fun onConnectivityLost()
		}

		internal fun ConnectivityManager(systemConnectivityManager: SystemConnectivityManager): ConnectivityManager {

app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,11 @@ internal class ConnectivityManagerApi21(
		if (networkType != lastNetworkType \|\| isConnected != wasConnected) {
		lastNetworkType = networkType
		wasConnected = isConnected
		notifyListeners()
		if (isConnected) {
		notifyOnConnectivityChanged()
		} else {
		notifyOnConnectivityLost()
		}
		}
		}
		}

app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,11 @@ internal class ConnectivityManagerApi23(
		if (activeNetwork != lastActiveNetwork \|\| isConnected != wasConnected) {
		lastActiveNetwork = activeNetwork
		wasConnected = isConnected
		notifyListeners()
		if (isConnected) {
		notifyOnConnectivityChanged()
		} else {
		notifyOnConnectivityLost()
		}
		}
		}
		}