aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-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
27 files changed, 78 insertions, 78 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 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
19package org.pacien.tincapp.activities.common 19package org.pacien.tincapp.activities.common
20 20
21import android.support.v4.app.FragmentManager 21import androidx.fragment.app.FragmentManager
22import android.support.v4.app.FragmentPagerAdapter 22import androidx.fragment.app.FragmentPagerAdapter
23import org.pacien.tincapp.activities.BaseFragment 23import org.pacien.tincapp.activities.BaseFragment
24import org.pacien.tincapp.context.App 24import org.pacien.tincapp.context.App
25 25
diff --git a/app/src/main/java/org/pacien/tincapp/activities/common/ProgressModal.kt b/app/src/main/java/org/pacien/tincapp/activities/common/ProgressModal.kt
index d4310a1..284f4de 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/common/ProgressModal.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/common/ProgressModal.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,7 +20,7 @@ package org.pacien.tincapp.activities.common
20 20
21import android.annotation.SuppressLint 21import android.annotation.SuppressLint
22import android.app.Activity 22import android.app.Activity
23import android.support.v7.app.AlertDialog 23import androidx.appcompat.app.AlertDialog
24import android.view.LayoutInflater 24import android.view.LayoutInflater
25import android.view.View 25import android.view.View
26import android.widget.TextView 26import android.widget.TextView
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 2bdbcca..d85768c 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
@@ -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,7 +18,7 @@
18 18
19package org.pacien.tincapp.activities.common 19package org.pacien.tincapp.activities.common
20 20
21import android.support.v7.app.AlertDialog 21import androidx.appcompat.app.AlertDialog
22import org.apache.commons.io.input.ReversedLinesFileReader 22import org.apache.commons.io.input.ReversedLinesFileReader
23import org.pacien.tincapp.R