summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@blinkt.de>2012-08-20 22:21:34 +0200
committerArne Schwabe <arne@blinkt.de>2012-08-20 22:21:34 +0200
commitbd5fa709e2ed9c49c8d643ac85407050a906fa2f (patch)
tree19f0021d1e7c3a191286a77c2dd6317ec5cef603
parentb262ae76e2efd519046cf1d1d5ada26170bb11b0 (diff)
Version 0.5.20v0.5.20
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/de/blinkt/openvpn/OpenVpnService.java2
3 files changed, 3 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64881dd4..142a5130 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.openvpn"
- android:versionCode="46"
- android:versionName="0.5.19" >
+ android:versionCode="47"
+ android:versionName="0.5.20" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29b7069d..6d1042a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -217,7 +217,7 @@
<string name="keepstatus">Show Traffic Statistics</string>
<string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
<string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
- <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialog are for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
+ <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialogs for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
<string name="faq_system_dialogs_title">Connection warning and notification sound</string>
<string name="translationby"></string>
<!--
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index bac9ca95..41d5b1ee 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -89,8 +89,6 @@ public class OpenVpnService extends VpnService implements StateListener {
int icon = R.drawable.ic_stat_vpn;
- long when = System.currentTimeMillis();
-
android.app.Notification.Builder nbuilder = new Notification.Builder(this);
nbuilder.setContentTitle("OpenVPN - " + mProfile.mName);