Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
533
Issue boards
Milestones
Wiki
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
76d91bdd
Commit
76d91bdd
authored
8 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
TV: Prevent crash on update
parent
ecd08bfa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
+6
-5
6 additions, 5 deletions
vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
with
6 additions
and
5 deletions
vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
+
6
−
5
View file @
76d91bdd
...
...
@@ -103,7 +103,7 @@ public class MainTvActivity extends BaseTvActivity implements OnItemViewSelected
private
Handler
mHandler
=
new
Handler
();
protected
BrowseFragment
mBrowseFragment
;
private
ProgressBar
mProgressBar
;
private
final
ArrayObjectAdapter
mRowsAdapter
=
n
ew
ArrayObjectAdapter
(
new
ListRowPresenter
())
;
private
ArrayObjectAdapter
mRowsAdapter
=
n
ull
;
private
ArrayObjectAdapter
mVideoAdapter
,
mCategoriesAdapter
,
mHistoryAdapter
,
mBrowserAdapter
,
mOtherAdapter
;
private
View
mRootContainer
;
private
final
SimpleArrayMap
<
String
,
Integer
>
mVideoIndex
=
new
SimpleArrayMap
<>(),
mHistoryIndex
=
new
SimpleArrayMap
<>();
...
...
@@ -162,7 +162,7 @@ public class MainTvActivity extends BaseTvActivity implements OnItemViewSelected
/*
* skip browser and show directly Audio Player if a song is playing
*/
if
(
mRowsAdapter
.
size
()
==
0
&&
Permissions
.
canReadStorage
())
if
(
(
mRowsAdapter
==
null
||
mRowsAdapter
.
size
()
==
0
)
&&
Permissions
.
canReadStorage
())
update
();
else
{
updateBrowsers
();
...
...
@@ -365,7 +365,9 @@ public class MainTvActivity extends BaseTvActivity implements OnItemViewSelected
protected
void
onPreExecute
()
{
showHistory
=
mSettings
.
getBoolean
(
PreferencesFragment
.
PLAYBACK_HISTORY
,
true
);
mRowsAdapter
.
clear
();
if
(
mRowsAdapter
!=
null
)
mRowsAdapter
.
clear
();
mRowsAdapter
=
new
ArrayObjectAdapter
(
new
ListRowPresenter
());
mProgressBar
.
setVisibility
(
View
.
VISIBLE
);
mHistoryIndex
.
clear
();
...
...
@@ -439,8 +441,7 @@ public class MainTvActivity extends BaseTvActivity implements OnItemViewSelected
mOtherAdapter
.
add
(
new
CardPresenter
.
SimpleCard
(
ID_ABOUT
,
getString
(
R
.
string
.
about
),
getString
(
R
.
string
.
app_name_full
)+
" "
+
BuildConfig
.
VERSION_NAME
,
R
.
drawable
.
ic_tv_icon_small
));
mOtherAdapter
.
add
(
new
CardPresenter
.
SimpleCard
(
ID_LICENCE
,
getString
(
R
.
string
.
licence
),
R
.
drawable
.
ic_tv_icon_small
));
mRowsAdapter
.
add
(
new
ListRow
(
miscHeader
,
mOtherAdapter
));
if
(
mBrowseFragment
.
getAdapter
()
==
null
)
mBrowseFragment
.
setAdapter
(
mRowsAdapter
);
mBrowseFragment
.
setAdapter
(
mRowsAdapter
);
mProgressBar
.
setVisibility
(
View
.
GONE
);
if
(
askRefresh
)
{
//in case new event occurred while loading view
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment