Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
532
Issue boards
Milestones
Wiki
Code
Merge requests
12
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
3cc432a6
Commit
3cc432a6
authored
9 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Not need for intent broadcast for dialog progress
parent
10737125
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/VLCApplication.java
+3
-4
3 additions, 4 deletions
vlc-android/src/org/videolan/vlc/VLCApplication.java
vlc-android/src/org/videolan/vlc/gui/dialogs/VlcProgressDialog.java
+2
-27
2 additions, 27 deletions
...d/src/org/videolan/vlc/gui/dialogs/VlcProgressDialog.java
with
5 additions
and
31 deletions
vlc-android/src/org/videolan/vlc/VLCApplication.java
+
3
−
4
View file @
3cc432a6
...
...
@@ -27,7 +27,6 @@ import android.content.res.Configuration;
import
android.content.res.Resources
;
import
android.preference.PreferenceManager
;
import
android.support.v4.app.DialogFragment
;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.support.v4.util.SimpleArrayMap
;
import
android.util.Log
;
...
...
@@ -65,7 +64,6 @@ public class VLCApplication extends Application {
new
LinkedBlockingQueue
<
Runnable
>());
private
static
int
sDialogCounter
=
0
;
LocalBroadcastManager
mLocalBroadcastManager
;
@Override
public
void
onCreate
()
{
...
...
@@ -191,7 +189,6 @@ public class VLCApplication extends Application {
public
void
onDisplay
(
Dialog
.
ProgressDialog
dialog
)
{
String
key
=
DialogActivity
.
KEY_PROGRESS
+
sDialogCounter
++;
fireDialog
(
dialog
,
key
);
mLocalBroadcastManager
=
LocalBroadcastManager
.
getInstance
(
instance
);
}
@Override
...
...
@@ -201,7 +198,9 @@ public class VLCApplication extends Application {
@Override
public
void
onProgressUpdate
(
Dialog
.
ProgressDialog
dialog
)
{
mLocalBroadcastManager
.
sendBroadcast
(
new
Intent
(
VlcProgressDialog
.
ACTION_PROGRESS
));
VlcProgressDialog
vlcProgressDialog
=
(
VlcProgressDialog
)
dialog
.
getContext
();
if
(
vlcProgressDialog
!=
null
&&
vlcProgressDialog
.
isVisible
())
vlcProgressDialog
.
updateProgress
();
}
};
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/gui/dialogs/VlcProgressDialog.java
+
2
−
27
View file @
3cc432a6
...
...
@@ -24,12 +24,6 @@
package
org.videolan.vlc.gui.dialogs
;
import
android.content.BroadcastReceiver
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.IntentFilter
;
import
android.os.Bundle
;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.text.TextUtils
;
import
android.view.View
;
...
...
@@ -39,34 +33,15 @@ import org.videolan.vlc.databinding.VlcProgressDialogBinding;
public
class
VlcProgressDialog
extends
VlcDialog
<
Dialog
.
ProgressDialog
,
VlcProgressDialogBinding
>
{
public
static
final
String
ACTION_PROGRESS
=
"vlc_progress"
;
LocalBroadcastManager
mLocalBroadcastManager
;
@Override
int
getLayout
()
{
return
R
.
layout
.
vlc_progress_dialog
;
}
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
mLocalBroadcastManager
=
LocalBroadcastManager
.
getInstance
(
getContext
());
mLocalBroadcastManager
.
registerReceiver
(
mProgressReceiver
,
new
IntentFilter
(
ACTION_PROGRESS
));
}
@Override
public
void
onDestroy
()
{
super
.
onDestroy
();
mLocalBroadcastManager
.
unregisterReceiver
(
mProgressReceiver
);
}
private
final
BroadcastReceiver
mProgressReceiver
=
new
BroadcastReceiver
()
{
@Override
public
void
onReceive
(
Context
context
,
Intent
intent
)
{
public
void
updateProgress
()
{
mBinding
.
progress
.
setProgress
((
int
)
(
mVlcDialog
.
getPosition
()*
100
));
mBinding
.
cancel
.
setText
(
mVlcDialog
.
getCancelText
());
mBinding
.
cancel
.
setVisibility
(
TextUtils
.
isEmpty
(
mVlcDialog
.
getCancelText
())
?
View
.
GONE
:
View
.
VISIBLE
);
}
};
}
}
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