Skip to content
Snippets Groups Projects
Commit a761d60a authored by persi-persu's avatar persi-persu
Browse files

Allow UPnP folders to be added as favorites on TV

Apply suggestion to vlc-android/src/org/videolan/vlc/gui/tv/browser/VerticalGridActivity.kt
parent 70c8954e
No related branches found
No related tags found
1 merge request!221Allow UPnP folders to be added as favorites on TV
Pipeline #9131 passed with stage
in 27 minutes and 34 seconds
......@@ -69,6 +69,7 @@ class VerticalGridActivity : BaseTvActivity(), BrowserActivityInterface {
if (uri == null) uri = intent.getParcelableExtra(KEY_URI)
val item = if (uri == null) null else MLServiceLocator.getAbstractMediaWrapper(uri)
if (item != null && intent.hasExtra(FAVORITE_TITLE)) item.title = intent.getStringExtra(FAVORITE_TITLE)
fragment = FileBrowserTvFragment.newInstance(TYPE_NETWORK, item)
} else if (type == HEADER_DIRECTORIES) {
......
......@@ -123,6 +123,7 @@ const val CATEGORY = "category"
const val ITEM = "item"
const val KEY_GROUP = "key_group"
const val KEY_FOLDER = "key_folder"
const val FAVORITE_TITLE = "favorite_title"
// Items updates
const val UPDATE_SELECTION = 0
......
......@@ -294,7 +294,8 @@ object FileUtils {
val scheme = mw.uri.scheme
return (TextUtils.equals(scheme, "file") || TextUtils.equals(scheme, "smb")
|| TextUtils.equals(scheme, "nfs") || TextUtils.equals(scheme, "ftp")
|| TextUtils.equals(scheme, "ftps") || TextUtils.equals(scheme, "sftp"))
|| TextUtils.equals(scheme, "ftps") || TextUtils.equals(scheme, "sftp")
|| TextUtils.equals(scheme, "upnp"))
}
@WorkerThread
......
......@@ -219,6 +219,7 @@ class MainTvModel(app: Application) : AndroidViewModel(app), AbstractMedialibrar
item.type == AbstractMediaWrapper.TYPE_DIR -> {
val intent = Intent(activity, VerticalGridActivity::class.java)
intent.putExtra(MainTvActivity.BROWSER_TYPE, if ("file" == item.uri.scheme) HEADER_DIRECTORIES else HEADER_NETWORK)
intent.putExtra(FAVORITE_TITLE, item.title)
intent.data = item.uri
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
activity.startActivity(intent)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment