31 files changed, 93 insertions, 88 deletions

diff --git a/.gitignore b/.gitignore
index d6ac763..d05f520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@
 /captures
 .externalNativeBuild
 /app/release
+/app/.cxx
 keystore.properties
diff --git a/app/build.gradle b/app/build.gradle
index 4fc04ae..5ef4f4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,13 +30,12 @@ def keystoreProperties = new Properties()
 if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-  compileSdkVersion 27
+  compileSdkVersion 29
 
   defaultConfig {
     applicationId 'org.pacien.tincapp'
     minSdkVersion 21
-    //noinspection OldTargetApi
-    targetSdkVersion 27
+    targetSdkVersion 28 // FIXME: bad file descriptor in daemon when targeting 29
     multiDexEnabled true
     versionCode 28
     versionName '0.28'
@@ -78,17 +77,17 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
-  implementation 'android.arch.lifecycle:extensions:1.1.1'
-  implementation 'com.android.support:support-compat:27.1.1'
-  implementation 'com.android.support:design:27.1.1'
+  implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+  implementation 'androidx.core:core:1.1.0'
+  implementation 'com.google.android.material:material:1.0.0'
   implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
   implementation 'org.bouncycastle:bcpkix-jdk15on:1.61'
   implementation 'org.slf4j:slf4j-api:1.7.26'
   implementation 'com.github.tony19:logback-android:2.0.0'
   // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24
-  implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' }
-  implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' }
-  implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' }
+  implementation 'org.apache.commons:commons-configuration2:2.3'
+  implementation 'commons-beanutils:commons-beanutils:1.9.3'
+  implementation 'commons-io:commons-io:2.6'
 }
 
 repositories {
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 196ccd3..37eef88 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.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
@@ -20,11 +20,11 @@ package org.pacien.tincapp.activities
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.LayoutRes
-import android.support.annotation.StringRes
-import android.support.design.widget.Snackbar
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import android.view.*
 import kotlinx.android.synthetic.main.base_activity.*
 import org.pacien.tincapp.R
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 ae82fe7..1811c0c 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.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,8 +19,8 @@
 package org.pacien.tincapp.activities
 
 import android.content.Context
-import android.support.annotation.LayoutRes
-import android.support.v4.app.DialogFragment
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
index 44f57c7..6f0e5f9 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.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
 
-import android.support.annotation.LayoutRes
-import android.support.v4.app.Fragment
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
index c55e889..7603fa7 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.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.common
 
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.FragmentManager