Merge pull request #1180 from AntennaPod/version_1.3
Merging 1.3.3 in to master
This commit is contained in:
commit
281885b1f4
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.danoeh.antennapod"
|
||||
android:versionCode="1030204"
|
||||
android:versionName="1.3.2">
|
||||
android:versionCode="1030300"
|
||||
android:versionName="1.3.3.0">
|
||||
<!--
|
||||
Version code schema:
|
||||
"1.2.3-SNAPSHOT" -> 1020300
|
||||
|
@ -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("");
|
||||
}
|
||||
|
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user