diff options
Diffstat (limited to 'app')
4 files changed, 11 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index f740850b4..baa206519 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { // Version code schema: // "1.2.3-beta4" -> 1020304 // "1.2.3" -> 1020395 - versionCode 2050195 - versionName "2.5.1" + versionCode 2050296 + versionName "2.5.2" def commit = "" try { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/EpisodeItemListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/EpisodeItemListAdapter.java index 0ad7fa219..53223896f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/EpisodeItemListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/EpisodeItemListAdapter.java @@ -84,7 +84,7 @@ public class EpisodeItemListAdapter extends SelectableAdapter<EpisodeItemViewHol }); holder.itemView.setOnCreateContextMenuListener(this); holder.itemView.setOnLongClickListener(v -> { - longPressedItem = getItem(holder.getBindingAdapterPosition()); + longPressedItem = item; longPressedPosition = holder.getBindingAdapterPosition(); return false; }); @@ -92,7 +92,7 @@ public class EpisodeItemListAdapter extends SelectableAdapter<EpisodeItemViewHol if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (e.isFromSource(InputDevice.SOURCE_MOUSE) && e.getButtonState() == MotionEvent.BUTTON_SECONDARY) { - longPressedItem = getItem(holder.getBindingAdapterPosition()); + longPressedItem = item; longPressedPosition = holder.getBindingAdapterPosition(); return false; } @@ -127,6 +127,7 @@ public class EpisodeItemListAdapter extends SelectableAdapter<EpisodeItemViewHol holder.itemView.setOnClickListener(null); holder.itemView.setOnCreateContextMenuListener(null); holder.itemView.setOnLongClickListener(null); + holder.itemView.setOnTouchListener(null); holder.secondaryActionButton.setOnClickListener(null); holder.dragHandle.setOnTouchListener(null); holder.coverHolder.setOnTouchListener(null); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java index 8351d1fb5..7c3166043 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java @@ -117,7 +117,7 @@ public class SubscriptionsRecyclerAdapter extends SelectableAdapter<Subscription if (isFeed) { longPressedPosition = holder.getBindingAdapterPosition(); } - selectedItem = (NavDrawerData.DrawerItem) getItem(holder.getBindingAdapterPosition()); + selectedItem = drawerItem; } return false; }); @@ -130,7 +130,7 @@ public class SubscriptionsRecyclerAdapter extends SelectableAdapter<Subscription if (isFeed) { longPressedPosition = holder.getBindingAdapterPosition(); } - selectedItem = (NavDrawerData.DrawerItem) getItem(holder.getBindingAdapterPosition()); + selectedItem = drawerItem; } } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 6a8bc2585..974cbb370 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -173,6 +173,8 @@ public class ItemFragment extends Fragment { && UsageStatistics.hasSignificantBiasTo(UsageStatistics.ACTION_STREAM)) { showOnDemandConfigBalloon(true); return; + } else if (actionButton1 == null) { + return; // Not loaded yet } actionButton1.onClick(getContext()); }); @@ -181,6 +183,8 @@ public class ItemFragment extends Fragment { && UsageStatistics.hasSignificantBiasTo(UsageStatistics.ACTION_DOWNLOAD)) { showOnDemandConfigBalloon(false); return; + } else if (actionButton2 == null) { + return; // Not loaded yet } actionButton2.onClick(getContext()); }); |