fix: video links dont open on android 10 and below

libre-tube · May 1, 2024 · 6b82d95 · 6b82d95
1 parent d40e4eb
commit 6b82d95
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -3,6 +3,7 @@ package com.github.libretube.ui.activities
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.Menu
@@ -438,20 +439,29 @@ class MainActivity : BaseActivity() {
                 .show(supportFragmentManager, null)
         }
         intent?.getStringExtra(IntentData.videoId)?.let {
-            // the bottom navigation bar has to be created before opening the video
-            // otherwise the player layout measures aren't calculated properly
-            // and the miniplayer is opened at a closed state and overlapping the navigation bar
-            binding.bottomNav.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    NavigationHelper.navigateVideo(
-                        context = this@MainActivity,
-                        videoUrlOrId = it,
-                        timestamp = intent.getLongExtra(IntentData.timeStamp, 0L)
-                    )
-
-                    binding.bottomNav.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                }
-            })
+            // the below explained work around only seems to work on Android 11 and above
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                // the bottom navigation bar has to be created before opening the video
+                // otherwise the player layout measures aren't calculated properly
+                // and the miniplayer is opened at a closed state and overlapping the navigation bar
+                binding.bottomNav.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
+                    override fun onGlobalLayout() {
+                        NavigationHelper.navigateVideo(
+                            context = this@MainActivity,
+                            videoUrlOrId = it,
+                            timestamp = intent.getLongExtra(IntentData.timeStamp, 0L)
+                        )
+
+                        binding.bottomNav.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    }
+                })
+            } else {
+                NavigationHelper.navigateVideo(
+                    context = this@MainActivity,
+                    videoUrlOrId = it,
+                    timestamp = intent.getLongExtra(IntentData.timeStamp, 0L)
+                )
+            }
         }
         intent?.getStringExtra(IntentData.query)?.let {
             savedSearchQuery = it