From e4b29832f5b1c260c7a628beefc12193b1b2b2e8 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 1 May 2019 13:26:59 +0100
Subject: [PATCH] Import: mark progressDialog as non-null.

---
 .../LocalCalendarImportFragment.kt            | 25 +++++++++----------
 .../importlocal/LocalContactImportFragment.kt | 25 +++++++++----------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt
index 111c0284..982d42de 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt
@@ -166,18 +166,18 @@ class LocalCalendarImportFragment : ListFragment() {
     }
 
     protected inner class ImportEvents : AsyncTask<LocalCalendar, Int, ResultFragment.ImportResult>() {
-        internal var progressDialog: ProgressDialog? = null
+        private lateinit var progressDialog: ProgressDialog
 
         override fun onPreExecute() {
             progressDialog = ProgressDialog(activity)
-            progressDialog!!.setTitle(R.string.import_dialog_title)
-            progressDialog!!.setMessage(getString(R.string.import_dialog_adding_entries))
-            progressDialog!!.setCanceledOnTouchOutside(false)
-            progressDialog!!.setCancelable(false)
-            progressDialog!!.isIndeterminate = false
-            progressDialog!!.setIcon(R.drawable.ic_import_export_black)
-            progressDialog!!.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL)
-            progressDialog!!.show()
+            progressDialog.setTitle(R.string.import_dialog_title)
+            progressDialog.setMessage(getString(R.string.import_dialog_adding_entries))
+            progressDialog.setCanceledOnTouchOutside(false)
+            progressDialog.setCancelable(false)
+            progressDialog.isIndeterminate = false
+            progressDialog.setIcon(R.drawable.ic_import_export_black)
+            progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL)
+            progressDialog.show()
         }
 
         override fun doInBackground(vararg calendars: LocalCalendar): ResultFragment.ImportResult {
@@ -185,12 +185,11 @@ class LocalCalendarImportFragment : ListFragment() {
         }
 
         override fun onProgressUpdate(vararg progress: Int?) {
-            if (progressDialog != null)
-                progressDialog!!.progress = progress[0]!!
+            progressDialog.progress = progress[0]!!
         }
 
         override fun onPostExecute(result: ResultFragment.ImportResult) {
-            progressDialog!!.dismiss()
+            progressDialog.dismiss()
             (activity as ResultFragment.OnImportCallback).onImportResult(result)
         }
 
@@ -202,7 +201,7 @@ class LocalCalendarImportFragment : ListFragment() {
                         LocalCalendar.Factory, info!!.uid!!)
                 val localEvents = fromCalendar.findAll()
                 val total = localEvents.size
-                progressDialog!!.max = total
+                progressDialog.max = total
                 result.total = total.toLong()
                 var progress = 0
                 for (currentLocalEvent in localEvents) {
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
index 32035afc..8b16177f 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
@@ -101,18 +101,18 @@ class LocalContactImportFragment : Fragment() {
     }
 
     protected inner class ImportContacts : AsyncTask<LocalAddressBook, Int, ResultFragment.ImportResult>() {
-        internal var progressDialog: ProgressDialog? = null
+        private lateinit var progressDialog: ProgressDialog
 
         override fun onPreExecute() {
             progressDialog = ProgressDialog(activity)
-            progressDialog!!.setTitle(R.string.import_dialog_title)
-            progressDialog!!.setMessage(getString(R.string.import_dialog_adding_entries))
-            progressDialog!!.setCanceledOnTouchOutside(false)
-            progressDialog!!.setCancelable(false)
-            progressDialog!!.isIndeterminate = false
-            progressDialog!!.setIcon(R.drawable.ic_import_export_black)
-            progressDialog!!.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL)
-            progressDialog!!.show()
+            progressDialog.setTitle(R.string.import_dialog_title)
+            progressDialog.setMessage(getString(R.string.import_dialog_adding_entries))
+            progressDialog.setCanceledOnTouchOutside(false)
+            progressDialog.setCancelable(false)
+            progressDialog.isIndeterminate = false
+            progressDialog.setIcon(R.drawable.ic_import_export_black)
+            progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL)
+            progressDialog.show()
         }
 
         override fun doInBackground(vararg addressBooks: LocalAddressBook): ResultFragment.ImportResult {
@@ -120,12 +120,11 @@ class LocalContactImportFragment : Fragment() {
         }
 
         override fun onProgressUpdate(vararg values: Int?) {
-            if (progressDialog != null)
-                progressDialog!!.progress = values[0]!!
+            progressDialog.progress = values[0]!!
         }
 
         override fun onPostExecute(result: ResultFragment.ImportResult) {
-            progressDialog!!.dismiss()
+            progressDialog.dismiss()
             (activity as ResultFragment.OnImportCallback).onImportResult(result)
         }
 
@@ -139,7 +138,7 @@ class LocalContactImportFragment : Fragment() {
                 val localGroups = localAddressBook.findAllGroups()
                 val oldIdToNewId = HashMap<Long, Long>()
                 val total = localContacts.size + localGroups.size
-                progressDialog!!.max = total
+                progressDialog.max = total
                 result.total = total.toLong()
                 var progress = 0
                 for (currentLocalContact in localContacts) {