fetch and merge

Author: martin

.github/FUNDING.yml

@@ -1 +1,2 @@
 liberapay: TeamNewPipe
+custom: 'https://newpipe.net/donate/'

.github/workflows/ci.yml

@@ -52,6 +52,7 @@ jobs:
   test-android:
     # macos has hardware acceleration. See android-emulator-runner action
     runs-on: macos-latest
+    timeout-minutes: 20
     strategy:
       matrix:
         # api-level 19 is min sdk, but throws errors related to desugaring
@@ -73,6 +74,13 @@ jobs:
           # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
           emulator-build: 7425822
           script: ./gradlew connectedCheck --stacktrace
+        
+      - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: android-test-report-api${{ matrix.api-level }}
+          path: app/build/reports/androidTests/connected/**
 
   sonar:
     runs-on: ubuntu-latest

.gitignore

@@ -8,8 +8,8 @@ captures/
 *~
 .weblate
 *.class
-**/debug/
-**/release/
+app/debug/
+app/release/
 
 # vscode / eclipse files
 *.classpath

README.md

@@ -17,7 +17,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md).*
+*Read this in other languages: [English](README.md), [Español](doc/README.es.md), [한국어](doc/README.ko.md), [Soomaali](doc/README.so.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md).*
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 

app/build.gradle

@@ -8,16 +8,16 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 981
-        versionName "0.21.15"
+        minSdk 19
+        targetSdk 29
+        versionCode 982
+        versionName "0.21.16"
 
         multiDexEnabled true
 
