diff options
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/adapter')
3 files changed, 23 insertions, 9 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java index 1ea7daaa3..935a0dcd4 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java @@ -47,9 +47,10 @@ public class AdapterUtils { - media.getPosition())); } } else if (!media.isDownloaded()) { + Log.d(TAG, "size: " + media.getSize()); if (media.getSize() > 0) { txtvPos.setText(Converter.byteToString(media.getSize())); - } else if(false == media.checkedOnSizeButUnknown()) { + } else if(NetworkUtils.isDownloadAllowed() && false == media.checkedOnSizeButUnknown()) { txtvPos.setText("{fa-spinner}"); Iconify.addIcons(txtvPos); NetworkUtils.getFeedMediaSizeObservable(media) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java index c4bcc85f5..6d4fc6f1e 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java @@ -135,7 +135,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR holder.txtvDuration.setText(Converter.getDurationStringLong(media.getDuration())); } else if (media.getSize() > 0) { holder.txtvDuration.setText(Converter.byteToString(media.getSize())); - } else if(false == media.checkedOnSizeButUnknown()) { + } else if(NetworkUtils.isDownloadAllowed() && false == media.checkedOnSizeButUnknown()) { holder.txtvDuration.setText("{fa-spinner}"); Iconify.addIcons(holder.txtvDuration); NetworkUtils.getFeedMediaSizeObservable(media) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java index 05562d2da..aa3368258 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java @@ -7,6 +7,7 @@ import android.support.v4.content.ContextCompat; import android.support.v4.view.MotionEventCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; +import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -28,8 +29,6 @@ import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.joanzapata.iconify.Iconify; import com.nineoldandroids.view.ViewHelper; -import org.apache.commons.lang3.StringUtils; - import java.lang.ref.WeakReference; import de.danoeh.antennapod.R; @@ -214,13 +213,13 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap title.setText(item.getTitle()); String pubDateStr = DateUtils.formatAbbrev(mainActivity.get(), item.getPubDate()); int index = 0; - if(StringUtils.countMatches(pubDateStr, ' ') == 1 || StringUtils.countMatches(pubDateStr, ' ') == 2) { + if(countMatches(pubDateStr, ' ') == 1 || countMatches(pubDateStr, ' ') == 2) { index = pubDateStr.lastIndexOf(' '); - } else if(StringUtils.countMatches(pubDateStr, '.') == 2) { + } else if(countMatches(pubDateStr, '.') == 2) { index = pubDateStr.lastIndexOf('.'); - } else if(StringUtils.countMatches(pubDateStr, '-') == 2) { + } else if(countMatches(pubDateStr, '-') == 2) { index = pubDateStr.lastIndexOf('-'); - } else if(StringUtils.countMatches(pubDateStr, '/') == 2) { + } else if(countMatches(pubDateStr, '/') == 2) { index = pubDateStr.lastIndexOf('/'); } if(index > 0) { @@ -253,7 +252,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap } else { if(media.getSize() > 0) { progressLeft.setText(Converter.byteToString(media.getSize())); - } else if(false == media.checkedOnSizeButUnknown()) { + } else if(NetworkUtils.isDownloadAllowed() && false == media.checkedOnSizeButUnknown()) { progressLeft.setText("{fa-spinner}"); Iconify.addIcons(progressLeft); NetworkUtils.getFeedMediaSizeObservable(media) @@ -376,4 +375,18 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap */ void onItemClear(); } + + // Oh Xiaomi, I hate you so much. How did you manage to fuck this up? + private static int countMatches(final CharSequence str, final char ch) { + if (TextUtils.isEmpty(str)) { + return 0; + } + int count = 0; + for (int i = 0; i < str.length(); i++) { + if (ch == str.charAt(i)) { + count++; + } + } + return count; + } } |