diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-05-06 17:46:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-06 17:46:40 +0200 |
commit | 320ab280625c383505f5b24656b2d39e9a323664 (patch) | |
tree | ad6d7117b3dba8b4f7dd473bc9c201d0af45f7ee /app/src/main/java/de/danoeh/antennapod/adapter/actionbutton | |
parent | 0a8e1ac48407ad436e6297a5caba66f9f8321a12 (diff) | |
parent | 8be147c603d92c9520adeaa2b9e9f8ce6b76fa40 (diff) | |
download | AntennaPod-320ab280625c383505f5b24656b2d39e9a323664.zip |
Merge pull request #4121 from ByteHamster/on-demand-configuration
Added on-demand configuration for stream vs download
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/adapter/actionbutton')
3 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java index 44435c02e..3e210c822 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java @@ -12,6 +12,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; +import de.danoeh.antennapod.core.preferences.UsageStatistics; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequester; @@ -50,6 +51,8 @@ public class DownloadActionButton extends ItemActionButton { return; } + UsageStatistics.logAction(UsageStatistics.ACTION_DOWNLOAD); + if (NetworkUtils.isEpisodeDownloadAllowed() || MobileDownloadHelper.userAllowedMobileDownloads()) { downloadEpisode(context); } else if (MobileDownloadHelper.userChoseAddToQueue() && !isInQueue) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java index e5bb04391..527ac3ec1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java @@ -7,7 +7,6 @@ import androidx.annotation.AttrRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import android.view.View; -import android.widget.ImageButton; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; @@ -47,7 +46,7 @@ public abstract class ItemActionButton { return new PlayActionButton(item); } else if (isDownloadingMedia) { return new CancelDownloadActionButton(item); - } else if (UserPreferences.streamOverDownload() && allowStream) { + } else if (UserPreferences.isStreamOverDownload() && allowStream) { return new StreamActionButton(item); } else if (MobileDownloadHelper.userAllowedMobileDownloads() || !MobileDownloadHelper.userChoseAddToQueue() || isInQueue) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java index 88e0fc7ed..8a892a621 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java @@ -9,6 +9,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.feed.MediaType; +import de.danoeh.antennapod.core.preferences.UsageStatistics; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.util.NetworkUtils; import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter; @@ -38,6 +39,8 @@ public class StreamActionButton extends ItemActionButton { if (media == null) { return; } + UsageStatistics.logAction(UsageStatistics.ACTION_STREAM); + if (!NetworkUtils.isStreamingAllowed()) { new StreamingConfirmationDialog(context, media).show(); return; |