@@ -65,7 +65,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
@@ -98,7 +98,7 @@ android {
 }
 
 ext {
-    checkstyleVersion = '9.2'
+    checkstyleVersion = '9.2.1'
 
     androidxLifecycleVersion = '2.3.1'
     androidxRoomVersion = '2.3.0'
@@ -112,6 +112,7 @@ ext {
     leakCanaryVersion = '2.5'
     stethoVersion = '1.6.0'
     mockitoVersion = '4.0.0'
+    assertJVersion = '3.22.0'
 }
 
 configurations {
@@ -188,7 +189,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.12'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:65129e6'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
@@ -290,6 +291,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test:runner:1.4.0"
     androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
+    androidTestImplementation "org.assertj:assertj-core:${assertJVersion}"
 }
 
 static String getGitWorkingBranch() {

app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt

@@ -1,19 +1,19 @@
 package org.schabi.newpipe.local.history
 
 import androidx.test.core.app.ApplicationProvider
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.Timeout
 import org.schabi.newpipe.database.AppDatabase
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry
 import org.schabi.newpipe.testUtil.TestDatabase
 import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
+import java.time.LocalDateTime
 import java.time.OffsetDateTime
-import java.util.concurrent.TimeUnit
+import java.time.ZoneOffset
 
 class HistoryRecordManagerTest {
 
@@ -23,9 +23,6 @@ class HistoryRecordManagerTest {
     @get:Rule
     val trampolineScheduler = TrampolineSchedulerRule()
 
-    @get:Rule
-    val timeout = Timeout(1, TimeUnit.SECONDS)
-
     @Before
     fun setup() {
         database = TestDatabase.createReplacingNewPipeDatabase()
@@ -45,109 +42,137 @@ class HistoryRecordManagerTest {
         // that the number of Lists it returns is exactly 1, we can only check if the first List is
         // correct. Why on earth has a Flowable been used instead of a Single for getAll()?!?
         val entities = database.searchHistoryDAO().all.blockingFirst()
-        assertEquals(1, entities.size)
-        assertEquals(1, entities[0].id)
-        assertEquals(0, entities[0].serviceId)
-        assertEquals("Hello", entities[0].search)
+        assertThat(entities).hasSize(1)
+        assertThat(entities[0].id).isEqualTo(1)
+        assertThat(entities[0].serviceId).isEqualTo(0)
+        assertThat(entities[0].search).isEqualTo("Hello")
     }
 
     @Test
     fun deleteSearchHistory() {
         val entries = listOf(
-            SearchHistoryEntry(OffsetDateTime.now(), 0, "A"),
-            SearchHistoryEntry(OffsetDateTime.now(), 2, "A"),
-            SearchHistoryEntry(OffsetDateTime.now(), 1, "B"),
-            SearchHistoryEntry(OffsetDateTime.now(), 0, "B"),
+            SearchHistoryEntry(time.minusSeconds(1), 0, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "A"),
+            SearchHistoryEntry(time.minusSeconds(3), 1, "B"),
+            SearchHistoryEntry(time.minusSeconds(4), 0, "B"),
         )
 
         // make sure all 4 were inserted
         database.searchHistoryDAO().insertAll(entries)
-        assertEquals(entries.size, database.searchHistoryDAO().all.blockingFirst().size)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
 
         // try to delete only "A" entries, "B" entries should be untouched
         manager.deleteSearchHistory("A").test().await().assertValue(2)
         val entities = database.searchHistoryDAO().all.blockingFirst()
-        assertEquals(2, entities.size)
-        assertTrue(entries[2].hasEqualValues(entities[0]))
-        assertTrue(entries[3].hasEqualValues(entities[1]))
+        assertThat(entities).hasSize(2)
+        assertThat(entities).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
+            .containsExactly(*entries.subList(2, 4).toTypedArray())
 
         // assert that nothing happens if we delete a search query that does exist in the db
         manager.deleteSearchHistory("A").test().await().assertValue(0)
         val entities2 = database.searchHistoryDAO().all.blockingFirst()
-        assertEquals(2, entities2.size)
-        assertTrue(entries[2].hasEqualValues(entities2[0]))
-        assertTrue(entries[3].hasEqualValues(entities2[1]))
+        assertThat(entities2).hasSize(2)
+        assertThat(entities2).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
+            .containsExactly(*entries.subList(2, 4).toTypedArray())
 
         // delete all remaining entries
         manager.deleteSearchHistory("B").test().await().assertValue(2)
-        assertEquals(0, database.searchHistoryDAO().all.blockingFirst().size)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
     }
 
     @Test
     fun deleteCompleteSearchHistory() {
         val entries = listOf(
-            SearchHistoryEntry(OffsetDateTime.now(), 1, "A"),
-            SearchHistoryEntry(OffsetDateTime.now(), 2, "B"),
-            SearchHistoryEntry(OffsetDateTime.now(), 0, "C"),
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 0, "C"),
         )
 
         // make sure all 3 were inserted
         database.searchHistoryDAO().insertAll(entries)
-        assertEquals(entries.size, database.searchHistoryDAO().all.blockingFirst().size)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
 
         // should remove everything
         manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size)
-        assertEquals(0, database.searchHistoryDAO().all.blockingFirst().size)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
     }
 
-    @Test
-    fun getRelatedSearches_emptyQuery() {
+    private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) {
+
+        // shuffle to make sure the order of items returned by queries depends only on
+        // SearchHistoryEntry.creationDate, not on the actual insertion time, so that we can
+        // verify that the `ORDER BY` clause does its job
+        database.searchHistoryDAO().insertAll(relatedSearches.shuffled())
+
         // make sure all entries were inserted
-        database.searchHistoryDAO().insertAll(RELATED_SEARCHES_ENTRIES)
         assertEquals(
-            RELATED_SEARCHES_ENTRIES.size,
+            relatedSearches.size,
             database.searchHistoryDAO().all.blockingFirst().size
         )
+    }
+
+    @Test
+    fun getRelatedSearches_emptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
 
         // make sure correct number of searches is returned and in correct order
         val searches = manager.getRelatedSearches("", 6, 4).blockingFirst()
-        assertEquals(4, searches.size)
-        assertEquals(RELATED_SEARCHES_ENTRIES[6].search, searches[0]) // A (even if in two places)
-        assertEquals(RELATED_SEARCHES_ENTRIES[4].search, searches[1]) // B
-        assertEquals(RELATED_SEARCHES_ENTRIES[5].search, searches[2]) // AA
-        assertEquals(RELATED_SEARCHES_ENTRIES[2].search, searches[3]) // BA
+        assertThat(searches).containsExactly(
+            RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
+            RELATED_SEARCHES_ENTRIES[4].search, // B
+            RELATED_SEARCHES_ENTRIES[5].search, // AA
+            RELATED_SEARCHES_ENTRIES[2].search, // BA
+        )
     }
 
     @Test
-    fun getRelatedSearched_nonEmptyQuery() {
-        // make sure all entries were inserted
-        database.searchHistoryDAO().insertAll(RELATED_SEARCHES_ENTRIES)
-        assertEquals(
-            RELATED_SEARCHES_ENTRIES.size,
-            database.searchHistoryDAO().all.blockingFirst().size
+    fun getRelatedSearches_emptyQuery_manyDuplicates() {
+        insertShuffledRelatedSearches(
+            listOf(
+                SearchHistoryEntry(time.minusSeconds(9), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(8), 3, "AB"),
+                SearchHistoryEntry(time.minusSeconds(7), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(6), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(5), 3, "BA"),
+                SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(3), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(2), 0, "A"),
+                SearchHistoryEntry(time.minusSeconds(1), 2, "AA"),
+            )
         )
 
+        val searches = manager.getRelatedSearches("", 9, 3).blockingFirst()
+        assertThat(searches).containsExactly("AA", "A", "BA")
+    }
+
+    @Test
+    fun getRelatedSearched_nonEmptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
+
         // make sure correct number of searches is returned and in correct order
         val searches = manager.getRelatedSearches("A", 3, 5).blockingFirst()
-        assertEquals(3, searches.size)
-        assertEquals(RELATED_SEARCHES_ENTRIES[6].search, searches[0]) // A (even if in two places)
-        assertEquals(RELATED_SEARCHES_ENTRIES[5].search, searches[1]) // AA
-        assertEquals(RELATED_SEARCHES_ENTRIES[1].search, searches[2]) // BA
+        assertThat(searches).containsExactly(
+            RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
+            RELATED_SEARCHES_ENTRIES[5].search, // AA
+            RELATED_SEARCHES_ENTRIES[1].search, // BA
+        )
 
         // also make sure that the string comparison is case insensitive
         val searches2 = manager.getRelatedSearches("a", 3, 5).blockingFirst()
-        assertEquals(searches, searches2)
+        assertThat(searches).isEqualTo(searches2)
     }
 
     companion object {
-        val RELATED_SEARCHES_ENTRIES = listOf(
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(7), 2, "AC"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(6), 0, "ABC"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(5), 1, "BA"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(4), 3, "A"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(2), 0, "B"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(3), 2, "AA"),
-            SearchHistoryEntry(OffsetDateTime.now().minusSeconds(1), 1, "A"),
+        private val time = OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 1, 1), ZoneOffset.UTC)
+
+        private val RELATED_SEARCHES_ENTRIES = listOf(
+            SearchHistoryEntry(time.minusSeconds(7), 2, "AC"),
+            SearchHistoryEntry(time.minusSeconds(6), 0, "ABC"),
+            SearchHistoryEntry(time.minusSeconds(5), 1, "BA"),
+            SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 0, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 2, "AA"),
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
         )
     }
 }

