srctree

Robin Linden parent 7c1c4b26 a541e609
Work around the linter sometimes complaining about forEach in API <24

In these 2 files, :domain:lintDebug complains about forEach requiringAPI >=24, even though this runs and works fine in API 21 in an emulator.

inline split

domain/src/main/kotlin/feature/FileTransferManager.kt added: 8, removed: 6, total 2

@@ -16,6 +16,7 @@ import java.io.RandomAccessFile

import java.util.Date

import javax.inject.Inject

import javax.inject.Singleton

import kotlin.collections.forEach as kForEach

import kotlin.random.Random

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.take

@@ -58,7 +59,7 @@ class FileTransferManager @Inject constructor(

init {

File(context.filesDir, "ft").mkdir()

File(context.filesDir, "avatar").mkdir()

resolver.persistedUriPermissions.forEach {

resolver.persistedUriPermissions.kForEach {

Log.w(TAG, "Clearing leftover permission for ${it.uri}")

releaseFilePermission(it.uri)

}

@@ -73,7 +74,7 @@ class FileTransferManager @Inject constructor(

fun resetForContact(pk: String) {

Log.i(TAG, "Clearing fts for contact ${pk.fingerprint()}")

fileTransfers.filter { it.publicKey == pk }.forEach { ft ->

fileTransfers.filter { it.publicKey == pk }.kForEach { ft ->

setProgress(ft, FtRejected)

fileTransfers.remove(ft)

if (ft.outgoing) {

@@ -288,7 +289,7 @@ class FileTransferManager @Inject constructor(

suspend fun deleteAll(publicKey: PublicKey) {

fileTransferRepository.get(publicKey.string()).take(1).collect { fts ->

fts.forEach { delete(it.id) }

fts.kForEach { delete(it.id) }

}

domain/src/main/kotlin/tox/Tox.kt added: 8, removed: 6, total 2

@@ -10,6 +10,7 @@ import im.tox.tox4j.crypto.ToxCryptoConstants

import im.tox.tox4j.impl.jni.ToxCryptoImpl

import javax.inject.Inject

import javax.inject.Singleton

import kotlin.collections.forEach as kForEach

import kotlin.random.Random

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.delay

@@ -208,7 +209,7 @@ class Tox @Inject constructor(

}

private fun bootstrap() {

nodeRegistry.get(4).forEach { node ->

nodeRegistry.get(4).kForEach { node ->

Log.i(TAG, "Bootstrapping from $node")

tox.bootstrap(node.address, node.port, node.publicKey.bytes())

}