Update copyrights

21 files changed, 84 insertions, 14 deletions

diff --git a/.idea/copyright/ics_openvpn_gpl.xml b/.idea/copyright/ics_openvpn_gpl.xml
index 8f50b74f..e78f61d3 100644
--- a/.idea/copyright/ics_openvpn_gpl.xml
+++ b/.idea/copyright/ics_openvpn_gpl.xml
@@ -1,9 +1,7 @@
 <component name="CopyrightManager">
   <copyright>
-    <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="allowReplaceRegexp" value="Copyright \(c\) 2012\-2016Arne Schwabe" />
     <option name="myName" value="ics-openvpn-gpl" />
-    <option name="myLocal" value="true" />
+    <option name="notice" value="Copyright (c) 2012-&amp;#36;{today.year} Arne Schwabe&#10;Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
   </copyright>
-</component>
+</component>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8ba17670..65d83328 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 54ba7d0a..b217b6d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,8 @@
+#
+# Copyright (c) 2012-2017 Arne Schwabe
+# Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+#
+
 #Wed Apr 05 16:08:37 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
index 29f4ddaa..d025b2d4 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java
@@ -17,14 +17,10 @@ import android.os.RemoteException;
 import android.support.annotation.Nullable;
 import android.util.Pair;
 
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 
-import de.blinkt.openvpn.api.ExternalOpenVPNService;
-import de.blinkt.openvpn.api.IOpenVPNStatusCallback;
-
 /**
  * Created by arne on 08.11.16.
  */
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 3360ddc4..2dfcf8c5 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -333,7 +333,6 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 

     private void handleHold(String argument) {

         int waittime = Integer.parseInt(argument.split(":")[1]);

-        waittime=15;

         if (shouldBeRunning()) {

             if (waittime > 1)

                 VpnStatus.updateStateString("CONNECTRETRY", String.valueOf(waittime),

diff --git a/main/src/main/java/de/blinkt/openvpn/core/Preferences.java b/main/src/main/java/de/blinkt/openvpn/core/Preferences.java
index 16da955f..76a064ff 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/Preferences.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/Preferences.java
@@ -7,9 +7,6 @@ package de.blinkt.openvpn.core;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import de.blinkt.openvpn.LaunchVPN;
 
 /**
  * Created by arne on 08.01.17.
diff --git a/main/src/main/res/drawable/ic_shortcut_cancel.xml b/main/src/main/res/drawable/ic_shortcut_cancel.xml
index 21778ead..bf7daf58 100644
--- a/main/src/main/res/drawable/ic_shortcut_cancel.xml
+++ b/main/src/main/res/drawable/ic_shortcut_cancel.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="48dp"
         android:height="48dp"
diff --git a/main/src/main/res/drawable/ic_shortcut_vpn_key.xml b/main/src/main/res/drawable/ic_shortcut_vpn_key.xml
index 1e32bac2..780c1316 100644
--- a/main/src/main/res/drawable/ic_shortcut_vpn_key.xml
+++ b/main/src/main/res/drawable/ic_shortcut_vpn_key.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="48dp"
         android:height="48dp"
diff --git a/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java b/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
index c35df598..b32e5efa 100644
--- a/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
+++ b/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2017 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
 package de.blinkt.openvpn.core;
 
 import android.annotation.SuppressLint;
diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle
index c305f843..1963254e 100644
--- a/remoteExample/build.gradle
+++ b/remoteExample/build.gradle
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2017 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
 apply plugin: 'com.android.application'
 
 android {
diff --git a/remoteExample/src/main/AndroidManifest.xml b/remoteExample/src/main/AndroidManifest.xml
index abd7b621..1278df95 100644
--- a/remoteExample/src/main/AndroidManifest.xml
+++ b/remoteExample/src/main/AndroidManifest.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2017 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.openvpn.remote" >
 
diff --git a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java
index 900383a2..41b54e17 100644
--- a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java
+++ b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainActivity.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2017 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
 package de.blinkt.openvpn.remote;
 
 import android.app.Activity;
diff --git a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
index a6d2baf5..6eb85e9b 100644
--- a/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
+++ b/remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2017 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
 package de.blinkt.openvpn.remote;
 
 import android.app.Activity;
diff --git a/remoteExample/src/main/res/layout/activity_main.xml b/remoteExample/src/main/res/layout/activity_main.xml
index 42dd4dfb..17585e2b 100644
--- a/remoteExample/src/main/res/layout/activity_main.xml
+++ b/remoteExample/src/main/res/layout/activity_main.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
diff --git a/remoteExample/src/main/res/layout/fragment_main.xml b/remoteExample/src/main/res/layout/fragment_main.xml
index 9279bd69..eda36740 100644
--- a/remoteExample/src/main/res/layout/fragment_main.xml
+++ b/remoteExample/src/main/res/layout/fragment_main.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/remoteExample/src/main/res/menu/main.xml b/remoteExample/src/main/res/menu/main.xml
index f732c1b4..2aec1f7d 100644
--- a/remoteExample/src/main/res/menu/main.xml
+++ b/remoteExample/src/main/res/menu/main.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="de.blinkt.openvpn.remote.MainActivity" >
diff --git a/remoteExample/src/main/res/values-w820dp/dimens.xml b/remoteExample/src/main/res/values-w820dp/dimens.xml
index 63fc8164..1adf4310 100644
--- a/remoteExample/src/main/res/values-w820dp/dimens.xml
+++ b/remoteExample/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <resources>
     <!-- Example customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
diff --git a/remoteExample/src/main/res/values/dimens.xml b/remoteExample/src/main/res/values/dimens.xml
index a0171a70..629fa2ea 100644
--- a/remoteExample/src/main/res/values/dimens.xml
+++ b/remoteExample/src/main/res/values/dimens.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
diff --git a/remoteExample/src/main/res/values/strings.xml b/remoteExample/src/main/res/values/strings.xml
index 49d4978d..30e05648 100644
--- a/remoteExample/src/main/res/values/strings.xml
+++ b/remoteExample/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2017 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">OpenVPN Remote</string>
diff --git a/remoteExample/src/main/res/values/styles.xml b/remoteExample/src/main/res/values/styles.xml
index ff6c9d2c..746cf3dd 100644
--- a/remoteExample/src/main/res/values/styles.xml
+++ b/remoteExample/src/main/res/values/styles.xml
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2012-2017 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
 <resources>
 
     <!-- Base application theme. -->
diff --git a/vpndialogxposed/build.gradle b/vpndialogxposed/build.gradle
index 15874110..252c26b4 100644
--- a/vpndialogxposed/build.gradle
+++ b/vpndialogxposed/build.gradle
@@ -38,6 +38,11 @@ android {
 
 
 
+/*
+ * Copyright (c) 2012-2017 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') &&
         project.hasProperty('keystorePassword') &&