From e9b5203db93361be254269ab5b130e8b8af57981 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Tue, 1 Sep 2015 23:47:39 +0200 Subject: [PATCH 1/2] Check that URL is not null or empty --- .../de/danoeh/antennapod/adapter/AdapterUtils.java | 8 ++++++-- .../de/danoeh/antennapod/core/util/NetworkUtils.java | 11 ++++++++++- 2 files changed, 16 insertions(+), 3 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 854358285..e279ead63 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java @@ -1,5 +1,6 @@ package de.danoeh.antennapod.adapter; +import android.util.Log; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; @@ -52,13 +53,16 @@ public class AdapterUtils { txtvPos.setText("{fa-spinner}"); Iconify.addIcons(txtvPos); NetworkUtils.getFeedMediaSizeObservable(media) - .subscribe(size -> { + .subscribe( + size -> { if (size > 0) { txtvPos.setText(Converter.byteToString(size)); } else { txtvPos.setText(""); } - }); + }, error -> { + Log.e(TAG, Log.getStackTraceString(error)); + }); } else { txtvPos.setText(""); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java index 1b57baa11..f6486163c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java @@ -5,6 +5,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; +import android.text.TextUtils; import android.util.Log; import com.squareup.okhttp.OkHttpClient; @@ -108,9 +109,17 @@ public class NetworkUtils { } } else if (false == media.checkedOnSizeButUnknown()) { // only query the network if we haven't already checked + + String url = media.getDownload_url(); + if(TextUtils.isEmpty(url)) { + subscriber.onNext(0L); + subscriber.onCompleted(); + return; + } + OkHttpClient client = AntennapodHttpClient.getHttpClient(); Request.Builder httpReq = new Request.Builder() - .url(media.getDownload_url()) + .url(url) .header("Accept-Encoding", "identity") .head(); try { From 6381e10352f2e5094c4ad88e2d8733100d80b031 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Sun, 6 Sep 2015 11:10:27 -0400 Subject: [PATCH 2/2] updated to version 1.3.3 --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 710446885..ebd1c9bfc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="1030300" + android:versionName="1.3.3.0">