Kotlin: more kotlin migration.

app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt

@@ -46,7 +46,7 @@ import java.util.logging.Level
 
 class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMenu.OnMenuItemClickListener, LoaderManager.LoaderCallbacks<AccountActivity.AccountInfo>, Refreshable {
 
-    private var account: Account? = null
+    private lateinit var account: Account
     private var accountInfo: AccountInfo? = null
 
     internal var listCalDAV: ListView? = null

app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt

@@ -31,7 +31,7 @@ import com.etesync.syncadapter.ui.setup.LoginCredentials
 import com.etesync.syncadapter.ui.setup.LoginCredentialsChangeFragment
 
 class AccountSettingsActivity : BaseActivity() {
-    private var account: Account? = null
+    private lateinit var account: Account
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt

@@ -19,13 +19,13 @@ import com.etesync.syncadapter.model.CollectionInfo
 import okhttp3.HttpUrl
 
 class AddMemberFragment : DialogFragment() {
-    private var account: Account? = null
+    private lateinit var account: Account
     private var settings: AccountSettings? = null
     private var ctx: Context? = null
     private var remote: HttpUrl? = null
-    private var info: CollectionInfo? = null
-    private var memberEmail: String? = null
-    private var memberPubKey: ByteArray? = null
+    private lateinit var info: CollectionInfo
+    private lateinit var memberEmail: String
+    private lateinit var memberPubKey: ByteArray
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -62,7 +62,7 @@ class AddMemberFragment : DialogFragment() {
 
                 val userInfo = userInfoManager[memberEmail!!]
                         ?: throw Exception(getString(R.string.collection_members_error_user_not_found, memberEmail))
-                memberPubKey = userInfo.pubkey
+                memberPubKey = userInfo.pubkey!!
                 return AddResult(null)
             } catch (e: Exception) {
                 return AddResult(e)

app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt

@@ -39,8 +39,8 @@ import java.io.IOException
 
 class ImportFragment : DialogFragment() {
 
-    private var account: Account? = null
-    private var info: CollectionInfo? = null
+    private lateinit var account: Account
+    private lateinit var info: CollectionInfo
     private var importFile: File? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt

@@ -24,8 +24,8 @@ import com.etesync.syncadapter.resource.LocalEvent
 
 class LocalCalendarImportFragment : ListFragment() {
 
-    private var account: Account? = null
-    private var info: CollectionInfo? = null
+    private lateinit var account: Account
+    private lateinit var info: CollectionInfo
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt

@@ -31,8 +31,8 @@ import java.util.*
 
 class LocalContactImportFragment : Fragment() {
 
-    private var account: Account? = null
-    private var info: CollectionInfo? = null
+    private lateinit var account: Account
+    private lateinit var info: CollectionInfo
     private var recyclerView: RecyclerView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt

@@ -28,7 +28,7 @@ import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration
 import java.util.logging.Level
 
 class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCallbacks<Configuration> {
-    private var account: Account? = null
+    private lateinit var account: Account
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)

app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt

@@ -16,8 +16,8 @@ import com.etesync.syncadapter.journalmanager.UserInfoManager
 import okhttp3.HttpUrl
 
 class SetupUserInfoFragment : DialogFragment() {
-    private var account: Account? = null
-    private var settings: AccountSettings? = null
+    private lateinit var account: Account
+    private lateinit var settings: AccountSettings
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)