13 files changed, 21 insertions, 22 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index 6f18565..4e9f983 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -87,7 +87,7 @@ abstract class BaseActivity : AppCompatActivity() {
         resources.getString(R.string.about_app_license) + "\n\n" +
         AppInfo.all())
       .setNeutralButton(R.string.about_app_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.about_app_website_url)) }
-      .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }
+      .setPositiveButton(R.string.generic_action_close) { _, _ -> }
       .show()
   }
 
@@ -104,7 +104,7 @@ abstract class BaseActivity : AppCompatActivity() {
   fun showErrorDialog(msg: String, docTopic: String? = null): AlertDialog =
     AlertDialog.Builder(this)
       .setTitle(R.string.generic_title_error).setMessage(msg)
-      .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }
+      .setPositiveButton(R.string.generic_action_close) { _, _ -> }
       .apply {
         if (docTopic != null)
           setNeutralButton(R.string.notification_error_action_open_manual) { _, _ ->
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
index 4888cd0..05eadd5 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
@@ -28,5 +28,5 @@ import android.view.LayoutInflater
 abstract class BaseDialogFragment : DialogFragment() {
   protected val parentActivity by lazy { activity as BaseActivity }
   // getLayoutInflater() calls onCreateDialog. See https://stackoverflow.com/a/15152788
-  protected val dialogLayoutInflater by lazy { activity!!.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater }
+  protected val dialogLayoutInflater by lazy { requireActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater }
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/common/RecentCrashHandler.kt b/app/src/main/java/org/pacien/tincapp/activities/common/RecentCrashHandler.kt
index 8f53e08..92f82c2 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/common/RecentCrashHandler.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/common/RecentCrashHandler.kt
@@ -42,7 +42,7 @@ class RecentCrashHandler(private val parentActivity: BaseActivity) {
       .setTitle(R.string.crash_modal_title)
       .setMessage(makeMessage())
       .setNeutralButton(R.string.crash_modal_action_send_report) { _, _ -> sendReportMail() }
-      .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }
+      .setPositiveButton(R.string.generic_action_close) { _, _ -> }
       .show()
   }
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt
index 533faa9..c146c24 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt
@@ -39,8 +39,8 @@ abstract class ConfigurationToolDialogFragment : BaseDialogFragment() {
       .setTitle(title)
       .setView(viewBinding.root)
       .setPositiveButton(applyButton) { _, _ -> applyAction(viewBinding) }
-      .setNegativeButton(R.string.generic_action_cancel) { _, _ -> Unit }
-      .create()!!
+      .setNegativeButton(R.string.generic_action_cancel) { _, _ -> }
+      .create()
 
   protected fun execAction(@StringRes label: Int, action: CompletableFuture<Unit>) {
     ProgressModal.show(parentActivity, getString(label)).let { progressDialog ->
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 05df357..ef94489 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
@@ -59,7 +59,7 @@ class ConnectionStarter(private val parentActivity: StartActivity) {
       .setTitle(R.string.decrypt_key_modal_title)
       .setView(dialogViewBinding.root)
       .setPositiveButton(R.string.decrypt_key_modal_action_unlock) { _, _ -> tryStart(passphrase = dialogViewBinding.passphrase.text.toString()) }
-      .setNegativeButton(R.string.decrypt_key_modal_action_cancel) { _, _ -> Unit }
+      .setNegativeButton(R.string.decrypt_key_modal_action_cancel) { _, _ -> }
       .create()
 
     dialogViewBinding.passphrase.on(EditorInfo.IME_ACTION_DONE) {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt
index fdfa8f6..08dab8d 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt
@@ -32,11 +32,11 @@ import org.pacien.tincapp.databinding.StartErrorNotificationBinding
  * @author euxane
  */
 class ErrorNotificationFragment : BaseFragment() {
-  private val notificationManager by lazy { AppNotificationManager(context!!) }
+  private val notificationManager by lazy { AppNotificationManager(requireContext()) }
   private val notificationListener = OnSharedPreferenceChangeListener { _, _ -> updateView() }
   private lateinit var viewBinding: StartErrorNotificationBinding
 
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     viewBinding = StartErrorNotificationBinding.inflate(inflater, container, false)
     updateView()
     return viewBinding.root
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 fc5b6ff..988e877 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
@@ -18,7 +18,6 @@
 
 package org.pacien.tincapp.activities.start
 
-import androidx.lifecycle.Observer
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -40,14 +39,14 @@ class NetworkListFragment : BaseFragment() {
   private val networkListViewModel by lazy { NetworkListViewModel() }
   private val networkListAdapter by lazy { ArrayAdapter<String>(requireContext(), R.layout.start_network_list_item) }
   private lateinit var startNetworkListBinding: StartNetworkListBinding
-  var connectToNetworkAction = { _: String -> Unit }
+  var connectToNetworkAction = { _: String -> }
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    networkListViewModel.networkList.observe(this, Observer { updateNetworkList(it.orEmpty()) })
+    networkListViewModel.networkList.observe(this) { updateNetworkList(it.orEmpty()) }
   }
 
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     startNetworkListBinding = StartNetworkListBinding.inflate(inflater, container, false)
     return startNetworkListBinding.root
   }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
index 92d6312..c8a6c0e 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
@@ -29,7 +29,7 @@ object VpnInterfaceConfigurationFormatter {
   private val resources by lazy { App.getResources() }
 
   fun formatList(list: List<Any>?) = when {
-    list != null && list.isNotEmpty() -> list.joinToString("\n", transform = this::formatListElement)
+    !list.isNullOrEmpty() -> list.joinToString("\n", transform = this::formatListElement)
     else -> resources.getString(R.string.status_network_info_value_none)
   }
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
index b96e5fb..627cae4 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
@@ -42,7 +42,7 @@ class NodeListFragment : BaseFragment() {
   private val vpnService = TincVpnService
   private val tincCtl = Tinc
   private val netName by lazy { vpnService.getCurrentNetName()!! }
-  private val nodeListViewModel by lazy { ViewModelProvider(this).get(NodeListViewModel::class.java) }
+  private val nodeListViewModel by lazy { ViewModelProvider(this)[NodeListViewModel::class.java] }
   private val nodeListAdapter by lazy { NodeInfoArrayAdapter(requireContext(), this::onItemClick) }
   private lateinit var statusNodeListFragmentBinding: StatusNodeListFragmentBinding
 
@@ -79,7 +79,7 @@ class NodeListFragment : BaseFragment() {