diff --git a/app/src/debug/java/org/tasks/BuildSetup.kt b/app/src/debug/java/org/tasks/BuildSetup.kt
index b4c7bd3e3..2a8a04069 100644
--- a/app/src/debug/java/org/tasks/BuildSetup.kt
+++ b/app/src/debug/java/org/tasks/BuildSetup.kt
@@ -11,8 +11,9 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
 import com.facebook.soloader.SoLoader
+import com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo
+import com.todoroo.andlib.utility.AndroidUtilities.atLeastQ
 import leakcanary.AppWatcher
-import org.tasks.data.CRASH_ON_MAIN_THREAD
 import org.tasks.preferences.Preferences
 import timber.log.Timber
 import timber.log.Timber.DebugTree
@@ -25,7 +26,6 @@ class BuildSetup @Inject constructor(
     fun setup() {
         Timber.plant(DebugTree())
         SoLoader.init(context, false)
-        CRASH_ON_MAIN_THREAD = preferences.getBoolean(R.string.p_crash_main_queries, false)
         if (preferences.getBoolean(R.string.p_leakcanary, false)) {
             AppWatcher.manualInstall(context)
         }
@@ -38,21 +38,29 @@ class BuildSetup @Inject constructor(
             client.start()
         }
         if (preferences.getBoolean(R.string.p_strict_mode_thread, false)) {
-            StrictMode.setThreadPolicy(
-                    StrictMode.ThreadPolicy.Builder()
-                            .detectDiskReads()
-                            .detectDiskWrites()
-                            .detectNetwork()
-                            .penaltyLog()
-                            .build())
+            val builder = StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog()
+            if (preferences.getBoolean(R.string.p_crash_main_queries, false)) {
+                builder.penaltyDeath()
+            }
+            StrictMode.setThreadPolicy(builder.build())
         }
         if (preferences.getBoolean(R.string.p_strict_mode_vm, false)) {
-            StrictMode.setVmPolicy(
-                    VmPolicy.Builder()
-                            .detectLeakedSqlLiteObjects()
-                            .detectLeakedClosableObjects()
-                            .penaltyLog()
-                            .build())
+            val builder = VmPolicy.Builder()
+                    .detectActivityLeaks()
+                    .detectLeakedSqlLiteObjects()
+                    .detectLeakedRegistrationObjects()
+                    .detectLeakedClosableObjects()
+                    .detectFileUriExposure()
+                    .penaltyLog()
+            if (atLeastOreo()) {
+                builder.detectContentUriWithoutPermission()
+            }
+            if (atLeastQ()) {
+                builder
+                        .detectCredentialProtectedWhileLocked()
+                        .detectImplicitDirectBoot()
+            }
+            StrictMode.setVmPolicy(builder.build())
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/debug/res/values/keys.xml b/app/src/debug/res/values/keys.xml
index ac09c8b1b..a455a5e0c 100644
--- a/app/src/debug/res/values/keys.xml
+++ b/app/src/debug/res/values/keys.xml
@@ -14,5 +14,5 @@
   <string name="debug_themes">debug_themes</string>
   <string name="debug_tasker">debug_tasker</string>
   <string name="debug_reset_ssl">Reset SSL certificates</string>
-  <string name="debug_main_queries">Crash queries on main thread</string>
+  <string name="debug_main_queries">Crash on violation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/debug/res/xml/preferences_debug.xml b/app/src/debug/res/xml/preferences_debug.xml
index 648ced1ac..b5a2c663e 100644
--- a/app/src/debug/res/xml/preferences_debug.xml
+++ b/app/src/debug/res/xml/preferences_debug.xml
@@ -9,14 +9,14 @@
     android:key="@string/p_flipper"
     android:title="@string/debug_flipper"/>
 
-  <SwitchPreferenceCompat
-    android:key="@string/p_strict_mode_thread"
-    android:title="@string/debug_strict_mode_thread"/>
-
   <SwitchPreferenceCompat
     android:key="@string/p_strict_mode_vm"
     android:title="@string/debug_strict_mode_vm"/>
 
+  <SwitchPreferenceCompat
+    android:key="@string/p_strict_mode_thread"
+    android:title="@string/debug_strict_mode_thread"/>
+
   <SwitchPreferenceCompat
     android:defaultValue="false"
     android:key="@string/p_crash_main_queries"
diff --git a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
index 37eded8b4..f45178ed7 100644
--- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
+++ b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
@@ -5,9 +5,9 @@
  */
 package com.todoroo.astrid.alarms
 
+import kotlinx.coroutines.runBlocking
 import org.tasks.data.Alarm
 import org.tasks.data.AlarmDao
-import org.tasks.data.runBlocking
 import org.tasks.jobs.AlarmEntry
 import org.tasks.jobs.NotificationQueue
 import java.util.*
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt
index aa0eb8185..b5486c800 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt
@@ -13,10 +13,10 @@ import com.google.api.services.tasks.model.TaskList
 import com.google.api.services.tasks.model.TaskLists
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.tasks.BuildConfig
 import org.tasks.DebugNetworkInterceptor
-import org.tasks.data.runBlocking
 import org.tasks.gtasks.GoogleAccountManager
 import org.tasks.preferences.Preferences
 import timber.log.Timber
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
index da483d9f7..dce42a6de 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
@@ -3,8 +3,8 @@ package com.todoroo.astrid.service
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.data.Task
+import kotlinx.coroutines.runBlocking
 import org.tasks.data.GoogleTaskDao
-import org.tasks.data.runBlocking
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt
index 4bccf9915..d54c1b263 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt
@@ -3,6 +3,7 @@ package com.todoroo.astrid.service
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.data.Task
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.runBlocking
 import org.tasks.LocalBroadcastManager
 import org.tasks.data.*
 import org.tasks.db.QueryUtils
diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
index 11c4e6803..dd78ac702 100644
--- a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
@@ -19,13 +19,13 @@ import com.todoroo.astrid.activity.TaskListFragment
 import com.todoroo.astrid.api.CaldavFilter
 import com.todoroo.astrid.helper.UUIDHelper
 import com.todoroo.astrid.service.TaskDeleter
+import kotlinx.coroutines.runBlocking
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.activities.BaseListSettingsActivity
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.data.CaldavDao
-import org.tasks.data.runBlocking
 import org.tasks.ui.DisplayableException
 import java.net.ConnectException
 import javax.inject.Inject
diff --git a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
index 1d398ef56..76146bd5a 100644
--- a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
@@ -2,11 +2,11 @@ package org.tasks.caldav
 
 import android.os.Bundle
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.runBlocking
 import org.tasks.R
 import org.tasks.data.CaldavAccount
 import org.tasks.data.CaldavCalendar
 import org.tasks.data.CaldavDao
-import org.tasks.data.runBlocking
 
 @AndroidEntryPoint
 class LocalListSettingsActivity : BaseCaldavCalendarSettingsActivity() {
diff --git a/app/src/main/java/org/tasks/data/CaldavDaoBlocking.kt b/app/src/main/java/org/tasks/data/CaldavDaoBlocking.kt
index b3736f433..f039b58a3 100644
--- a/app/src/main/java/org/tasks/data/CaldavDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/CaldavDaoBlocking.kt
@@ -1,6 +1,7 @@
 package org.tasks.data
 
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt b/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt
index ac972817d..0e6e6a28c 100644
--- a/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt
@@ -3,6 +3,7 @@ package org.tasks.data
 import android.database.Cursor
 import androidx.sqlite.db.SupportSQLiteQuery
 import com.todoroo.astrid.data.Task
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/data/GoogleTaskListDaoBlocking.kt b/app/src/main/java/org/tasks/data/GoogleTaskListDaoBlocking.kt
index 82b3f104e..85eed5857 100644
--- a/app/src/main/java/org/tasks/data/GoogleTaskListDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/GoogleTaskListDaoBlocking.kt
@@ -1,6 +1,7 @@
 package org.tasks.data
 
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/data/LocationDaoBlocking.kt b/app/src/main/java/org/tasks/data/LocationDaoBlocking.kt
index e3ea082ba..01ad74ffa 100644
--- a/app/src/main/java/org/tasks/data/LocationDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/LocationDaoBlocking.kt
@@ -1,6 +1,7 @@
 package org.tasks.data
 
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/data/RunBlocking.kt b/app/src/main/java/org/tasks/data/RunBlocking.kt
deleted file mode 100644
index fd54a2981..000000000
--- a/app/src/main/java/org/tasks/data/RunBlocking.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.tasks.data
-
-import com.todoroo.andlib.utility.AndroidUtilities.assertNotMainThread
-import kotlinx.coroutines.CoroutineScope
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-
-var CRASH_ON_MAIN_THREAD = false
-
-@Throws(InterruptedException::class)
-fun <T> runBlocking(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T): T {
-    if (CRASH_ON_MAIN_THREAD) {
-        assertNotMainThread()
-    }
-
-    return kotlinx.coroutines.runBlocking(context, block)
-}
-
diff --git a/app/src/main/java/org/tasks/data/TagDataDaoBlocking.kt b/app/src/main/java/org/tasks/data/TagDataDaoBlocking.kt
index 865c795cc..d4accdab8 100644
--- a/app/src/main/java/org/tasks/data/TagDataDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/TagDataDaoBlocking.kt
@@ -1,6 +1,7 @@
 package org.tasks.data
 
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/data/UserActivityDaoBlocking.kt b/app/src/main/java/org/tasks/data/UserActivityDaoBlocking.kt
index e82b6ed3b..8c7549811 100644
--- a/app/src/main/java/org/tasks/data/UserActivityDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/data/UserActivityDaoBlocking.kt
@@ -1,5 +1,6 @@
 package org.tasks.data
 
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/jobs/CleanupWork.kt b/app/src/main/java/org/tasks/jobs/CleanupWork.kt
index 4627f3ed0..38264a7d3 100644
--- a/app/src/main/java/org/tasks/jobs/CleanupWork.kt
+++ b/app/src/main/java/org/tasks/jobs/CleanupWork.kt
@@ -7,6 +7,7 @@ import androidx.work.WorkerParameters
 import com.todoroo.astrid.alarms.AlarmService
 import com.todoroo.astrid.reminders.ReminderService
 import com.todoroo.astrid.timers.TimerPlugin
+import kotlinx.coroutines.runBlocking
 import org.tasks.analytics.Firebase
 import org.tasks.data.*
 import org.tasks.files.FileHelper
diff --git a/app/src/main/java/org/tasks/notifications/NotificationDaoBlocking.kt b/app/src/main/java/org/tasks/notifications/NotificationDaoBlocking.kt
index bb700b823..b7beaad42 100644
--- a/app/src/main/java/org/tasks/notifications/NotificationDaoBlocking.kt
+++ b/app/src/main/java/org/tasks/notifications/NotificationDaoBlocking.kt
@@ -1,6 +1,6 @@
 package org.tasks.notifications
 
-import org.tasks.data.runBlocking
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 @Deprecated("use coroutines")
diff --git a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
index 612013431..ec9fbf11b 100644
--- a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
+++ b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
@@ -7,6 +7,7 @@ import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.core.BuiltInFilterExposer.Companion.getMyTasksFilter
 import com.todoroo.astrid.data.Task
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.runBlocking
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.data.*