removing some explicit calls to runOnUiThread at toasts

SimpleMobileTools · May 18, 2017 · c78da7f · c78da7f
1 parent 1db9365
commit c78da7f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 31 deletions.
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -222,13 +222,11 @@ class MainActivity : SimpleActivity(), NavigationListener {
     }
 
     private fun handleParseResult(result: IcsImporter.ImportResult) {
-        runOnUiThread {
-            toast(when (result) {
-                IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
-                IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
-                else -> R.string.importing_holidays_failed
-            }, Toast.LENGTH_LONG)
-        }
+        toast(when (result) {
+            IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
+            IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
+            else -> R.string.importing_holidays_failed
+        }, Toast.LENGTH_LONG)
     }
 
     private fun updateView(view: Int) {
@@ -326,21 +324,15 @@ class MainActivity : SimpleActivity(), NavigationListener {
                 Thread({
                     val events = dbHelper.getEventsToExport(exportPastEvents).filter { eventTypes.contains(it.eventType.toString()) }
                     if (events.isEmpty()) {
-                        runOnUiThread {
-                            toast(R.string.no_events_for_exporting)
-                        }
+                        toast(R.string.no_events_for_exporting)
                     } else {
-                        runOnUiThread {
-                            toast(R.string.exporting)
-                        }
+                        toast(R.string.exporting)
                         IcsExporter().exportEvents(this, file, events as ArrayList<Event>) {
-                            runOnUiThread {
-                                toast(when (it) {
-                                    IcsExporter.ExportResult.EXPORT_OK -> R.string.events_exported_successfully
-                                    IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_events_failed
-                                    else -> R.string.exporting_events_failed
-                                })
-                            }
+                            toast(when (it) {
+                                IcsExporter.ExportResult.EXPORT_OK -> R.string.events_exported_successfully
+                                IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_events_failed
+                                else -> R.string.exporting_events_failed
+                            })
                         }
                     }
                 }).start()

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt
@@ -42,19 +42,19 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val cal
             getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({
                 val filename = view.export_events_filename.value
                 if (filename.isEmpty()) {
-                    context.toast(R.string.empty_name)
+                    activity.toast(R.string.empty_name)
                 } else if (filename.isAValidFilename()) {
                     val file = File(path, "$filename.ics")
                     if (file.exists()) {
-                        context.toast(R.string.name_taken)
+                        activity.toast(R.string.name_taken)
                         return@setOnClickListener
                     }
 
                     val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsSet()
                     callback(view.export_events_checkbox.isChecked, file, eventTypes)
                     dismiss()
                 } else {
-                    context.toast(R.string.invalid_name)
+                    activity.toast(R.string.invalid_name)
                 }
             })
         }

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt
@@ -51,13 +51,11 @@ class ImportEventsDialog(val activity: Activity, val path: String, val callback:
     }
 
     private fun handleParseResult(result: IcsImporter.ImportResult) {
-        activity.runOnUiThread {
-            activity.toast(when (result) {
-                IMPORT_OK -> R.string.events_imported_successfully
-                IMPORT_PARTIAL -> R.string.importing_some_events_failed
-                else -> R.string.importing_events_failed
-            })
-            callback.invoke(result != IMPORT_FAIL)
-        }
+        activity.toast(when (result) {
+            IMPORT_OK -> R.string.events_imported_successfully
+            IMPORT_PARTIAL -> R.string.importing_some_events_failed
+            else -> R.string.importing_events_failed
+        })
+        callback.invoke(result != IMPORT_FAIL)
     }
 }