summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-08-13 12:59:17 +0200
committerArne Schwabe <arne@rfc2549.org>2014-08-13 12:59:17 +0200
commita3fd5dfdb90a8791ba4fc51f90d512c48c3d9df2 (patch)
treec09d72f44debec3efaddcd87b2262f753c047078 /main/src
parentf228daf2285886ac3981f48228e2728af37af4bb (diff)
Fix compiling
--HG-- rename : main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java => main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java extra : rebase_source : 3ed07d308e89b0e3941bba8902a01579ac69d9c1
Diffstat (limited to 'main/src')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java (renamed from main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java)2
2 files changed, 3 insertions, 1 deletions
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 22eec3bd..cac9469e 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
@@ -1,9 +1,11 @@
package de.blinkt.openvpn.core;
import android.app.Application;
+/*
import org.acra.ACRA;
import org.acra.ReportingInteractionMode;
import org.acra.annotation.ReportsCrashes;
+*/
import de.blinkt.openvpn.BuildConfig;
import de.blinkt.openvpn.R;
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 c55d5b0d..1e671e22 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -71,7 +71,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
private OpenVPNManagement mManagement;
private String mLastTunCfg;
private String mRemoteGW;
- private Object mProcessLock = new Object();
+ private final Object mProcessLock = new Object();
// From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
public static String humanReadableByteCount(long bytes, boolean mbit) {