Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1180 from AntennaPod/version_1.3

Browse Source 
Merging 1.3.3 in to master
This commit is contained in:
Tom Hennen 2015-09-07 20:51:56 -04:00
commit 281885b1f4
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.danoeh.antennapod" package="de.danoeh.antennapod"
android:versionCode="1030204" android:versionCode="1030300"
android:versionName="1.3.2"> android:versionName="1.3.3.0">
<!-- <!--
Version code schema: Version code schema:
"1.2.3-SNAPSHOT" -> 1020300 "1.2.3-SNAPSHOT" -> 1020300

6
app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
View File

@ -1,5 +1,6 @@
package de.danoeh.antennapod.adapter; package de.danoeh.antennapod.adapter;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
@ -52,12 +53,15 @@ public class AdapterUtils {
txtvPos.setText("{fa-spinner}"); txtvPos.setText("{fa-spinner}");
Iconify.addIcons(txtvPos); Iconify.addIcons(txtvPos);
NetworkUtils.getFeedMediaSizeObservable(media) NetworkUtils.getFeedMediaSizeObservable(media)
.subscribe(size -> { .subscribe(
size -> {
if (size > 0) { if (size > 0) {
txtvPos.setText(Converter.byteToString(size)); txtvPos.setText(Converter.byteToString(size));
} else { } else {
txtvPos.setText(""); txtvPos.setText("");
} }
}, error -> {
Log.e(TAG, Log.getStackTraceString(error));
}); });
} else { } else {
txtvPos.setText(""); txtvPos.setText("");

11
core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
View File

@ -5,6 +5,7 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
@ -108,9 +109,17 @@ public class NetworkUtils {
} }
} else if (false == media.checkedOnSizeButUnknown()) { } else if (false == media.checkedOnSizeButUnknown()) {
// only query the network if we haven't already checked // 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(); OkHttpClient client = AntennapodHttpClient.getHttpClient();
Request.Builder httpReq = new Request.Builder() Request.Builder httpReq = new Request.Builder()
.url(media.getDownload_url()) .url(url)
.header("Accept-Encoding", "identity") .header("Accept-Encoding", "identity")
.head(); .head();
try { try {