3 files changed, 10 insertions, 10 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt
index a5e4a1d..b647324 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.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
@@ -19,7 +19,7 @@
 package org.pacien.tincapp.activities.status.subnets
 
 import android.content.Context
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -29,10 +29,10 @@ import org.pacien.tincapp.databinding.StatusSubnetListItemBinding
 /**
  * @author pacien
  */
-class SubnetInfoArrayAdapter(context: Context?) : ArrayAdapter<SubnetInfo>(context, -1) {
+class SubnetInfoArrayAdapter(context: Context) : ArrayAdapter<SubnetInfo>(context, -1) {
   private val layoutInflater = LayoutInflater.from(context)!!
 
-  override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+  override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
     val binding = when (convertView) {
       null -> StatusSubnetListItemBinding.inflate(layoutInflater, parent, false)
       else -> DataBindingUtil.getBinding(convertView)!!
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt
index abaf517..62f6876 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.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,8 +18,8 @@
 
 package org.pacien.tincapp.activities.status.subnets
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -36,7 +36,7 @@ import org.pacien.tincapp.extensions.setElements
  */
 class SubnetListFragment : BaseFragment() {
   private val subnetListViewModel by lazy { ViewModelProviders.of(this).get(SubnetListViewModel::class.java) }
-  private val subnetListAdapter by lazy { SubnetInfoArrayAdapter(context) }
+  private val subnetListAdapter by lazy { SubnetInfoArrayAdapter(requireContext()) }
   private val subnetListObserver by lazy { Observer<List<SubnetInfo>> { subnetListAdapter.setElements(it) } }
 
   override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt
index ff0afca..dc47b40 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.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.status.subnets
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import org.pacien.tincapp.service.TincVpnService
 
 /**