From d3812892c894887ee8191ae84cc3a9f3d2e3fe88 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 10 May 2017 11:20:51 +0200 Subject: Update copyrights --- main/src/main/java/de/blinkt/openvpn/core/OpenVPNStatusService.java | 4 ---- .../main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 1 - main/src/main/java/de/blinkt/openvpn/core/Preferences.java | 3 --- main/src/main/res/drawable/ic_shortcut_cancel.xml | 5 +++++ main/src/main/res/drawable/ic_shortcut_vpn_key.xml | 5 +++++ main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java | 5 +++++ 6 files changed, 15 insertions(+), 8 deletions(-) (limited to 'main') 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 @@ + + +