summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-27 23:01:24 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-27 23:01:24 +0200
commit629417eb6b9db777b0db6b36d1c8ceb4c2760f7c (patch)
treea9a74bfadd51432f8be864cfce104b1baad829db
parentcfffc9694c4b44ed26710fd85d1a361d13b0815e (diff)
parent4335ce3f60df74c130161935c88410c244f1bb71 (diff)
merge
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/xml/general_settings.xml2
-rw-r--r--src/de/blinkt/openvpn/LaunchVPN.java2
-rw-r--r--src/de/blinkt/openvpn/OpenVpnService.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 456f47dc..3a2b458e 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="30"
- android:versionName="0.5.8" >
+ android:versionCode="31"
+ android:versionName="0.5.9" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 2da80cc6..69316d18 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -12,7 +12,7 @@
android:summary="@string/owner_fix_summary"
android:title="@string/owner_fix" />
<CheckBoxPreference
- android:defaultValue="false"
+ android:defaultValue="true"
android:key="showlogwindow"
android:summary="@string/show_log_summary"
android:title="@string/show_log_window" />
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java
index 1c873f22..7c988b69 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/src/de/blinkt/openvpn/LaunchVPN.java
@@ -305,7 +305,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
askForPW(needpw);
} else {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- boolean showlogwindow = prefs.getBoolean("showlogwindow", false);
+ boolean showlogwindow = prefs.getBoolean("showlogwindow", true);
if(showlogwindow)
showLogWindow();
new startOpenVpnThread().start();
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index 765f0f53..3c836afa 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -79,7 +79,7 @@ public class OpenVpnService extends VpnService implements StateListener {
NotificationManager mNotificationManager = (NotificationManager) getSystemService(ns);
- int icon = R.drawable.icon;
+ int icon = R.drawable.ic_stat_vpn;
long when = System.currentTimeMillis();
android.app.Notification.Builder nbuilder = new Notification.Builder(this);