create a new background thread only when needed

tibbi · tibbi · commit b71768a0dc2e · 2019-08-19T22:38:59.000+02:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -14,10 +14,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.LICENSE_RTL
-import com.simplemobiletools.commons.helpers.PERMISSION_READ_STORAGE
-import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
-import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.models.RadioItem
@@ -360,7 +357,7 @@ class MainActivity : SimpleActivity() {
     private fun openFile() {
         FilePickerDialog(this, canAddShowHiddenButton = true) {
             openFile(it, true) {
-                Thread {
+                ensureBackgroundThread {
                     val fileText = it.readText().trim()
                     val checklistItems = fileText.parseChecklistItems()
                     if (checklistItems != null) {
@@ -373,7 +370,7 @@ class MainActivity : SimpleActivity() {
                             }
                         }
                     }
-                }.start()
+                }
             }
         }
     }
@@ -644,11 +641,11 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun doDeleteNote(note: Note, deleteFile: Boolean) {
-        Thread {
+        ensureBackgroundThread {
             notesDB.deleteNote(note)
             widgetsDB.deleteNoteWidgets(note.id!!)
             refreshNotes(note, deleteFile)
-        }.start()
+        }
     }
 
     private fun refreshNotes(note: Note, deleteFile: Boolean) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
@@ -15,6 +15,7 @@ import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
@@ -150,9 +151,9 @@ class WidgetConfigureActivity : SimpleActivity() {
         views.setBackgroundColor(R.id.checklist_note_view, mBgColor)
         AppWidgetManager.getInstance(this).updateAppWidget(mWidgetId, views)
         val widget = Widget(null, mWidgetId, mCurrentNoteId)
-        Thread {
+        ensureBackgroundThread {
             widgetsDB.insertOrUpdate(widget)
-        }.start()
+        }
 
         storeWidgetBackground()
         requestWidgetUpdate()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
@@ -6,6 +6,7 @@ import com.simplemobiletools.commons.extensions.getFilenameFromPath
 import com.simplemobiletools.commons.extensions.humanizePath
 import com.simplemobiletools.commons.extensions.isMediaFile
 import com.simplemobiletools.commons.extensions.setupDialogStuff
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.SimpleActivity
 import com.simplemobiletools.notes.pro.extensions.notesDB
@@ -32,9 +33,9 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
                     activity.setupDialogStuff(view, this, R.string.import_folder) {
                         getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                             val updateFilesOnEdit = view.open_file_type.checkedRadioButtonId == R.id.open_file_update_file
-                            Thread {
+                            ensureBackgroundThread {
                                 saveFolder(updateFilesOnEdit)
-                            }.start()
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt
@@ -7,6 +7,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.extensions.showKeyboard
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.extensions.value
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.extensions.config
 import com.simplemobiletools.notes.pro.extensions.notesDB
@@ -29,7 +30,7 @@ class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) {
                         showKeyboard(view.note_title)
                         getButton(BUTTON_POSITIVE).setOnClickListener {
                             val title = view.note_title.value
-                            Thread {
+                            ensureBackgroundThread {
                                 when {
                                     title.isEmpty() -> activity.toast(R.string.no_title)
                                     activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken)
@@ -41,7 +42,7 @@ class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) {
                                         dismiss()
                                     }
                                 }
-                            }.start()
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.notes.pro.dialogs
 import android.content.DialogInterface.BUTTON_POSITIVE
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.SimpleActivity
 import com.simplemobiletools.notes.pro.extensions.config
@@ -26,9 +27,9 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
                         showKeyboard(view.note_title)
                         getButton(BUTTON_POSITIVE).setOnClickListener {
                             val title = view.note_title.value
-                            Thread {
+                            ensureBackgroundThread {
                                 newTitleConfirmed(title, this)
-                            }.start()
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.SimpleActivity
 import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
@@ -113,7 +114,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
     }
 
     private fun saveNote(refreshIndex: Int = -1) {
-        Thread {
+        ensureBackgroundThread {
             if (note != null && context != null) {
                 if (refreshIndex != -1) {
                     view.checklist_list.post {
@@ -125,7 +126,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
                 context?.notesDB?.insertOrUpdate(note!!)
                 context?.updateWidgets()
             }
-        }.start()
+        }
     }
 
     override fun saveChecklist() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt
@@ -9,6 +9,7 @@ import android.net.Uri
 import android.widget.RemoteViews
 import com.simplemobiletools.commons.extensions.getLaunchIntent
 import com.simplemobiletools.commons.extensions.setBackgroundColor
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.activities.SplashActivity
 import com.simplemobiletools.notes.pro.extensions.config
@@ -26,7 +27,7 @@ class MyWidgetProvider : AppWidgetProvider() {
 
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
-        Thread {
+        ensureBackgroundThread {
             context.widgetsDB.getWidgets().forEach {
                 val views = RemoteViews(context.packageName, R.layout.widget)
                 views.setBackgroundColor(R.id.notes_widget_holder, context.config.widgetBgColor)
@@ -46,15 +47,15 @@ class MyWidgetProvider : AppWidgetProvider() {
                 appWidgetManager.updateAppWidget(it.widgetId, views)
                 appWidgetManager.notifyAppWidgetViewDataChanged(it.widgetId, R.id.notes_widget_listview)
             }
-        }.start()
+        }
     }
 
     override fun onDeleted(context: Context, appWidgetIds: IntArray) {
         super.onDeleted(context, appWidgetIds)
-        Thread {
+        ensureBackgroundThread {
             appWidgetIds.forEach {
                 context.widgetsDB.deleteWidgetId(it)
             }
-        }.start()
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.notes.pro.helpers
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.notes.pro.R
 import com.simplemobiletools.notes.pro.extensions.config
 import com.simplemobiletools.notes.pro.extensions.notesDB
@@ -11,7 +12,7 @@ import java.io.File
 
 class NotesHelper(val context: Context) {
     fun getNotes(callback: (notes: ArrayList<Note>) -> Unit) {
-        Thread {
+        ensureBackgroundThread {
             // make sure the initial note has enough time to be precreated
             if (context.config.appRunCount <= 1) {
                 context.notesDB.getNotes()
@@ -39,33 +40,33 @@ class NotesHelper(val context: Context) {
             Handler(Looper.getMainLooper()).post {
                 callback(notes)
             }
-        }.start()
+        }
     }
 
     fun getNoteWithId(id: Long, callback: (note: Note?) -> Unit) {
-        Thread {
+        ensureBackgroundThread {
             val note = context.notesDB.getNoteWithId(id)
             Handler(Looper.getMainLooper()).post {
                 callback(note)
             }
-        }.start()
+        }
     }
 
     fun getNoteIdWithPath(path: String, callback: (id: Long?) -> Unit) {
-        Thread {
+        ensureBackgroundThread {
             val id = context.notesDB.getNoteIdWithPath(path)
             Handler(Looper.getMainLooper()).post {
                 callback(id)
             }
-        }.start()
+        }
     }
 
     fun insertOrUpdateNote(note: Note, callback: ((newNoteId: Long) -> Unit)? = null) {
-        Thread {
+        ensureBackgroundThread {
             val noteId = context.notesDB.insertOrUpdate(note)
             Handler(Looper.getMainLooper()).post {
                 callback?.invoke(noteId)
             }
-        }.start()
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog`
`14`	`14`	`import com.simplemobiletools.commons.dialogs.FilePickerDialog`
`15`	`15`	`import com.simplemobiletools.commons.dialogs.RadioGroupDialog`
`16`	`16`	`import com.simplemobiletools.commons.extensions.*`
`17`		`-import com.simplemobiletools.commons.helpers.LICENSE_RTL`
`18`		`-import com.simplemobiletools.commons.helpers.PERMISSION_READ_STORAGE`
`19`		`-import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE`
`20`		`-import com.simplemobiletools.commons.helpers.REAL_FILE_PATH`
	`17`	`+import com.simplemobiletools.commons.helpers.*`
`21`	`18`	`import com.simplemobiletools.commons.models.FAQItem`
`22`	`19`	`import com.simplemobiletools.commons.models.FileDirItem`
`23`	`20`	`import com.simplemobiletools.commons.models.RadioItem`
`@@ -360,7 +357,7 @@ class MainActivity : SimpleActivity() {`
`360`	`357`	`private fun openFile() {`
`361`	`358`	`FilePickerDialog(this, canAddShowHiddenButton = true) {`
`362`	`359`	`openFile(it, true) {`
`363`		`- Thread {`
	`360`	`+ ensureBackgroundThread {`
`364`	`361`	`val fileText = it.readText().trim()`
`365`	`362`	`val checklistItems = fileText.parseChecklistItems()`
`366`	`363`	`if (checklistItems != null) {`
`@@ -373,7 +370,7 @@ class MainActivity : SimpleActivity() {`
`373`	`370`	`}`
`374`	`371`	`}`
`375`	`372`	`}`
`376`		`- }.start()`
	`373`	`+ }`
`377`	`374`	`}`
`378`	`375`	`}`
`379`	`376`	`}`
`@@ -644,11 +641,11 @@ class MainActivity : SimpleActivity() {`
`644`	`641`	`}`
`645`	`642`
`646`	`643`	`private fun doDeleteNote(note: Note, deleteFile: Boolean) {`
`647`		`- Thread {`
	`644`	`+ ensureBackgroundThread {`
`648`	`645`	`notesDB.deleteNote(note)`
`649`	`646`	`widgetsDB.deleteNoteWidgets(note.id!!)`
`650`	`647`	`refreshNotes(note, deleteFile)`
`651`		`- }.start()`
	`648`	`+ }`
`652`	`649`	`}`
`653`	`650`
`654`	`651`	`private fun refreshNotes(note: Note, deleteFile: Boolean) {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import com.simplemobiletools.commons.extensions.getFilenameFromPath`
`6`	`6`	`import com.simplemobiletools.commons.extensions.humanizePath`
`7`	`7`	`import com.simplemobiletools.commons.extensions.isMediaFile`
`8`	`8`	`import com.simplemobiletools.commons.extensions.setupDialogStuff`
	`9`	`+import com.simplemobiletools.commons.helpers.ensureBackgroundThread`
`9`	`10`	`import com.simplemobiletools.notes.pro.R`
`10`	`11`	`import com.simplemobiletools.notes.pro.activities.SimpleActivity`
`11`	`12`	`import com.simplemobiletools.notes.pro.extensions.notesDB`
`@@ -32,9 +33,9 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal`
`32`	`33`	`activity.setupDialogStuff(view, this, R.string.import_folder) {`
`33`	`34`	`getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {`
`34`	`35`	`val updateFilesOnEdit = view.open_file_type.checkedRadioButtonId == R.id.open_file_update_file`
`35`		`- Thread {`
	`36`	`+ ensureBackgroundThread {`
`36`	`37`	`saveFolder(updateFilesOnEdit)`
`37`		`- }.start()`
	`38`	`+ }`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff`
`7`	`7`	`import com.simplemobiletools.commons.extensions.showKeyboard`
`8`	`8`	`import com.simplemobiletools.commons.extensions.toast`
`9`	`9`	`import com.simplemobiletools.commons.extensions.value`
	`10`	`+import com.simplemobiletools.commons.helpers.ensureBackgroundThread`
`10`	`11`	`import com.simplemobiletools.notes.pro.R`
`11`	`12`	`import com.simplemobiletools.notes.pro.extensions.config`
`12`	`13`	`import com.simplemobiletools.notes.pro.extensions.notesDB`
`@@ -29,7 +30,7 @@ class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) {`
`29`	`30`	`showKeyboard(view.note_title)`
`30`	`31`	`getButton(BUTTON_POSITIVE).setOnClickListener {`
`31`	`32`	`val title = view.note_title.value`
`32`		`- Thread {`
	`33`	`+ ensureBackgroundThread {`
`33`	`34`	`when {`
`34`	`35`	`title.isEmpty() -> activity.toast(R.string.no_title)`
`35`	`36`	`activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken)`
`@@ -41,7 +42,7 @@ class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) {`
`41`	`42`	`dismiss()`
`42`	`43`	`}`
`43`	`44`	`}`
`44`		`- }.start()`
	`45`	`+ }`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package com.simplemobiletools.notes.pro.dialogs`
`3`	`3`	`import android.content.DialogInterface.BUTTON_POSITIVE`
`4`	`4`	`import androidx.appcompat.app.AlertDialog`
`5`	`5`	`import com.simplemobiletools.commons.extensions.*`
	`6`	`+import com.simplemobiletools.commons.helpers.ensureBackgroundThread`
`6`	`7`	`import com.simplemobiletools.notes.pro.R`
`7`	`8`	`import com.simplemobiletools.notes.pro.activities.SimpleActivity`
`8`	`9`	`import com.simplemobiletools.notes.pro.extensions.config`
`@@ -26,9 +27,9 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current`
`26`	`27`	`showKeyboard(view.note_title)`
`27`	`28`	`getButton(BUTTON_POSITIVE).setOnClickListener {`
`28`	`29`	`val title = view.note_title.value`
`29`		`- Thread {`
	`30`	`+ ensureBackgroundThread {`
`30`	`31`	`newTitleConfirmed(title, this)`
`31`		`- }.start()`
	`32`	`+ }`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`}`