diff --git a/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt b/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt index 30de384..d94f509 100644 --- a/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt +++ b/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt @@ -47,7 +47,6 @@ import eu.depau.etchdroid.utils.ktexts.getFileName import eu.depau.etchdroid.utils.ktexts.getFileSize import eu.depau.etchdroid.utils.ktexts.safeParcelableExtra import eu.depau.etchdroid.utils.ktexts.startForegroundSpecialUse -import eu.depau.etchdroid.utils.ktexts.threadID import eu.depau.etchdroid.utils.ktexts.toHRSize import eu.depau.etchdroid.utils.lateInit import eu.depau.etchdroid.utils.timeoutWatchdog @@ -337,7 +336,7 @@ class WorkerService : LifecycleService() { Thread.currentThread().name = "WorkerService coroutine scope" Telemetry.debug( - "Job coroutine scope started; thread ${Thread.currentThread().name} (${Thread.currentThread().threadID})", + "Job coroutine scope started; thread ${Thread.currentThread().name} (${Thread.currentThread().id})", "worker" ) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt index 337eac5..c2d1f88 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt @@ -138,7 +138,6 @@ import eu.depau.etchdroid.utils.ktexts.broadcastLocally import eu.depau.etchdroid.utils.ktexts.getDisplayName import eu.depau.etchdroid.utils.ktexts.registerExportedReceiver import eu.depau.etchdroid.utils.ktexts.startForegroundServiceCompat -import eu.depau.etchdroid.utils.ktexts.threadID import eu.depau.etchdroid.utils.ktexts.toHRSize import eu.depau.etchdroid.utils.ktexts.toast import eu.depau.etchdroid.utils.ktexts.usbDevice @@ -221,7 +220,7 @@ class ProgressActivity : ActivityBase() { super.onCreate(savedInstanceState) println( - "ProgressActivity running in thread ${Thread.currentThread().name} (${Thread.currentThread().threadID})" + "ProgressActivity running in thread ${Thread.currentThread().name} (${Thread.currentThread().id})" ) mSettings = AppSettings(this).apply { diff --git a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/Thread.kt b/app/src/main/java/eu/depau/etchdroid/utils/ktexts/Thread.kt deleted file mode 100644 index b54a4bd..0000000 --- a/app/src/main/java/eu/depau/etchdroid/utils/ktexts/Thread.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.depau.etchdroid.utils.ktexts - -import android.os.Build - -val Thread.threadID: Long - get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) { - this.threadId() - } else { - @Suppress("DEPRECATION") - this.id - }