Upgrade WireGuard

.github/workflows/build.yml

@@ -26,10 +26,10 @@ jobs:
     - name: Install liboqs dependencies
       run: sudo apt-get update && sudo apt-get install -y astyle cmake gcc ninja-build libssl-dev python3-pytest python3-pytest-xdist unzip xsltproc doxygen graphviz python3-yaml valgrind
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

.github/workflows/codeql.yml

@@ -36,10 +36,10 @@ jobs:
     - name: Checkout submodules
       run: git submodule update --init --recursive
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 
@@ -53,32 +53,3 @@ jobs:
       uses: github/codeql-action/analyze@v2
       with:
         category: "/language:Java"
-
-  analyze_go:
-    name: Analyze Go
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: go
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:Go"

build.gradle

@@ -1,17 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.8.0'
     ext.kotlin_coroutines_version = '1.2.1'
-    ext.nav_version = '2.3.5'
-    ext.compose_version = '1.2.0-alpha08'
-    ext.dagger_version = '2.42'
+    ext.nav_version = '2.5.0'
+    ext.compose_version = '1.4.1'
+    ext.dagger_version = '2.44'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
@@ -40,6 +40,6 @@ ext {
     powerMockito = '1.6.2'
     hamcrestVersion = '2.1'
     espressoCore = '3.0.1'
-    lifecycleVersion = '2.3.1'
+    lifecycleVersion = '2.4.1'
     coroutenes = '1.5.2'
 }

core/CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required (VERSION 3.4.1)
 project(IVPN)
 
-add_subdirectory(tools)
 add_subdirectory(src/main/cpp)

core/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
 
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
@@ -14,6 +13,8 @@ if (new File("keystore.properties").exists()) {
 }
 
 android {
+    namespace "net.ivpn.core"
+
     signingConfigs {
         release {
             keyAlias keystoreProperties['release.key.alias']
@@ -61,9 +62,11 @@ android {
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
+            matchingFallbacks = ["release"]
         }
         debug {
             signingConfig signingConfigs.debug
+            matchingFallbacks = ["debug"]
         }
     }
     lintOptions {
@@ -81,11 +84,12 @@ android {
         enabled = true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
@@ -97,14 +101,6 @@ android {
             path 'CMakeLists.txt'
         }
     }
-    androidExtensions {
-        experimental = true
-    }
-
-    dexOptions {
-        incremental true
-        javaMaxHeapSize "4g"
-    }
 
     splits {
         abi {
@@ -228,37 +224,37 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
 
-    //Used to support stream API from JAVA8 and JAVA9
-    //ToDo remove it in future
+    // Used to support stream API from JAVA8 and JAVA9
+    // ToDo remove it in future
     implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
     implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
 
-    //Sliding up panel
+    // Sliding up panel
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
 
-    //Constraint layout
+    // Constraint layout
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-//    QR support
+    // QR support
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
 
-    //Encrypted shared preference
+    // Encrypted shared preference
     implementation "androidx.security:security-crypto:1.1.0-alpha03"
 
-    //Powerful library for logging
+    // Powerful library for logging
     implementation 'org.slf4j:slf4j-api:1.7.24'
     implementation 'org.slf4j:jul-to-slf4j:1.7.0'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    //Navigation component
+    // Navigation component
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
-    //LiveData component
+    // LiveData component
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.lifecycleVersion"
 
-    //Coroutines
+    // Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutenes"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutenes"
 
@@ -272,7 +268,7 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.2'
     testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
 
-    //Dagger
+    // Dagger
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     implementation "com.google.dagger:dagger:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
@@ -284,6 +280,14 @@ dependencies {
 
     // liboqs
     implementation project(path: ':liboqs-android')
+
+    // For crash logging.
+    implementation 'io.sentry:sentry-android:4.3.0'
+    implementation "androidx.multidex:multidex:2.0.1"
+
+    // WireGuard
+    implementation "com.wireguard.android:tunnel:1.0.20230706"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 
 repositories {

core/src/main/java/net/ivpn/core/common/bindings/IPSelectorBindingAdapter.kt

@@ -26,12 +26,12 @@ import androidx.databinding.BindingAdapter
 import net.ivpn.core.common.views.IPSelectorView
 import net.ivpn.core.v2.viewmodel.LocationViewModel
 
-@BindingAdapter("app:ipstate")
+@BindingAdapter("ipstate")
 fun setState(view: IPSelectorView, state: LocationViewModel.IPState) {
     view.setState(state)
 }
 
-@BindingAdapter("app:ipStateListener")
+@BindingAdapter("ipStateListener")
 fun setStateListener(view: IPSelectorView, listener: LocationViewModel.OnIPStateChangedListener?) {
     view.setStateListener(listener)
 }

core/src/main/java/net/ivpn/core/common/bindings/ImageViewSrcBindingAdapter.kt

@@ -38,20 +38,6 @@ import net.ivpn.core.v2.splittunneling.items.ApplicationItem
 import java.io.File
 import java.io.IOException
 
-@BindingAdapter("android:src")
-fun setImageUri(view: ImageView, imageUri: String?) {
-    if (imageUri == null) {
-        view.setImageURI(null)
-    } else {
-        view.setImageURI(Uri.parse(imageUri))
-    }
-}
-
-@BindingAdapter("android:src")
-fun setImageUri(view: ImageView, imageUri: Uri?) {
-    view.setImageURI(imageUri)
-}
-
 @BindingAdapter("android:src")
 fun setImageDrawable(view: ImageView, drawable: Drawable?) {
     view.setImageDrawable(drawable)

core/src/main/java/net/ivpn/core/common/pinger/PingDataSet.kt

@@ -23,7 +23,7 @@ package net.ivpn.core.common.pinger
 */
 
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -40,9 +40,7 @@ class PingDataSet @Inject constructor(
 ) {
 
     val pings: MutableLiveData<MutableMap<Server, PingResultFormatter?>> = MutableLiveData()
-    val fastestServer = Transformations.map(pings) {
-        calculateFastestServer(it)
-    }
+    val fastestServer = pings.map { calculateFastestServer(it) }
 
     private var _pings: MutableMap<Server, PingResultFormatter?> = mutableMapOf()