Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
67c0cee
Error handling in subscribe() in DownloadDialog
sauravrao637 Apr 20, 2021
4357e02
user can report the error
sauravrao637 Apr 20, 2021
a012e26
fix Rotation crash on „Video not available“ page (#5941)
evermind-zz May 5, 2021
b2b9938
Put show channel details option in more long-press menus
triallax May 15, 2021
10b1da1
Update ci.yml
litetex May 23, 2021
57474e2
Refactor and optimize equals
imericxu May 21, 2021
013c59f
Refactor ArrayList fields to List
imericxu May 21, 2021
4cd1f20
Refactor streams to initialize with values
imericxu May 21, 2021
882b235
Test PlayQueue equals
imericxu May 21, 2021
441c68e
Add hashCode() to match equals(other)
imericxu May 21, 2021
8efe285
Refactor assignments to field declaration
imericxu May 21, 2021
8d0f2d3
Test PlayQueue.setIndex(...)
imericxu May 22, 2021
775fbc9
Rewrite setIndex(int) to pass unit tests
imericxu May 22, 2021
e8eeac6
Resolve TODO in indexOf(...)
imericxu May 22, 2021
77f6940
Refactor making a PlayQueueItem to static method
imericxu May 22, 2021
363bbf5
Test getItem(int)
imericxu May 22, 2021
92a67bb
Rearrange fields
imericxu May 22, 2021
08949ee
Refactor static methods to package private
imericxu May 22, 2021
bf8e879
Add test for setIndex
imericxu May 22, 2021
e1a6347
Refactor shuffle and update documentation
imericxu May 22, 2021
5ab6e84
Remove redundant clearing of list
imericxu May 22, 2021
2e161a1
Change shuffle() guard to check for size <= 2
imericxu May 22, 2021
e518c0d
Rename mockPlayQueue(…) to makePlayQueue(…)
imericxu May 23, 2021
40f6697
Rewrite addToHistory test without using reflection
imericxu May 23, 2021
c0f4719
Remove Enclosed.class runner
imericxu May 24, 2021
6422e31
[Bandcamp] Handles links without `/`
fynngodau May 26, 2021
38fb510
[Bandcamp] Increase accuracy of intent filters
fynngodau May 26, 2021
4b27aec
Merge pull request #6360 from litetex/used-adoptopenjdk-instead-of-zulu
XiangRongLin May 26, 2021
8080c32
Merge pull request #6345 from Imericxu/test-and-update-playqueue
XiangRongLin May 26, 2021
9b18614
Add formatting removal on paste for search
imericxu May 23, 2021
8f4c6fb
Add comment
imericxu May 23, 2021
ea1b910
Simplify code
imericxu May 23, 2021
26c535d
Change IRC link
TobiGr May 27, 2021
afbf369
Merge branch 'master' into dev
TobiGr May 27, 2021
23ee9b7
Update Matrix link of NewPipe IRC from Freenode to Libera.chat
AudricV May 27, 2021
79f7dcd
Merge pull request #6384 from TeamNewPipe/change-matrix-irc-link
AudricV May 27, 2021
b564433
Option for download is redundant and thus removed when linkType is CH…
sauravrao637 May 27, 2021
e8d518c
Add Libera webchat link
TobiGr May 28, 2021
6ec72ef
Fix empty fragment text not centered when text longer than one line
TobiGr May 28, 2021
f134e2d
Merge pull request #6385 from sauravrao637/6371
TobiGr May 28, 2021
f1bc4f5
Update junit from 4.13.1 to 4.13.2
TobiGr May 28, 2021
6956d16
Update dependency for core library desugaring
TobiGr May 28, 2021
ecc998a
Merge pull request #6373 from TeamNewPipe/bandcamp-links
TobiGr May 28, 2021
67b8338
Merge pull request #6387 from TeamNewPipe/empty_fragment_design
Redirion May 28, 2021
0eb69b6
Merge pull request #6353 from Imericxu/fix-pasting-rich-text-in-search
TobiGr May 29, 2021
62b593d
Merge pull request #6118 from sauravrao637/errorHandlingInSubcribe
TobiGr May 29, 2021
a84ab74
Change IRC chat button link in READMEs (#6393)
AudricV May 29, 2021
fd4408e
Set ImportExportDataPath only on successful export
XiangRongLin May 31, 2021
f13a1b0
Set ImportExportDataPath only on successful import
XiangRongLin May 31, 2021
05eb0d0
Commit path immediately when import backup
XiangRongLin May 31, 2021
004907d
Annotate methode parameters as NonNull
XiangRongLin May 31, 2021
142cde9
fixed channel description textView
sauravrao637 Jun 1, 2021
fdee7c3
Merge pull request #6410 from sauravrao637/6409
TobiGr Jun 1, 2021
ffad244
Upgrade PrettyTime to 5.0.1
triallax Jun 1, 2021
ef6d0cc
Merge pull request #6414 from mhmdanas/upgrade-prettytime-5.0.1
Redirion Jun 2, 2021
997267b
Show video metadata below the decription
Stypox Mar 28, 2021
d0d5373
Allow copying metadata to clipboard
Stypox Mar 31, 2021
bc3e43a
Add button to allow selecting text in the description
Stypox Apr 1, 2021
1425613
Use chips to show tags in metadata section
Stypox Jun 2, 2021
fe7536e
Change NewPipe IRC links in the contribution guidelines (#6415)
AudricV Jun 2, 2021
d025ef1
Sort tags in metadata section
Stypox Jun 2, 2021
9e94c81
Always show scrollbars for metadata tags
Stypox Jun 2, 2021
f98d263
Merge pull request #6242 from evermind-zz/fixes-for-upstream
TobiGr Jun 3, 2021
71aa6c6
Merge pull request #6309 from mhmdanas/fix-channel-details-long-press…
TobiGr Jun 3, 2021
b9aaafd
Add Open in browser option to long-press menu
AudricV May 13, 2021
b4d6015
Add the Open in browser option when long-pressing a stream for local …
AudricV May 13, 2021
f739ed7
Merge pull request #6280 from TiA4f8R/open-in-browser-long-press-menu
TobiGr Jun 3, 2021
1306a77
Using Localization.shortCount() and old likeCount
litetex Jun 3, 2021
63c9308
Merge pull request #5946 from Stypox/metadata
TobiGr Jun 3, 2021
8ed8b94
Update extractor version to ff11c2df2a22cc10d9fd7e59538d10ca7ccbaffb
TobiGr Jun 4, 2021
db2e03e
Merge pull request #6402 from XiangRongLin/save_backup_bug
TobiGr Jun 4, 2021
332b90d
Merge pull request #6337 from litetex/fix-broken-yt-liked-comments
B0pol Jun 4, 2021
98fdbec
Fix playback speed not being updated in PlayQueuAcitvity
TobiGr Jun 5, 2021
9fc3dde
Fix Play with Kodi button in Player always prompts to install Kore
AudricV Jun 5, 2021
9bf4eff
Merge pull request #6421 from TeamNewPipe/fix/playback_speed
Stypox Jun 5, 2021
932eb94
Merge pull request #6429 from TiA4f8R/fix-play-with-kodi-player-button
TobiGr Jun 5, 2021
25130db
Translated using Weblate (German)
weblate Jun 5, 2021
79efffe
Replace three dots with ellipsis symbol
TobiGr Jun 4, 2021
abc354f
Use reqireContext(), requireActivity() instead of getters
TobiGr Jun 4, 2021
7e3b345
Suppress a warning
TobiGr Jun 4, 2021
f583dd4
Annotate StoredFileHelper.createSAF() as NonNull
TobiGr Jun 5, 2021
f1bb56e
Merge pull request #6430 from TeamNewPipe/localization
TobiGr Jun 5, 2021
583a028
Add changelog for 0.21.4
TobiGr Jun 5, 2021
ded6540
Update extractor version
TobiGr Jun 5, 2021
81d00f2
Run CI on PRs which target the master branch
TobiGr Jun 5, 2021
69fc466
Update 970.txt
TobiGr Jun 5, 2021
49b12ea
Increase space for metadata typeview
TobiGr Jun 6, 2021
0f7ed0e
Kotlin auto formatting
TobiGr Jun 6, 2021
d921e2e
Hide queue duration when displaying segment panel
Douile Jun 7, 2021
f6bca68
Merge pull request #6442 from Douile/fix/useless-duration
Stypox Jun 7, 2021
8f027e2
Translated using Weblate (Chinese (Simplified))
weblate Jun 7, 2021
3fe0368
Update NewPIpe extractor to 0.21.4
TobiGr Jun 7, 2021
509f501
Merge pull request #6438 from TeamNewPipe/fix/metadataView
TobiGr Jun 7, 2021
f1e8667
NewPipe 0.21.4 (970)
TobiGr Jun 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ You'll see exactly what is sent, be able to add your comments, and then send it.

## Communication

* The [#newpipe](irc:irc.freenode.net/newpipe) channel on freenode has the core team and other developers in it. [Click here for webchat](https://webchat.freenode.net/?channels=newpipe)!
* You can also use a Matrix account to join the Newpipe channel at [#freenode_#newpipe:matrix.org](https://matrix.to/#/#freenode_#newpipe:matrix.org).
* The #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) has the core team and other developers in it. [Click here for webchat](https://web.libera.chat/#newpipe)!
* You can also use a Matrix account to join the NewPipe channel at [#newpipe:libera.chat](https://matrix.to/#/#newpipe:libera.chat).
* Post suggestions, changes, ideas etc. on GitHub or IRC.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: 💬 IRC
url: https://webchat.freenode.net/#newpipe
url: https://web.libera.chat/#newpipe
about: Chat with us via IRC for quick Q/A
- name: 💬 Matrix
url: https://matrix.to/#/#freenode_#newpipe:matrix.org
url: https://matrix.to/#/#newpipe:libera.chat
about: Chat with us via Matrix for quick Q/A
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- dev
- master
push:
branches:
- dev
Expand All @@ -25,7 +26,7 @@ jobs:
uses: actions/setup-java@v2
with:
java-version: 8
distribution: "zulu"
distribution: "adopt"

- name: Cache Gradle dependencies
uses: actions/cache@v2
Expand Down Expand Up @@ -54,7 +55,7 @@ jobs:
uses: actions/setup-java@v2
with:
java-version: 8
distribution: "zulu"
distribution: "adopt"

- name: Cache Gradle dependencies
uses: actions/cache@v2
Expand All @@ -79,7 +80,7 @@ jobs:
# uses: actions/setup-java@v2
# with:
# java-version: 11 # Sonar requires JDK 11
# distribution: "zulu"
# distribution: "adopt"

# - name: Cache SonarCloud packages
# uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion README.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/Licencia-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/es/" alt="Estado de la traducción"><img src="https://hosted.weblate.org/widgets/newpipe/es/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/Canal%20de%20IRC%20-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/Canal%20de%20IRC%20-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="ライセンス: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="ビルド状態"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="翻訳状態"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC チャンネル: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC チャンネル: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource 寄付"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.pt_BR.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.ro.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.so.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="Laysinka: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Darajada Dhismaha"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Heerka Turjimaada"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="Kanaalka IRC: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="Kanaalka IRC: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Kuwa Bountysource "><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
2 changes: 1 addition & 1 deletion README.tr.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="Lisans: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Derleme Durumu"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Çeviri Durumu"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="https://webchat.freenode.net/#newpipe" alt="IRC kanalı: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://web.libera.chat/#newpipe" alt="IRC kanalı: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource ödülleri"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
</p>
<hr>
Expand Down
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ android {
resValue "string", "app_name", "NewPipe"
minSdkVersion 19
targetSdkVersion 29
versionCode 969
versionName "0.21.3"
versionCode 970
versionName "0.21.4"

multiDexEnabled true

Expand Down Expand Up @@ -178,12 +178,12 @@ sonarqube {

dependencies {
/** Desugaring **/
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

/** NewPipe libraries **/
// You can use a local version by uncommenting a few lines in settings.gradle
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.3'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.4'

/** Checkstyle **/
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
Expand Down Expand Up @@ -258,7 +258,7 @@ dependencies {
implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"

// Date and time formatting
implementation "org.ocpsoft.prettytime:prettytime:5.0.0.Final"
implementation "org.ocpsoft.prettytime:prettytime:5.0.1.Final"

/** Debugging **/
// Memory leak detection
Expand All @@ -270,7 +270,7 @@ dependencies {
debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"

/** Testing **/
testImplementation 'junit:junit:4.13.1'
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

Expand Down
19 changes: 16 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
<data android:pathPrefix="/video-channels/" />
</intent-filter>

<!-- Bandcamp filter -->
<!-- Bandcamp filter for tracks, albums and playlists -->
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
Expand All @@ -330,10 +330,23 @@

<data android:scheme="http"/>
<data android:scheme="https"/>
<data android:host="bandcamp.com"/>
<data android:host="*.bandcamp.com"/>
<data android:pathPrefix="/"/>
</intent-filter>

<!-- Bandcamp filter for radio -->
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
<action android:name="android.nfc.action.NDEF_DISCOVERED"/>

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>

<data android:scheme="http"/>
<data android:scheme="https"/>
<data android:sspPattern="bandcamp.com/?show=*"/>
</intent-filter>

</activity>
<service
android:name=".RouterActivity$FetcherService"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/schabi/newpipe/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@

public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
@SuppressWarnings("ConstantConditions")
public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");

private ActivityMainBinding mainBinding;
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/org/schabi/newpipe/RouterActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,11 @@ private List<AdapterChoiceItem> getChoicesForService(final StreamingService serv
if (capabilities.contains(AUDIO)) {
returnList.add(backgroundPlayer);
}
// download is redundant for linkType CHANNEL AND PLAYLIST (till playlist downloading is
// not supported )
returnList.add(new AdapterChoiceItem(getString(R.string.download_key),
getString(R.string.download),
R.drawable.ic_file_download));

} else {
returnList.add(showInfo);
Expand All @@ -478,10 +483,6 @@ private List<AdapterChoiceItem> getChoicesForService(final StreamingService serv
}
}

returnList.add(new AdapterChoiceItem(getString(R.string.download_key),
getString(R.string.download),
R.drawable.ic_file_download));

return returnList;
}

Expand Down
37 changes: 24 additions & 13 deletions app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -312,25 +312,36 @@ public void onStopTrackingTouch(final SeekBar p1) { }

private void fetchStreamsSize() {
disposables.clear();

disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams)
.subscribe(result -> {
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
setupVideoSpinner();
}
}));
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
== R.id.video_button) {
setupVideoSpinner();
}
}, throwable -> ErrorActivity.reportErrorInSnackbar(context,
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
"Downloading video stream size",
currentInfo.getServiceId()))));
disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams)
.subscribe(result -> {
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
setupAudioSpinner();
}
}));
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
== R.id.audio_button) {
setupAudioSpinner();
}
}, throwable -> ErrorActivity.reportErrorInSnackbar(context,
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
"Downloading audio stream size",
currentInfo.getServiceId()))));
disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams)
.subscribe(result -> {
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
setupSubtitleSpinner();
}
}));
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
== R.id.subtitle_button) {
setupSubtitleSpinner();
}
}, throwable -> ErrorActivity.reportErrorInSnackbar(context,
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
"Downloading subtitle stream size",
currentInfo.getServiceId()))));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,20 @@
import org.schabi.newpipe.R;

public class EmptyFragment extends BaseFragment {
final boolean showMessage;
private static final String SHOW_MESSAGE = "SHOW_MESSAGE";

public EmptyFragment(final boolean showMessage) {
this.showMessage = showMessage;
public static final EmptyFragment newInstance(final boolean showMessage) {
final EmptyFragment emptyFragment = new EmptyFragment();
final Bundle bundle = new Bundle(1);
bundle.putBoolean(SHOW_MESSAGE, showMessage);
emptyFragment.setArguments(bundle);
return emptyFragment;
}

@Override
public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGroup container,
final Bundle savedInstanceState) {
final boolean showMessage = getArguments().getBoolean(SHOW_MESSAGE);
final View view = inflater.inflate(R.layout.fragment_empty, container, false);
view.findViewById(R.id.empty_state_view).setVisibility(
showMessage ? View.VISIBLE : View.GONE);
Expand Down
Loading