summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-11-01 15:03:52 +0100
committerArne Schwabe <arne@rfc2549.org>2013-11-01 15:03:52 +0100
commitb7bf2292b091129404aea585693298692895f003 (patch)
tree0f648333e1b011e491073ab62d2e2e8a48f4160e
parent1a49c83ad2fd3c98149e15c5605a2916069674ed (diff)
Welcome Android 4.4
-rw-r--r--AndroidManifest.xml2
-rw-r--r--build.gradle11
-rw-r--r--icsopenvpn.iml2
-rw-r--r--project.properties2
-rw-r--r--src/de/blinkt/openvpn/VPNPreferences.java10
5 files changed, 20 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c4177a6..7e609c51 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,7 +14,7 @@
<uses-sdk
android:minSdkVersion="14"
- android:targetSdkVersion="18" />
+ android:targetSdkVersion="19" />
<!-- Copy the <permission> block to your app when using the REMOTE API. Otherwise OpenVPN for
Android needs to be installed first -->
diff --git a/build.gradle b/build.gradle
index 36de4409..830ac129 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,12 +18,12 @@ dependencies {
}
android {
- compileSdkVersion 18
- buildToolsVersion "18.1.1"
+ compileSdkVersion 19
+ buildToolsVersion "19"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 18
+ targetSdkVersion 19
versionCode = 80
versionName = "0.5.47"
}
@@ -51,6 +51,11 @@ android {
}
+ /*
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }*/
signingConfigs {
release
diff --git a/icsopenvpn.iml b/icsopenvpn.iml
index 21dfc067..a17c66df 100644
--- a/icsopenvpn.iml
+++ b/icsopenvpn.iml
@@ -67,7 +67,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
- <orderEntry type="jdk" jdkName="Android 4.3 Platform" jdkType="Android SDK" />
+ <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="annotations-12.0" level="project" />
</component>
diff --git a/project.properties b/project.properties
index 73fc6610..a5578ba0 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-18
+target=android-19
diff --git a/src/de/blinkt/openvpn/VPNPreferences.java b/src/de/blinkt/openvpn/VPNPreferences.java
index 700734f1..446a4ca7 100644
--- a/src/de/blinkt/openvpn/VPNPreferences.java
+++ b/src/de/blinkt/openvpn/VPNPreferences.java
@@ -2,9 +2,11 @@ package de.blinkt.openvpn;
import java.util.List;
+import android.annotation.TargetApi;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.Menu;
@@ -23,7 +25,13 @@ public class VPNPreferences extends PreferenceActivity {
}
- @Override
+ @TargetApi(Build.VERSION_CODES.KITKAT)
+ @Override
+ protected boolean isValidFragment(String fragmentName) {
+ return true;
+ }
+
+ @Override
protected void onStop() {
super.onStop();
}