diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf3f1e7b3..5ed5d7a81 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,7 +9,7 @@
+ android:targetSdkVersion="19" />
diff --git a/build.gradle b/build.gradle
index 20166fa52..22774c68e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ dependencies {
new URL('http://www.aocate.com/presto/client/presto_client-0.8.5.jar').withInputStream{ i -> prestoLib.withOutputStream{ it << i }}
}
- compile 'com.android.support:appcompat-v7:18.0.+'
+ compile 'com.android.support:appcompat-v7:19.0.+'
compile 'org.apache.commons:commons-lang3:3.1'
compile ('org.shredzone.flattr4j:flattr4j-core:2.7') {
exclude group: 'org.apache.httpcomponents', module: 'httpcore'
@@ -37,12 +37,12 @@ dependencies {
}
android {
- compileSdkVersion 18
- buildToolsVersion "18.1.0"
+ compileSdkVersion 19
+ buildToolsVersion "19.0.0"
defaultConfig {
minSdkVersion 10
- targetSdkVersion 18
+ targetSdkVersion 19
testPackageName "de.test.antennapod"
testInstrumentationRunner "instrumentationTest.de.test.antennapod.AntennaPodTestRunner"
}
diff --git a/pom.xml b/pom.xml
index a1fa49244..7ae6e816c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,18 +13,18 @@
android.support
compatibility-v4
- 18
+ 19
android.support
compatibility-v7-appcompat
- 18
+ 19
apklib
android.support
compatibility-v7-appcompat
- 18
+ 19
jar
@@ -58,15 +58,16 @@
- com.google.android
+ android
android
provided
- 4.1.1.4
+ 4.4_r1
- com.google.android
+ com.google.android.annotations
annotations
- 4.1.1.4
+ 22.3
+ provided
commons-io
@@ -109,11 +110,11 @@
com.jayway.maven.plugins.android.generation2
android-maven-plugin
- 3.6.1
+ 3.8.0
${env.ANDROID_HOME}
- 18
+ 19
true
diff --git a/src/de/danoeh/antennapod/activity/DownloadActivity.java b/src/de/danoeh/antennapod/activity/DownloadActivity.java
index 51491a286..ee5bb502c 100644
--- a/src/de/danoeh/antennapod/activity/DownloadActivity.java
+++ b/src/de/danoeh/antennapod/activity/DownloadActivity.java
@@ -240,19 +240,11 @@ public class DownloadActivity extends ActionBarActivity implements
return handled;
}
- private boolean actionModeDestroyWorkaround = false; // TODO remove this workaround
- private boolean skipWorkAround = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
-
@Override
public void onDestroyActionMode(ActionMode mode) {
- if (skipWorkAround || actionModeDestroyWorkaround) {
- mActionMode = null;
- selectedDownload = null;
- dla.setSelectedItemIndex(DownloadlistAdapter.SELECTION_NONE);
- actionModeDestroyWorkaround = false;
- } else {
- actionModeDestroyWorkaround = true;
- }
+ mActionMode = null;
+ selectedDownload = null;
+ dla.setSelectedItemIndex(DownloadlistAdapter.SELECTION_NONE);
}
private BroadcastReceiver contentChanged = new BroadcastReceiver() {
diff --git a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
index ed607b279..d0e07b194 100644
--- a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
@@ -244,19 +244,11 @@ public class FeedlistFragment extends Fragment implements
return true;
}
- private boolean actionModeDestroyWorkaround = false; // TODO remove this workaround
- private boolean skipWorkAround = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
-
@Override
public void onDestroyActionMode(ActionMode mode) {
- if (skipWorkAround || actionModeDestroyWorkaround) {
- mActionMode = null;
- selectedFeed = null;
- fla.setSelectedItemIndex(FeedlistAdapter.SELECTION_NONE);
- actionModeDestroyWorkaround = false;
- } else {
- actionModeDestroyWorkaround = true;
- }
+ mActionMode = null;
+ selectedFeed = null;
+ fla.setSelectedItemIndex(FeedlistAdapter.SELECTION_NONE);
}
@Override
diff --git a/submodules/dslv b/submodules/dslv
index f294d8eec..1bb29afb9 160000
--- a/submodules/dslv
+++ b/submodules/dslv
@@ -1 +1 @@
-Subproject commit f294d8eec59f73b5594634cac6fe1dc4e2cb32b6
+Subproject commit 1bb29afb91f41af53f136599cf349752c13f52ab