summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/copyright/ics_openvpn_gpl.xml4
-rw-r--r--build.gradle5
-rw-r--r--gradle/wrapper/gradle-wrapper.properties5
-rw-r--r--main/build.gradle14
-rw-r--r--main/misc/header.html5
-rw-r--r--main/src/main/AndroidManifest.xml2
-rw-r--r--main/src/main/assets/full_licenses.html2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/FileProvider.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/LaunchVPN.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/VpnProfile.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/Connection.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java22
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/X509Utils.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Utils.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/views/TabBarView.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/encoders/Base64.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/encoders/Encoder.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemObject.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemReader.java2
-rw-r--r--main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java2
-rw-r--r--main/src/main/res/anim/fab_anim.xml2
-rw-r--r--main/src/main/res/drawable/bg_rect_round.xml2
-rw-r--r--main/src/main/res/drawable/bg_switchbar.xml2
-rw-r--r--main/src/main/res/drawable/bg_tabs.xml2
-rw-r--r--main/src/main/res/drawable/oval_ripple.xml2
-rw-r--r--main/src/main/res/drawable/slidingtab_background.xml2
-rw-r--r--main/src/main/res/drawable/white_rect.xml2
-rw-r--r--main/src/main/res/layout-sw600dp-port/log_fragment.xml2
-rw-r--r--main/src/main/res/layout-sw600dp/log_fragment.xml2
-rw-r--r--main/src/main/res/layout-v21/connection_fab.xml2
-rw-r--r--main/src/main/res/layout-v21/profile_list_fabs.xml2
-rw-r--r--main/src/main/res/layout-v21/share_fab.xml2
-rw-r--r--main/src/main/res/layout-v21/tabs.xml2
-rw-r--r--main/src/main/res/layout/about.xml2
-rw-r--r--main/src/main/res/layout/allowed_application_layout.xml2
-rw-r--r--main/src/main/res/layout/allowed_vpn_apps.xml2
-rw-r--r--main/src/main/res/layout/basic_settings.xml2
-rw-r--r--main/src/main/res/layout/config_converter.xml2
-rw-r--r--main/src/main/res/layout/connection_fab.xml2
-rw-r--r--main/src/main/res/layout/connections.xml2
-rw-r--r--main/src/main/res/layout/faq.xml2
-rw-r--r--main/src/main/res/layout/faqcard.xml2
-rw-r--r--main/src/main/res/layout/file_dialog.xml2
-rw-r--r--main/src/main/res/layout/file_dialog_inline.xml2
-rw-r--r--main/src/main/res/layout/file_dialog_main.xml2
-rw-r--r--main/src/main/res/layout/file_dialog_row.xml2
-rw-r--r--main/src/main/res/layout/fragment_senddump.xml2
-rw-r--r--main/src/main/res/layout/log_fragment.xml2
-rw-r--r--main/src/main/res/layout/log_silders.xml2
-rw-r--r--main/src/main/res/layout/log_window.xml2
-rw-r--r--main/src/main/res/layout/main_activity.xml2
-rw-r--r--main/src/main/res/layout/padersliding_tab.xml2
-rw-r--r--main/src/main/res/layout/profile_list_fabs.xml2
-rw-r--r--main/src/main/res/layout/save_fab.xml2
-rw-r--r--main/src/main/res/layout/server_card.xml2
-rw-r--r--main/src/main/res/layout/settings_usereditable.xml2
-rw-r--r--main/src/main/res/layout/share_fab.xml2
-rw-r--r--main/src/main/res/layout/tabs.xml2
-rw-r--r--main/src/main/res/layout/tlsremote.xml2
-rw-r--r--main/src/main/res/layout/userpass.xml2
-rw-r--r--main/src/main/res/layout/viewconfig.xml2
-rw-r--r--main/src/main/res/layout/vpn_profile_list.xml2
-rw-r--r--main/src/main/res/layout/vpnstatus.xml2
-rw-r--r--main/src/main/res/menu/configmenu.xml2
-rw-r--r--main/src/main/res/menu/connections.xml2
-rw-r--r--main/src/main/res/menu/import_menu.xml2
-rw-r--r--main/src/main/res/menu/logmenu.xml2
-rw-r--r--main/src/main/res/menu/main_menu.xml2
-rw-r--r--main/src/main/res/menu/vpnpreferences_menu.xml2
-rw-r--r--main/src/main/res/values-sw600dp/dimens.xml2
-rw-r--r--main/src/main/res/values-sw600dp/styles.xml2
-rw-r--r--main/src/main/res/values-v21/colours.xml2
-rw-r--r--main/src/main/res/values-v21/refs.xml2
-rw-r--r--main/src/main/res/values-v21/styles.xml2
-rw-r--r--main/src/main/res/values/arrays.xml2
-rw-r--r--main/src/main/res/values/attrs.xml2
-rw-r--r--main/src/main/res/values/colours.xml2
-rw-r--r--main/src/main/res/values/dimens.xml2
-rw-r--r--main/src/main/res/values/refs.xml2
-rwxr-xr-xmain/src/main/res/values/strings.xml2
-rw-r--r--main/src/main/res/values/styles.xml2
-rw-r--r--main/src/main/res/values/untranslatable.xml2
-rw-r--r--main/src/main/res/xml/general_settings.xml2
-rw-r--r--main/src/main/res/xml/vpn_authentification.xml2
-rw-r--r--main/src/main/res/xml/vpn_ipsettings.xml2
-rw-r--r--main/src/main/res/xml/vpn_obscure.xml2
-rw-r--r--main/src/main/res/xml/vpn_routing.xml2
-rw-r--r--settings.gradle5
-rw-r--r--vpndialogxposed/src/main/AndroidManifest.xml5
-rw-r--r--vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/AllowedVPNsChooser.java5
-rw-r--r--vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/IConnectivityManager.java5
-rw-r--r--vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/VpnDialogPatcher.java5
-rw-r--r--vpndialogxposed/src/main/res/layout/vpnapplayout.xml5
-rw-r--r--vpndialogxposed/src/main/res/values/strings.xml5
149 files changed, 207 insertions, 155 deletions
diff --git a/.idea/copyright/ics_openvpn_gpl.xml b/.idea/copyright/ics_openvpn_gpl.xml
index 2980b0c4..8f50b74f 100644
--- a/.idea/copyright/ics_openvpn_gpl.xml
+++ b/.idea/copyright/ics_openvpn_gpl.xml
@@ -1,9 +1,9 @@
<component name="CopyrightManager">
<copyright>
- <option name="notice" value="Copyright (c) 2012-2015 Arne Schwabe&#10;Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
+ <option name="notice" value="Copyright (c) 2012-2016 Arne Schwabe&#10;Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
<option name="keyword" value="Copyright" />
<option name="allowReplaceKeyword" value="Copyright (c) 2012-2014 Arne Schwabe" />
<option name="myName" value="ics-openvpn-gpl" />
<option name="myLocal" value="true" />
</copyright>
-</component> \ No newline at end of file
+</component>
diff --git a/build.gradle b/build.gradle
index 399080ac..3dda6a1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
buildscript {
repositories {
jcenter()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2cec60d9..5111e520 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,8 @@
+#
+# Copyright (c) 2012-2016 Arne Schwabe
+# Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+#
+
#Tue Nov 24 09:17:10 CET 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
diff --git a/main/build.gradle b/main/build.gradle
index 545a5e83..bf229a7e 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -1,16 +1,21 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
import com.android.builder.model.ProductFlavor
apply plugin: 'com.android.application'
repositories {
- mavenCentral()
+ jcenter()
}
dependencies {
compile 'com.android.support:support-annotations:23.1.1'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
-// compile 'ch.acra:acra:4.5.0'
+ // compile 'ch.acra:acra:4.5.0'
}
android {
@@ -109,10 +114,7 @@ android {
}
-/*
- * Copyright (c) 2012-2014 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
+
// ~/.gradle/gradle.properties
if (project.hasProperty('keystoreFile') &&
diff --git a/main/misc/header.html b/main/misc/header.html
index 9fe689bf..fa63de9c 100644
--- a/main/misc/header.html
+++ b/main/misc/header.html
@@ -1,4 +1,9 @@
<!DOCTYPE html>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
<html>
<head>
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 82a9f7f6..c0d15efd 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/assets/full_licenses.html b/main/src/main/assets/full_licenses.html
index 69451669..31ad374d 100644
--- a/main/src/main/assets/full_licenses.html
+++ b/main/src/main/assets/full_licenses.html
@@ -1,5 +1,5 @@
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/java/de/blinkt/openvpn/FileProvider.java b/main/src/main/java/de/blinkt/openvpn/FileProvider.java
index 70e09302..3ea32f74 100644
--- a/main/src/main/java/de/blinkt/openvpn/FileProvider.java
+++ b/main/src/main/java/de/blinkt/openvpn/FileProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index e468019b..1a037824 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
index bc73bb26..fbd693b9 100644
--- a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index ebcf9342..fe282f33 100644
--- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
index 88d4a8c8..4f698008 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
index 24d3e68f..e7af25c7 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index b9668b29..3ba4f585 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
index 3ce78b4c..a3301399 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
index 6757cc46..db70eca9 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
index 5f41b874..e04e5f21 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
index ec6cccaa..59ba097f 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
index 2e7402ba..4f4a8318 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
index 580d8b0b..2f62026b 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index e083f21d..a3b43dc9 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
index ce4e598d..c1f5528e 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
index 96e46dc3..c9d6f2b6 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
index 94ed8a0b..07f2152f 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index 86230a52..80a15c54 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/Connection.java b/main/src/main/java/de/blinkt/openvpn/core/Connection.java
index 46ee4c36..3455450b 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/Connection.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/Connection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
index ae61adab..ccd5f7ff 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
@@ -23,7 +23,7 @@ import java.util.Objects;
import static de.blinkt.openvpn.core.OpenVPNManagement.pauseReason;
-public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountListener, OpenVPNManagement.PausedStateCallback {
+public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountListener, OpenVPNManagement.PausedStateCallback {
private final Handler mDisconnectHandler;
private int lastNetwork = -1;
private OpenVPNManagement mManagement;
@@ -59,11 +59,11 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
};
private NetworkInfo lastConnectedNetwork;
- @Override
- public boolean shouldBeRunning() {
- return shouldBeConnected();
- }
-
+ @Override
+ public boolean shouldBeRunning() {
+ return shouldBeConnected();
+ }
+
enum connectState {
SHOULDBECONNECTED,
PENDINGDISCONNECT,
@@ -128,7 +128,7 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
public DeviceStateReceiver(OpenVPNManagement magnagement) {
super();
mManagement = magnagement;
- mManagement.setPauseCallback(this);
+ mManagement.setPauseCallback(this);
mDisconnectHandler = new Handler();
}
@@ -230,7 +230,7 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
mDisconnectHandler.removeCallbacks(mDelayDisconnectRunnable);
// Reprotect the sockets just be sure
mManagement.networkChange(true);
- } else {
+ } else {
/* Different network or connection not established anymore */
if (screen == connectState.PENDINGDISCONNECT)
@@ -239,8 +239,8 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
if (shouldBeConnected()) {
mDisconnectHandler.removeCallbacks(mDelayDisconnectRunnable);
- if (pendingDisconnect || !sameNetwork)
- mManagement.networkChange(sameNetwork);
+ if (pendingDisconnect || !sameNetwork)
+ mManagement.networkChange(sameNetwork);
else
mManagement.resume();
}
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
index 0ddd01b3..f35ebb23 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java b/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java
index 440458e4..04e4e8b4 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index 19fcbda7..ea003d41 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
index ab94f3e4..c3985466 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
index 9e17c40d..2771fa6a 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 55d4f55f..b9ff8efd 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index cb5d9faa..baffaffc 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 2572f509..6f14325f 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
index a788426a..49a7eaa9 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
index e6d280ee..4f9c219b 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
index ffebdb50..fed01296 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
index 73a1c3f0..7d0f6578 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index c2085502..eea8d108 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
index 7d72e33f..0eaa36d7 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
index f233540b..d270fb2e 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java b/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
index a8befcd7..d9706f2e 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
index 5c881f77..d2be88be 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
index c99e073a..223048b9 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
index e3bcce41..f59094bf 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
index 47988847..013369b9 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
index 27fa2a83..798f432d 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index d197efd9..3c68fd87 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
index d0539bf9..ee51c776 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
index 1838eeb3..e138197a 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
index ded7b8ad..e6e161b7 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 270b4ddf..22464b3b 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
index 38e4a4e2..71ba3d8a 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java
index e0353f36..e41e6cb9 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
index 504c9984..7ce6dd1c 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
index c925494b..d3f3ae3c 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
index 02432008..71d379d4 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
index 5a5a846f..09b83bab 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
index d2a73810..07d2f52b 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index 0b161615..72c40c0e 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
index 61a698ee..01ea9a14 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
index 7c0b99c9..bcc0dc52 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java b/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
index 3847afe9..fcec1234 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
index 4863096d..347ce708 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java b/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java
index 488e22af..71f03c03 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java
+++ b/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/encoders/Base64.java b/main/src/main/java/org/spongycastle/util/encoders/Base64.java
index 0993e7be..7cfaf90b 100644
--- a/main/src/main/java/org/spongycastle/util/encoders/Base64.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Base64.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
index 4248bb8b..73e5e2af 100644
--- a/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/encoders/Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java
index 2007ac3e..a506c4f2 100644
--- a/main/src/main/java/org/spongycastle/util/encoders/Encoder.java
+++ b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
index b9474ed3..cc1b175b 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
index 6d655c87..4759e567 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
index 59186e09..a6ac39d1 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
index ddce091c..79a674ee 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
index 0b3b55c4..e599fa96 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
index 25730efd..e7eaf5e9 100644
--- a/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
+++ b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
diff --git a/main/src/main/res/anim/fab_anim.xml b/main/src/main/res/anim/fab_anim.xml
index 9bed908d..498533e0 100644
--- a/main/src/main/res/anim/fab_anim.xml
+++ b/main/src/main/res/anim/fab_anim.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/bg_rect_round.xml b/main/src/main/res/drawable/bg_rect_round.xml
index f155ad55..2c24c090 100644
--- a/main/src/main/res/drawable/bg_rect_round.xml
+++ b/main/src/main/res/drawable/bg_rect_round.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/bg_switchbar.xml b/main/src/main/res/drawable/bg_switchbar.xml
index 0d133c3e..7af57ad3 100644
--- a/main/src/main/res/drawable/bg_switchbar.xml
+++ b/main/src/main/res/drawable/bg_switchbar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/bg_tabs.xml b/main/src/main/res/drawable/bg_tabs.xml
index 6fa5f5eb..8b859535 100644
--- a/main/src/main/res/drawable/bg_tabs.xml
+++ b/main/src/main/res/drawable/bg_tabs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/oval_ripple.xml b/main/src/main/res/drawable/oval_ripple.xml
index a4f8fc9b..7d01f62d 100644
--- a/main/src/main/res/drawable/oval_ripple.xml
+++ b/main/src/main/res/drawable/oval_ripple.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/slidingtab_background.xml b/main/src/main/res/drawable/slidingtab_background.xml
index 82e1cde3..e923489e 100644
--- a/main/src/main/res/drawable/slidingtab_background.xml
+++ b/main/src/main/res/drawable/slidingtab_background.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/drawable/white_rect.xml b/main/src/main/res/drawable/white_rect.xml
index 5ead4b9b..36df6913 100644
--- a/main/src/main/res/drawable/white_rect.xml
+++ b/main/src/main/res/drawable/white_rect.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-sw600dp-port/log_fragment.xml b/main/src/main/res/layout-sw600dp-port/log_fragment.xml
index 1fb9fa54..7a4b60fe 100644
--- a/main/src/main/res/layout-sw600dp-port/log_fragment.xml
+++ b/main/src/main/res/layout-sw600dp-port/log_fragment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-sw600dp/log_fragment.xml b/main/src/main/res/layout-sw600dp/log_fragment.xml
index 0bd3f991..26f63df4 100644
--- a/main/src/main/res/layout-sw600dp/log_fragment.xml
+++ b/main/src/main/res/layout-sw600dp/log_fragment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-v21/connection_fab.xml b/main/src/main/res/layout-v21/connection_fab.xml
index 8910dc8d..ea3964d9 100644
--- a/main/src/main/res/layout-v21/connection_fab.xml
+++ b/main/src/main/res/layout-v21/connection_fab.xml
@@ -2,7 +2,7 @@
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-v21/profile_list_fabs.xml b/main/src/main/res/layout-v21/profile_list_fabs.xml
index 28d393f0..4fe403b6 100644
--- a/main/src/main/res/layout-v21/profile_list_fabs.xml
+++ b/main/src/main/res/layout-v21/profile_list_fabs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-v21/share_fab.xml b/main/src/main/res/layout-v21/share_fab.xml
index d98532d6..04049fe7 100644
--- a/main/src/main/res/layout-v21/share_fab.xml
+++ b/main/src/main/res/layout-v21/share_fab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout-v21/tabs.xml b/main/src/main/res/layout-v21/tabs.xml
index 147b0bc2..af349a4f 100644
--- a/main/src/main/res/layout-v21/tabs.xml
+++ b/main/src/main/res/layout-v21/tabs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<merge xmlns:blinkt="http://schemas.android.com/apk/res-auto">
diff --git a/main/src/main/res/layout/about.xml b/main/src/main/res/layout/about.xml
index 6c115471..fbfcadfc 100644
--- a/main/src/main/res/layout/about.xml
+++ b/main/src/main/res/layout/about.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/allowed_application_layout.xml b/main/src/main/res/layout/allowed_application_layout.xml
index 402c3162..d8d846f9 100644
--- a/main/src/main/res/layout/allowed_application_layout.xml
+++ b/main/src/main/res/layout/allowed_application_layout.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/allowed_vpn_apps.xml b/main/src/main/res/layout/allowed_vpn_apps.xml
index 463e0d03..0883f4b8 100644
--- a/main/src/main/res/layout/allowed_vpn_apps.xml
+++ b/main/src/main/res/layout/allowed_vpn_apps.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/basic_settings.xml b/main/src/main/res/layout/basic_settings.xml
index 60d6957c..8a4d290f 100644
--- a/main/src/main/res/layout/basic_settings.xml
+++ b/main/src/main/res/layout/basic_settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/config_converter.xml b/main/src/main/res/layout/config_converter.xml
index 739dbf72..b9bc1ecc 100644
--- a/main/src/main/res/layout/config_converter.xml
+++ b/main/src/main/res/layout/config_converter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/main/src/main/res/layout/connection_fab.xml b/main/src/main/res/layout/connection_fab.xml
index e3cae9ab..681348e5 100644
--- a/main/src/main/res/layout/connection_fab.xml
+++ b/main/src/main/res/layout/connection_fab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/connections.xml b/main/src/main/res/layout/connections.xml
index 7559bdc0..598ddd92 100644
--- a/main/src/main/res/layout/connections.xml
+++ b/main/src/main/res/layout/connections.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/faq.xml b/main/src/main/res/layout/faq.xml
index 5cda611a..aa3febd0 100644
--- a/main/src/main/res/layout/faq.xml
+++ b/main/src/main/res/layout/faq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/faqcard.xml b/main/src/main/res/layout/faqcard.xml
index f00f2610..360f3752 100644
--- a/main/src/main/res/layout/faqcard.xml
+++ b/main/src/main/res/layout/faqcard.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/file_dialog.xml b/main/src/main/res/layout/file_dialog.xml
index fba2ba53..b068015e 100644
--- a/main/src/main/res/layout/file_dialog.xml
+++ b/main/src/main/res/layout/file_dialog.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/file_dialog_inline.xml b/main/src/main/res/layout/file_dialog_inline.xml
index 397b20e8..6448733e 100644
--- a/main/src/main/res/layout/file_dialog_inline.xml
+++ b/main/src/main/res/layout/file_dialog_inline.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/file_dialog_main.xml b/main/src/main/res/layout/file_dialog_main.xml
index ec641d79..8df879f0 100644
--- a/main/src/main/res/layout/file_dialog_main.xml
+++ b/main/src/main/res/layout/file_dialog_main.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/file_dialog_row.xml b/main/src/main/res/layout/file_dialog_row.xml
index bca67776..e2c1e0de 100644
--- a/main/src/main/res/layout/file_dialog_row.xml
+++ b/main/src/main/res/layout/file_dialog_row.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/fragment_senddump.xml b/main/src/main/res/layout/fragment_senddump.xml
index ff138e1d..02ebed33 100644
--- a/main/src/main/res/layout/fragment_senddump.xml
+++ b/main/src/main/res/layout/fragment_senddump.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/log_fragment.xml b/main/src/main/res/layout/log_fragment.xml
index 491882a9..ab070117 100644
--- a/main/src/main/res/layout/log_fragment.xml
+++ b/main/src/main/res/layout/log_fragment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/log_silders.xml b/main/src/main/res/layout/log_silders.xml
index 16e1b7ea..4196e243 100644
--- a/main/src/main/res/layout/log_silders.xml
+++ b/main/src/main/res/layout/log_silders.xml
@@ -2,7 +2,7 @@
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/log_window.xml b/main/src/main/res/layout/log_window.xml
index fcc7aa7a..7c25dcfa 100644
--- a/main/src/main/res/layout/log_window.xml
+++ b/main/src/main/res/layout/log_window.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/main_activity.xml b/main/src/main/res/layout/main_activity.xml
index 6ce41da5..456205e2 100644
--- a/main/src/main/res/layout/main_activity.xml
+++ b/main/src/main/res/layout/main_activity.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/padersliding_tab.xml b/main/src/main/res/layout/padersliding_tab.xml
index 995047d6..07c8daa9 100644
--- a/main/src/main/res/layout/padersliding_tab.xml
+++ b/main/src/main/res/layout/padersliding_tab.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/profile_list_fabs.xml b/main/src/main/res/layout/profile_list_fabs.xml
index 2ed79610..34beb58a 100644
--- a/main/src/main/res/layout/profile_list_fabs.xml
+++ b/main/src/main/res/layout/profile_list_fabs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/save_fab.xml b/main/src/main/res/layout/save_fab.xml
index e3cae9ab..681348e5 100644
--- a/main/src/main/res/layout/save_fab.xml
+++ b/main/src/main/res/layout/save_fab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/server_card.xml b/main/src/main/res/layout/server_card.xml
index e3ebdf98..eaedcf58 100644
--- a/main/src/main/res/layout/server_card.xml
+++ b/main/src/main/res/layout/server_card.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/settings_usereditable.xml b/main/src/main/res/layout/settings_usereditable.xml
index 5a330df2..cc7f1ff5 100644
--- a/main/src/main/res/layout/settings_usereditable.xml
+++ b/main/src/main/res/layout/settings_usereditable.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/share_fab.xml b/main/src/main/res/layout/share_fab.xml
index 42824279..ad5f1b96 100644
--- a/main/src/main/res/layout/share_fab.xml
+++ b/main/src/main/res/layout/share_fab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/tabs.xml b/main/src/main/res/layout/tabs.xml
index 0109d59e..a68c4e42 100644
--- a/main/src/main/res/layout/tabs.xml
+++ b/main/src/main/res/layout/tabs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<merge>
diff --git a/main/src/main/res/layout/tlsremote.xml b/main/src/main/res/layout/tlsremote.xml
index 91a72327..5ebeb051 100644
--- a/main/src/main/res/layout/tlsremote.xml
+++ b/main/src/main/res/layout/tlsremote.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/userpass.xml b/main/src/main/res/layout/userpass.xml
index 85a1e971..32d2e7b1 100644
--- a/main/src/main/res/layout/userpass.xml
+++ b/main/src/main/res/layout/userpass.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/layout/viewconfig.xml b/main/src/main/res/layout/viewconfig.xml
index b73df5e5..4855b06d 100644
--- a/main/src/main/res/layout/viewconfig.xml
+++ b/main/src/main/res/layout/viewconfig.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<RelativeLayout
diff --git a/main/src/main/res/layout/vpn_profile_list.xml b/main/src/main/res/layout/vpn_profile_list.xml
index b93b62ea..f85222b6 100644
--- a/main/src/main/res/layout/vpn_profile_list.xml
+++ b/main/src/main/res/layout/vpn_profile_list.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/main/src/main/res/layout/vpnstatus.xml b/main/src/main/res/layout/vpnstatus.xml
index 2d77bbab..b304ad10 100644
--- a/main/src/main/res/layout/vpnstatus.xml
+++ b/main/src/main/res/layout/vpnstatus.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/configmenu.xml b/main/src/main/res/menu/configmenu.xml
index 63c898d0..7487bdb5 100644
--- a/main/src/main/res/menu/configmenu.xml
+++ b/main/src/main/res/menu/configmenu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/connections.xml b/main/src/main/res/menu/connections.xml
index c1874227..ad516885 100644
--- a/main/src/main/res/menu/connections.xml
+++ b/main/src/main/res/menu/connections.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/import_menu.xml b/main/src/main/res/menu/import_menu.xml
index 2973e460..a0e7b820 100644
--- a/main/src/main/res/menu/import_menu.xml
+++ b/main/src/main/res/menu/import_menu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml
index b8c493bc..1c94d97c 100644
--- a/main/src/main/res/menu/logmenu.xml
+++ b/main/src/main/res/menu/logmenu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/main_menu.xml b/main/src/main/res/menu/main_menu.xml
index ed633724..6d4f7703 100644
--- a/main/src/main/res/menu/main_menu.xml
+++ b/main/src/main/res/menu/main_menu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/menu/vpnpreferences_menu.xml b/main/src/main/res/menu/vpnpreferences_menu.xml
index d8fe2a49..98b8636b 100644
--- a/main/src/main/res/menu/vpnpreferences_menu.xml
+++ b/main/src/main/res/menu/vpnpreferences_menu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values-sw600dp/dimens.xml b/main/src/main/res/values-sw600dp/dimens.xml
index 94a120d1..100861fc 100644
--- a/main/src/main/res/values-sw600dp/dimens.xml
+++ b/main/src/main/res/values-sw600dp/dimens.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values-sw600dp/styles.xml b/main/src/main/res/values-sw600dp/styles.xml
index c320388d..387b2a81 100644
--- a/main/src/main/res/values-sw600dp/styles.xml
+++ b/main/src/main/res/values-sw600dp/styles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values-v21/colours.xml b/main/src/main/res/values-v21/colours.xml
index 1fedf7b9..024e47eb 100644
--- a/main/src/main/res/values-v21/colours.xml
+++ b/main/src/main/res/values-v21/colours.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml
index 94db373d..a5329a5d 100644
--- a/main/src/main/res/values-v21/refs.xml
+++ b/main/src/main/res/values-v21/refs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values-v21/styles.xml b/main/src/main/res/values-v21/styles.xml
index 4379dd6d..e0549164 100644
--- a/main/src/main/res/values-v21/styles.xml
+++ b/main/src/main/res/values-v21/styles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/arrays.xml b/main/src/main/res/values/arrays.xml
index 695c5697..cf02d1b8 100644
--- a/main/src/main/res/values/arrays.xml
+++ b/main/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/attrs.xml b/main/src/main/res/values/attrs.xml
index 7d1ba357..502a691b 100644
--- a/main/src/main/res/values/attrs.xml
+++ b/main/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/colours.xml b/main/src/main/res/values/colours.xml
index f27167f3..d06bc233 100644
--- a/main/src/main/res/values/colours.xml
+++ b/main/src/main/res/values/colours.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/dimens.xml b/main/src/main/res/values/dimens.xml
index 727f5a78..f8fafecd 100644
--- a/main/src/main/res/values/dimens.xml
+++ b/main/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml
index 487e689c..3567bcbe 100644
--- a/main/src/main/res/values/refs.xml
+++ b/main/src/main/res/values/refs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 1d608c4d..1ad2fe87 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<resources>
diff --git a/main/src/main/res/values/styles.xml b/main/src/main/res/values/styles.xml
index 94970c88..5f8bea41 100644
--- a/main/src/main/res/values/styles.xml
+++ b/main/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/values/untranslatable.xml b/main/src/main/res/values/untranslatable.xml
index 629514a0..2d106b5d 100644
--- a/main/src/main/res/values/untranslatable.xml
+++ b/main/src/main/res/values/untranslatable.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/xml/general_settings.xml b/main/src/main/res/xml/general_settings.xml
index 25a3a8ed..1e18b19c 100644
--- a/main/src/main/res/xml/general_settings.xml
+++ b/main/src/main/res/xml/general_settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/xml/vpn_authentification.xml b/main/src/main/res/xml/vpn_authentification.xml
index d2f6ad25..8bfebccb 100644
--- a/main/src/main/res/xml/vpn_authentification.xml
+++ b/main/src/main/res/xml/vpn_authentification.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/xml/vpn_ipsettings.xml b/main/src/main/res/xml/vpn_ipsettings.xml
index 25a6de46..5df7ffa8 100644
--- a/main/src/main/res/xml/vpn_ipsettings.xml
+++ b/main/src/main/res/xml/vpn_ipsettings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/xml/vpn_obscure.xml b/main/src/main/res/xml/vpn_obscure.xml
index 9da853a4..65a81c00 100644
--- a/main/src/main/res/xml/vpn_obscure.xml
+++ b/main/src/main/res/xml/vpn_obscure.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/main/src/main/res/xml/vpn_routing.xml b/main/src/main/res/xml/vpn_routing.xml
index 2c89b32f..1857ba83 100644
--- a/main/src/main/res/xml/vpn_routing.xml
+++ b/main/src/main/res/xml/vpn_routing.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/settings.gradle b/settings.gradle
index 98ca4d1f..937181ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
include ':main'
include ':vpndialogxposed'
include ':remoteExample'
diff --git a/vpndialogxposed/src/main/AndroidManifest.xml b/vpndialogxposed/src/main/AndroidManifest.xml
index bff95c63..a3363a71 100644
--- a/vpndialogxposed/src/main/AndroidManifest.xml
+++ b/vpndialogxposed/src/main/AndroidManifest.xml
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.vpndialogxposed" >
diff --git a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/AllowedVPNsChooser.java b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/AllowedVPNsChooser.java
index 0e7dc326..53777d1d 100644
--- a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/AllowedVPNsChooser.java
+++ b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/AllowedVPNsChooser.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
package de.blinkt.vpndialogxposed;
import android.Manifest;
diff --git a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/IConnectivityManager.java b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/IConnectivityManager.java
index 9b26283e..a8a02347 100644
--- a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/IConnectivityManager.java
+++ b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/IConnectivityManager.java
@@ -1,4 +1,9 @@
/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
+/*
* This file is auto-generated. DO NOT MODIFY.
* Original file: /Users/arne/software/icsopenvpn/vpndialogxposed/src/main/aidl/android/net/IConnectivityManager.aidl
*/
diff --git a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/VpnDialogPatcher.java b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/VpnDialogPatcher.java
index 9cf22d0c..f517c2f9 100644
--- a/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/VpnDialogPatcher.java
+++ b/vpndialogxposed/src/main/java/de/blinkt/vpndialogxposed/VpnDialogPatcher.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
package de.blinkt.vpndialogxposed;
import android.app.Activity;
diff --git a/vpndialogxposed/src/main/res/layout/vpnapplayout.xml b/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
index af2a824e..67ae7a12 100644
--- a/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
+++ b/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
diff --git a/vpndialogxposed/src/main/res/values/strings.xml b/vpndialogxposed/src/main/res/values/strings.xml
index 6eace130..ded7e609 100644
--- a/vpndialogxposed/src/main/res/values/strings.xml
+++ b/vpndialogxposed/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
<resources>
<string name="app_name">VpnDialog Xposed Module</string>