app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt

@@ -4,13 +4,11 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.Timeout
 import org.schabi.newpipe.database.AppDatabase
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.extractor.stream.StreamType
 import org.schabi.newpipe.testUtil.TestDatabase
 import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
-import java.util.concurrent.TimeUnit
 
 class LocalPlaylistManagerTest {
 
@@ -20,9 +18,6 @@ class LocalPlaylistManagerTest {
     @get:Rule
     val trampolineScheduler = TrampolineSchedulerRule()
 
-    @get:Rule
-    val timeout = Timeout(1, TimeUnit.SECONDS)
-
     @Before
     fun setup() {
         database = TestDatabase.createReplacingNewPipeDatabase()

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsBVDLeakCanary.java

@@ -0,0 +1,20 @@
+package org.schabi.newpipe.settings;
+
+import android.content.Intent;
+
+import leakcanary.LeakCanary;
+
+/**
+ * Build variant dependent (BVD) leak canary API implementation for the debug settings fragment.
+ * This class is loaded via reflection by
+ * {@link DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI}.
+ */
+@SuppressWarnings("unused") // Class is used but loaded via reflection
+public class DebugSettingsBVDLeakCanary
+        implements DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI {
+
+    @Override
+    public Intent getNewLeakDisplayActivityIntent() {
+        return LeakCanary.INSTANCE.newLeakDisplayActivityIntent();
+    }
+}