2 files changed, 6 insertions, 22 deletions
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