aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--app/build.gradle17
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt12
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseDialogFragment.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/common/ProgressModal.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/common/RecentCrashHandler.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/common/SelfRefreshingLiveData.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationToolDialogFragment.kt8
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/NetworkListFragment.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/NetworkListViewModel.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt8
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt10
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListViewModel.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt8
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt8
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/viewlog/LogViewModel.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/viewlog/ViewLogActivity.kt6
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/App.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt8
-rw-r--r--app/src/main/java/org/pacien/tincapp/intent/BroadcastMapper.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt6
-rw-r--r--app/src/main/res/layout/base_activity.xml4
-rw-r--r--app/src/main/res/layout/status_activity.xml8
-rw-r--r--changelog.md3
-rw-r--r--gradle.properties4
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 @@
23/captures 23/captures
24.externalNativeBuild 24.externalNativeBuild
25/app/release 25/app/release
26/app/.cxx
26keystore.properties 27keystore.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()
30if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) 30if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
31 31
32android { 32android {
33 compileSdkVersion 27 33 compileSdkVersion 29
34 34
35 defaultConfig { 35 defaultConfig {
36 applicationId 'org.pacien.tincapp' 36 applicationId 'org.pacien.tincapp'
37 minSdkVersion 21 37 minSdkVersion 21
38 //noinspection OldTargetApi 38 targetSdkVersion 28 // FIXME: bad file descriptor in daemon when targeting 29
39 targetSdkVersion 27
40 multiDexEnabled true 39 multiDexEnabled true
41 versionCode 28 40 versionCode 28
42 versionName '0.28' 41 versionName '0.28'
@@ -78,17 +77,17 @@ dependencies {
78 77
79 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 78 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
80 implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' 79 implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
81 implementation 'android.arch.lifecycle:extensions:1.1.1' 80 implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
82 implementation 'com.android.support:support-compat:27.1.1' 81 implementation 'androidx.core:core:1.1.0'
83 implementation 'com.android.support:design:27.1.1' 82 implementation 'com.google.android.material:material:1.0.0'
84 implementation 'com.journeyapps:zxing-android-embedded:3.6.0' 83 implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
85 implementation 'org.bouncycastle:bcpkix-jdk15on:1.61' 84 implementation 'org.bouncycastle:bcpkix-jdk15on:1.61'
86 implementation 'org.slf4j:slf4j-api:1.7.26' 85 implementation 'org.slf4j:slf4j-api:1.7.26'
87 implementation 'com.github.tony19:logback-android:2.0.0' 86 implementation 'com.github.tony19:logback-android:2.0.0'
88 // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 87 // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24
89 implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' } 88 implementation 'org.apache.commons:commons-configuration2:2.3'
90 implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } 89 implementation 'commons-beanutils:commons-beanutils:1.9.3'
91 implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' } 90 implementation 'commons-io:commons-io:2.6'
92} 91}
93 92
94repositories { 93repositories {
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 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@ package org.pacien.tincapp.activities
20 20
21import android.content.Intent 21import android.content.Intent
22import android.os.Bundle 22import android.os.Bundle
23import android.support.annotation.LayoutRes 23import androidx.annotation.LayoutRes
24import android.support.annotation.StringRes 24import androidx.annotation.StringRes
25import android.support.design.widget.Snackbar 25import com.google.android.material.snackbar.Snackbar
26import android.support.v7.app.AlertDialog 26import androidx.appcompat.app.AlertDialog
27import android.support.v7.app.AppCompatActivity 27import androidx.appcompat.app.AppCompatActivity
28import android.view.* 28import android.view.*
29import kotlinx.android.synthetic.main.base_activity.* 29import kotlinx.android.synthetic.main.base_activity.*
30import org.pacien.tincapp.R 30import 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 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
19package org.pacien.tincapp.activities 19package org.pacien.tincapp.activities
20 20
21import android.content.Context 21import android.content.Context
22import android.support.annotation.LayoutRes 22import androidx.annotation.LayoutRes
23import android.support.v4.app.DialogFragment 23import androidx.fragment.app.DialogFragment
24import android.view.LayoutInflater 24import android.view.LayoutInflater
25import android.view.View 25import android.view.View
26import android.view.ViewGroup 26import 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 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
18 18
19package org.pacien.tincapp.activities 19package org.pacien.tincapp.activities
20 20
21import android.support.annotation.LayoutRes 21import androidx.annotation.LayoutRes
22import android.support.v4.app.Fragment 22import androidx.fragment.app.Fragment
23import android.view.LayoutInflater 23import android.view.LayoutInflater
24import android.view.View 24import android.view.View
25import android.view.ViewGroup 25import 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 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
18 18<