47 files changed, 779 insertions, 204 deletions

diff --git a/.gitignore b/.gitignore
index d05f520..362490b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /app/release
 /app/.cxx
 keystore.properties
+*.local
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 1962fbf..c983539 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
-# Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+# Copyright (C) 2017-2022 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
@@ -43,8 +43,8 @@ ExternalProject_Add(lzo
 )
 
 ExternalProject_Add(libressl
-  URL               https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.4.tar.gz
-  URL_HASH          SHA256=414c149c9963983f805a081db5bd3aec146b5f82d529bb63875ac941b25dcbb6
+  URL               https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.3.tar.gz
+  URL_HASH          SHA256=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
   CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
   BUILD_COMMAND     make -j8 -C crypto
   INSTALL_COMMAND   make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
@@ -54,10 +54,8 @@ ExternalProject_Add(libressl
 
 ExternalProject_Add(tinc
   DEPENDS           lzo libressl
-  URL               https://github.com/gsliepen/tinc/archive/f5223937e62e1cc5e9b3d322490dd3af8d666750.tar.gz
-  URL_HASH          SHA256=3fe923e8fbb1e0192986039e91d6945ffbbe326ee8c2c0a13bacf80e87dad4a9
-  # TODO: remove patch once merged in upstream (https://github.com/gsliepen/tinc/pull/251)
-  PATCH_COMMAND     patch -p1 < ${PROJECT_SOURCE_DIR}/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch
+  URL               https://tinc-vpn.org/packages/tinc-1.1pre18.tar.gz
+  URL_HASH          SHA256=2757ddc62cf64b411f569db2fa85c25ec846c0db110023f6befb33691f078986
   CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
                     <SOURCE_DIR>/configure ${xCONFIG}
                       --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
@@ -67,9 +65,11 @@ ExternalProject_Add(tinc
   BUILD_COMMAND     make -j8 -C src
   INSTALL_COMMAND   make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
                     ${CMAKE_COMMAND} -E copy
-                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
+                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc
+                      ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&
                     ${CMAKE_COMMAND} -E copy
-                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
+                      ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tincd
+                      ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtincd.so &&
                     rm -r <BINARY_DIR>
 )
 
diff --git a/app/build.gradle b/app/build.gradle
index 7c428d9..03d5fc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2024 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
@@ -30,15 +30,15 @@ def keystoreProperties = new Properties()
 if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 33
 
   defaultConfig {
     applicationId 'org.pacien.tincapp'
     minSdkVersion 21
-    targetSdkVersion 30
+    targetSdkVersion 33
     multiDexEnabled true
-    versionCode 30
-    versionName '0.30'
+    versionCode 39
+    versionName '0.39'
     ndk {
       abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
     }
@@ -67,9 +67,11 @@ android {
     }
   }
 
-  dataBinding {
-    enabled = true
+  buildFeatures {
+    dataBinding = true
   }
+
+  namespace 'org.pacien.tincapp'
 }
 
 dependencies {
@@ -91,7 +93,7 @@ dependencies {
 }
 
 repositories {
-  jcenter()
+  mavenCentral()
   google()
 }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 5100915..2bb4a71 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,5 +1,5 @@
 # Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
-# Copyright (C) 2017-2019 Pacien TRAN-GIRARD
+# Copyright (C) 2017-2023 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
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c86ec8f..a1183d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 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,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.pacien.tincapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -29,12 +28,15 @@