Change: use in-app youtube player only if official youtube app is onl…

…y detected app
luk1337 · Feb 5, 2022 · 4fdb714 · 4fdb714
1 parent 88f4101
commit 4fdb714
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/data/framework/android/src/main/AndroidManifest.xml b/data/framework/android/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <queries>
         <package android:name="com.google.android.youtube" />
         <package android:name="com.vanced.android.youtube" />
+        <package android:name="org.schabi.newpipe" />
 
         <package android:name="com.google.android.apps.authenticator2" />
         <package android:name="com.authy.authy" />

diff --git a/...oid/src/main/kotlin/io/github/wykopmobilny/domain/navigation/android/AndroidAppGateway.kt b/...oid/src/main/kotlin/io/github/wykopmobilny/domain/navigation/android/AndroidAppGateway.kt
@@ -77,6 +77,7 @@ private fun knownAppId(app: ExternalApp) =
     when (app) {
         YoutubeApp.Official -> "com.google.android.youtube"
         YoutubeApp.Vanced -> "com.vanced.android.youtube"
+        YoutubeApp.NewPipe -> "org.schabi.newpipe"
         AuthenticatorApp.Google -> "com.google.android.apps.authenticator2"
         AuthenticatorApp.Microsoft -> "com.azure.authenticator"
         AuthenticatorApp.Authy -> "com.authy.authy"

diff --git a/data/framework/api/src/main/kotlin/io/github/wykopmobilny/domain/navigation/AppGateway.kt b/data/framework/api/src/main/kotlin/io/github/wykopmobilny/domain/navigation/AppGateway.kt
@@ -16,6 +16,7 @@ sealed interface ExternalApp
 enum class YoutubeApp : ExternalApp {
     Official,
     Vanced,
+    NewPipe,
 }
 
 enum class AuthenticatorApp : ExternalApp {

diff --git a/domain/src/main/kotlin/io/github/wykopmobilny/domain/settings/prefs/GetMediaPreferences.kt b/domain/src/main/kotlin/io/github/wykopmobilny/domain/settings/prefs/GetMediaPreferences.kt
@@ -30,7 +30,8 @@ internal class GetMediaPreferences @Inject constructor(
         appStorage.get(UserSettings.useYoutubePlayer)
             .flatMapLatest { savedValue ->
                 if (savedValue == null) {
-                    appGateway.getInstalledYoutubeApps().map { it.contains(YoutubeApp.Official) }
+                    appGateway.getInstalledYoutubeApps()
+                        .map { apps -> apps.singleOrNull() == YoutubeApp.Official }
                 } else {
                     flowOf(savedValue)
                 }