mirror of
https://github.com/libre-tube/LibreTube.git
synced 2024-12-15 06:40:30 +05:30
Cleanup link handling in router activity
This commit is contained in:
parent
7a2f97de6d
commit
f9a25738cd
@ -18,8 +18,8 @@ class RouterActivity : BaseActivity() {
|
|||||||
// start processing the given text
|
// start processing the given text
|
||||||
handleSendText(Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT)!!))
|
handleSendText(Uri.parse(intent.getStringExtra(Intent.EXTRA_TEXT)!!))
|
||||||
} else if (intent.data != null) {
|
} else if (intent.data != null) {
|
||||||
val uri = intent.data
|
// link shared as text to the app
|
||||||
handleSendText(uri!!)
|
handleSendText(intent.data!!)
|
||||||
} else {
|
} else {
|
||||||
// start app as normal if unknown action, shouldn't be reachable
|
// start app as normal if unknown action, shouldn't be reachable
|
||||||
NavigationHelper.restartMainActivity(this)
|
NavigationHelper.restartMainActivity(this)
|
||||||
@ -30,6 +30,8 @@ class RouterActivity : BaseActivity() {
|
|||||||
* Resolve the uri and return a bundle with the arguments
|
* Resolve the uri and return a bundle with the arguments
|
||||||
*/
|
*/
|
||||||
private fun resolveType(intent: Intent, uri: Uri): Intent {
|
private fun resolveType(intent: Intent, uri: Uri): Intent {
|
||||||
|
val channelNamePaths = listOf("/c/", "/user/")
|
||||||
|
val videoPaths = listOf("/shorts/", "/embed/", "/v/", "/live/")
|
||||||
when {
|
when {
|
||||||
uri.path!!.contains("/channel/") -> {
|
uri.path!!.contains("/channel/") -> {
|
||||||
val channelId = uri.path!!
|
val channelId = uri.path!!
|
||||||
@ -37,10 +39,12 @@ class RouterActivity : BaseActivity() {
|
|||||||
|
|
||||||
intent.putExtra(IntentData.channelId, channelId)
|
intent.putExtra(IntentData.channelId, channelId)
|
||||||
}
|
}
|
||||||
uri.path!!.contains("/c/") || uri.path!!.contains("/user/") -> {
|
channelNamePaths.any { uri.path!!.contains(it) } -> {
|
||||||
val channelName = uri.path!!
|
var channelName = uri.path!!
|
||||||
.replace("/c/", "")
|
|
||||||
.replace("/user/", "")
|
channelNamePaths.forEach {
|
||||||
|
channelName = channelName.replace(it, "")
|
||||||
|
}
|
||||||
|
|
||||||
intent.putExtra(IntentData.channelName, channelName)
|
intent.putExtra(IntentData.channelName, channelName)
|
||||||
}
|
}
|
||||||
@ -49,18 +53,17 @@ class RouterActivity : BaseActivity() {
|
|||||||
|
|
||||||
intent.putExtra(IntentData.playlistId, playlistId)
|
intent.putExtra(IntentData.playlistId, playlistId)
|
||||||
}
|
}
|
||||||
uri.path!!.contains("/shorts/") ||
|
videoPaths.any { uri.path!!.contains(it) } -> {
|
||||||
uri.path!!.contains("/embed/") ||
|
var videoId = uri.path!!
|
||||||
uri.path!!.contains("/v/") ||
|
|
||||||
uri.path!!.contains("/live/")
|
videoPaths.forEach {
|
||||||
-> {
|
videoId = videoId.replace(it, "")
|
||||||
val videoId = uri.path!!
|
}
|
||||||
.replace("/shorts/", "")
|
|
||||||
.replace("/v/", "")
|
|
||||||
.replace("/embed/", "")
|
|
||||||
.replace("/live/", "")
|
|
||||||
|
|
||||||
intent.putExtra(IntentData.videoId, videoId)
|
intent.putExtra(IntentData.videoId, videoId)
|
||||||
|
|
||||||
|
uri.getQueryParameter("t")
|
||||||
|
?.let { intent.putExtra(IntentData.timeStamp, it.toTimeInSeconds()) }
|
||||||
}
|
}
|
||||||
uri.path!!.contains("/watch") && uri.query != null -> {
|
uri.path!!.contains("/watch") && uri.query != null -> {
|
||||||
val videoId = uri.getQueryParameter("v")
|
val videoId = uri.getQueryParameter("v")
|
||||||
|
Loading…
Reference in New Issue
Block a user