diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/raw/changelog.xml | 3 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/DownloadFragment.java | 6 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/service/DownloadFile.java | 14 |
4 files changed, 16 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 10d65fa9..5f97baaa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="github.daneren2005.dsub"
android:installLocation="internalOnly"
- android:versionCode="79"
- android:versionName="4.3.4">
+ android:versionCode="80"
+ android:versionName="4.3.5">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml index 400e72b4..0f1a0c46 100644 --- a/res/raw/changelog.xml +++ b/res/raw/changelog.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <changelog> + <release version="4.3.5" versioncode="80" releasedate="1/11/2014"> + <change>Fix downloads not limiting bitrate correctly</change> + </release> <release version="4.3.4" versioncode="79" releasedate="1/9/2014"> <change>New Share management tab (can disable in settings). Ability to share albums/songs (thanks archrival)</change> <change>High quality album art cache (doesn't overwrite existing downloaded art) (thanks archrival)</change> diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java index 9b634aac..de721f7d 100644 --- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -1110,8 +1110,10 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe switch (playerState) {
case DOWNLOADING:
- long bytes = currentPlaying.getPartialFile().length();
- statusTextView.setText(context.getResources().getString(R.string.download_playerstate_downloading, Util.formatLocalizedBytes(bytes, context)));
+ if(currentPlaying != null) {
+ long bytes = currentPlaying.getPartialFile().length();
+ statusTextView.setText(context.getResources().getString(R.string.download_playerstate_downloading, Util.formatLocalizedBytes(bytes, context)));
+ }
break;
case PREPARING:
statusTextView.setText(R.string.download_playerstate_buffering);
diff --git a/src/github/daneren2005/dsub/service/DownloadFile.java b/src/github/daneren2005/dsub/service/DownloadFile.java index 27fc0708..d7a05da7 100644 --- a/src/github/daneren2005/dsub/service/DownloadFile.java +++ b/src/github/daneren2005/dsub/service/DownloadFile.java @@ -95,13 +95,13 @@ public class DownloadFile { } private int getActualBitrate() { int br = song.isVideo() ? Util.getMaxVideoBitrate(context) : Util.getMaxBitrate(context); - if (br == 0 && song.getTranscodedSuffix() != null && - "mp3".equals(song.getTranscodedSuffix().toLowerCase()) && - song.getBitRate() != null) { - br = Math.min(320, song.getBitRate()); - } else { - br = 320; - } + if(br == 0 && song.getTranscodedSuffix() != null && "mp3".equals(song.getTranscodedSuffix().toLowerCase())) { + if(song.getBitRate() != null) { + br = Math.min(320, song.getBitRate()); + } else { + br = 320; + } + } return br; } |