4 files changed, 8 insertions, 8 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
index c0c6e02..6191e12 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
@@ -19,7 +19,7 @@
 package org.pacien.tincapp.activities.start
 
 import android.net.VpnService
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.inputmethod.EditorInfo
 import kotlinx.android.synthetic.main.base_activity.*
 import kotlinx.android.synthetic.main.dialog_decrypt_keys.view.*
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListFragment.kt
index 98e717b..d3cc803 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListFragment.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 package org.pacien.tincapp.activities.start
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -39,7 +39,7 @@ import org.pacien.tincapp.extensions.setElements
 class NetworkListFragment : BaseFragment() {
   private val appPaths = AppPaths
   private val networkListViewModel by lazy { NetworkListViewModel() }
-  private val networkListAdapter by lazy { ArrayAdapter<String>(context, R.layout.start_network_list_item) }
+  private val networkListAdapter by lazy { ArrayAdapter<String>(requireContext(), R.layout.start_network_list_item) }
   var connectToNetworkAction = { _: String -> Unit }
 
   override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListViewModel.kt b/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListViewModel.kt
index 419522d..0cb341f 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListViewModel.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/NetworkListViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 package org.pacien.tincapp.activities.start
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 
 /**
  * @author pacien
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
index 877492d..45c9c08 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
@@ -21,7 +21,7 @@ package org.pacien.tincapp.activities.start
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.Menu
 import android.view.MenuItem
 import kotlinx.android.synthetic.main.start_activity.*
@@ -56,7 +56,7 @@ class StartActivity : BaseActivity() {
     initNetworkListFragment()
 
     if (intent.action == Actions.ACTION_CONNECT && intent.data?.schemeSpecificPart != null)
-      connectionStarter.tryStart(intent.data.schemeSpecificPart, intent.data.fragment, false)
+      connectionStarter.tryStart(intent.data!!.schemeSpecificPart, intent.data!!.fragment, false)
   }
 
   private fun initNetworkListFragment() {