aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--app/.gitignore2
-rw-r--r--app/CMakeLists.txt2
-rw-r--r--app/build.gradle2
-rw-r--r--app/lint.xml2
-rw-r--r--app/proguard-rules.pro2
-rw-r--r--app/src/main/AndroidManifest.xml6
-rw-r--r--app/src/main/c/exec.c2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Command.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Executor.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Tinc.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/TincApp.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Tincd.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/App.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppInfo.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppLogger.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/AppPaths.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/CrashRecorder.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/Android.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/ApacheConfiguration.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/Java.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/intent/Actions.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/intent/BroadcastMapper.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/utils/PemUtils.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/utils/ProgressModal.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/utils/TincKeyring.kt2
-rw-r--r--app/src/main/res/drawable/horizontal_line.xml2
-rw-r--r--app/src/main/res/layout/base.xml2
-rw-r--r--app/src/main/res/layout/common_progress_dialog.xml2
-rw-r--r--app/src/main/res/layout/dialog_decrypt_keys.xml2
-rw-r--r--app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml2
-rw-r--r--app/src/main/res/layout/dialog_network_generate.xml2
-rw-r--r--app/src/main/res/layout/dialog_network_join.xml2
-rw-r--r--app/src/main/res/layout/dialog_node_details.xml2
-rw-r--r--app/src/main/res/layout/fragment_list_item.xml2
-rw-r--r--app/src/main/res/layout/fragment_list_view.xml2
-rw-r--r--app/src/main/res/layout/fragment_network_list_header.xml2
-rw-r--r--app/src/main/res/layout/fragment_network_status_header.xml2
-rw-r--r--app/src/main/res/layout/page_configure.xml2
-rw-r--r--app/src/main/res/layout/page_viewlog.xml2
-rw-r--r--app/src/main/res/menu/menu_base.xml2
-rw-r--r--app/src/main/res/menu/menu_start.xml2
-rw-r--r--app/src/main/res/menu/menu_status.xml2
-rw-r--r--app/src/main/res/menu/menu_viewlog.xml2
-rw-r--r--app/src/main/res/raw/network.conf2
-rw-r--r--app/src/main/res/values-ja/strings.xml2
-rw-r--r--app/src/main/res/values-nb-rNO/strings.xml2
-rw-r--r--app/src/main/res/values-w600dp/dimens.xml2
-rw-r--r--app/src/main/res/values-w960dp/dimens.xml2
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml2
-rw-r--r--app/src/main/res/values-zh-rHK/strings.xml2
-rw-r--r--app/src/main/res/values-zh-rTW/strings.xml2
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/dimens.xml2
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/values/styles.xml2
-rw-r--r--build.gradle2
-rw-r--r--gradle.properties2
-rw-r--r--readme.md4
-rw-r--r--settings.gradle2
71 files changed, 74 insertions, 74 deletions
diff --git a/.gitignore b/.gitignore
index d7da40b..f279dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
1# tinc app, an Android binding and user interface for the tinc mesh VPN daemon 1# Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD 2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD
3# 3#
4# This program is free software: you can redistribute it and/or modify 4# This program is free software: you can redistribute it and/or modify
diff --git a/app/.gitignore b/app/.gitignore
index 1a06cfd..7ca87f0 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,4 +1,4 @@
1# tinc app, an Android binding and user interface for the tinc mesh VPN daemon 1# Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD 2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD
3# 3#
4# This program is free software: you can redistribute it and/or modify 4# This program is free software: you can redistribute it and/or modify
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 9ed98a9..25cc810 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,4 +1,4 @@
1# tinc app, an Android binding and user interface for the tinc mesh VPN daemon 1# Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD 2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD
3# 3#
4# This program is free software: you can redistribute it and/or modify 4# This program is free software: you can redistribute it and/or modify
diff --git a/app/build.gradle b/app/build.gradle
index bfe3944..08c6444 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
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-2018 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
diff --git a/app/lint.xml b/app/lint.xml
index d8deb7e..1bf837f 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2 2
3<!-- 3<!--
4 * tinc app, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 666e9ab..53380f1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,4 +1,4 @@
1# tinc app, an Android binding and user interface for the tinc mesh VPN daemon 1# Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD 2# Copyright (C) 2017-2018 Pacien TRAN-GIRARD
3# 3#
4# This program is free software: you can redistribute it and/or modify 4# This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d96fba6..517097e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2 2
3<!-- 3<!--
4 * tinc app, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
28 android:name="org.pacien.tincapp.context.App" 28 android:name="org.pacien.tincapp.context.App"
29 android:allowBackup="false" 29 android:allowBackup="false"
30 android:icon="@mipmap/ic_launcher" 30 android:icon="@mipmap/ic_launcher"
31 android:label="@string/app_label" 31 android:label="@string/app_name"
32 android:supportsRtl="true" 32 android:supportsRtl="true"
33 android:theme="@style/AppTheme" 33 android:theme="@style/AppTheme"
34 tools:ignore="GoogleAppIndexingWarning"> 34 tools:ignore="GoogleAppIndexingWarning">
@@ -36,7 +36,7 @@
36 <activity 36 <activity
37 android:name=".activities.StartActivity" 37 android:name=".activities.StartActivity"
38 android:configChanges="orientation|screenSize" 38 android:configChanges="orientation|screenSize"
39 android:label="@string/app_label"> 39 android:label="@string/app_name">
40 <intent-filter> 40 <intent-filter>
41 <action android:name="android.intent.action.MAIN"/> 41 <action android:name="android.intent.action.MAIN"/>
42 <category android:name="android.intent.category.LAUNCHER"/> 42 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/app/src/main/c/exec.c b/app/src/main/c/exec.c
index 5e92b11..c335b20 100644
--- a/app/src/main/c/exec.c
+++ b/app/src/main/c/exec.c
@@ -1,5 +1,5 @@
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