tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update intent actions

Browse source
This commit is contained in:
dkanada 2020-10-19 22:29:35 +09:00
commit 5c965cfbd1
10 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java
View file

@ -59,7 +59,7 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver {
if (DEBUG) Log.v(TAG, "Handling headset click, count = " + clickCount);
switch (clickCount) {
case 1:
command = MusicService.ACTION_TOGGLE_PAUSE;
command = MusicService.ACTION_TOGGLE;
break;
case 2:
command = MusicService.ACTION_SKIP;
@ -115,7 +115,7 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver {
break;
case KeyEvent.KEYCODE_HEADSETHOOK:
case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
command = MusicService.ACTION_TOGGLE_PAUSE;
command = MusicService.ACTION_TOGGLE;
break;
case KeyEvent.KEYCODE_MEDIA_NEXT:
command = MusicService.ACTION_SKIP;

64
app/src/main/java/com/dkanada/gramophone/service/MusicService.java
View file

@ -69,29 +69,29 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
public static final String PHONOGRAPH_PACKAGE_NAME = "com.dkanada.gramophone";
public static final String PACKAGE_NAME = "com.dkanada.gramophone";
public static final String ACTION_TOGGLE_PAUSE = PHONOGRAPH_PACKAGE_NAME + ".togglepause";
public static final String ACTION_PLAY = PHONOGRAPH_PACKAGE_NAME + ".play";
public static final String ACTION_PLAY_PLAYLIST = PHONOGRAPH_PACKAGE_NAME + ".play.playlist";
public static final String ACTION_PAUSE = PHONOGRAPH_PACKAGE_NAME + ".pause";
public static final String ACTION_STOP = PHONOGRAPH_PACKAGE_NAME + ".stop";
public static final String ACTION_SKIP = PHONOGRAPH_PACKAGE_NAME + ".skip";
public static final String ACTION_REWIND = PHONOGRAPH_PACKAGE_NAME + ".rewind";
public static final String ACTION_QUIT = PHONOGRAPH_PACKAGE_NAME + ".quitservice";
public static final String ACTION_PENDING_QUIT = PHONOGRAPH_PACKAGE_NAME + ".pendingquitservice";
public static final String INTENT_EXTRA_PLAYLIST = PHONOGRAPH_PACKAGE_NAME + ".intentextra.playlist";
public static final String INTENT_EXTRA_SHUFFLE_MODE = PHONOGRAPH_PACKAGE_NAME + ".intentextra.shufflemode";
public static final String ACTION_TOGGLE = PACKAGE_NAME + ".toggle";
public static final String ACTION_PLAY = PACKAGE_NAME + ".play";
public static final String ACTION_PLAY_PLAYLIST = PACKAGE_NAME + ".play.playlist";
public static final String ACTION_PAUSE = PACKAGE_NAME + ".pause";
public static final String ACTION_STOP = PACKAGE_NAME + ".stop";
public static final String ACTION_SKIP = PACKAGE_NAME + ".skip";
public static final String ACTION_REWIND = PACKAGE_NAME + ".rewind";
public static final String ACTION_QUIT = PACKAGE_NAME + ".quit";
public static final String ACTION_PENDING_QUIT = PACKAGE_NAME + ".quit.pending";
public static final String INTENT_EXTRA_PLAYLIST = PACKAGE_NAME + ".extra.playlist";
public static final String INTENT_EXTRA_SHUFFLE = PACKAGE_NAME + ".extra.shuffle";
public static final String APP_WIDGET_UPDATE = PHONOGRAPH_PACKAGE_NAME + ".appwidgetupdate";
public static final String EXTRA_APP_WIDGET_NAME = PHONOGRAPH_PACKAGE_NAME + "app_widget_name";
public static final String INTENT_EXTRA_WIDGET_UPDATE = PACKAGE_NAME + ".extra.widget.update";
public static final String INTENT_EXTRA_WIDGET_NAME = PACKAGE_NAME + ".extra.widget.name";
public static final String META_CHANGED = PHONOGRAPH_PACKAGE_NAME + ".metachanged";
public static final String QUEUE_CHANGED = PHONOGRAPH_PACKAGE_NAME + ".queuechanged";
public static final String PLAY_STATE_CHANGED = PHONOGRAPH_PACKAGE_NAME + ".playstatechanged";
public static final String META_CHANGED = PACKAGE_NAME + ".meta.changed";
public static final String QUEUE_CHANGED = PACKAGE_NAME + ".queue.changed";
public static final String STATE_CHANGED = PACKAGE_NAME + ".state.changed";
public static final String REPEAT_MODE_CHANGED = PHONOGRAPH_PACKAGE_NAME + ".repeatmodechanged";
public static final String SHUFFLE_MODE_CHANGED = PHONOGRAPH_PACKAGE_NAME + ".shufflemodechanged";
public static final String REPEAT_MODE_CHANGED = PACKAGE_NAME + ".repeat.changed";
public static final String SHUFFLE_MODE_CHANGED = PACKAGE_NAME + ".shuffle.changed";
public static final int RELEASE_WAKELOCK = 0;
public static final int TRACK_ENDED = 1;
@ -162,7 +162,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private final BroadcastReceiver widgetIntentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(final Context context, final Intent intent) {
final String command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME);
final String command = intent.getStringExtra(INTENT_EXTRA_WIDGET_NAME);
final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
switch (command) {
@ -217,7 +217,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
progressHandler = new ProgressHandler(this, Looper.myLooper());
throttledSeekHandler = new ThrottledSeekHandler(playerHandler);
registerReceiver(widgetIntentReceiver, new IntentFilter(APP_WIDGET_UPDATE));
registerReceiver(widgetIntentReceiver, new IntentFilter(INTENT_EXTRA_WIDGET_UPDATE));
registerReceiver(becomingNoisyReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
PreferenceUtil.getInstance(this).registerOnSharedPreferenceChangedListener(this);
@ -293,7 +293,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
restoreQueuesAndPositionIfNecessary();
String action = intent.getAction();
switch (action) {
case ACTION_TOGGLE_PAUSE:
case ACTION_TOGGLE:
if (isPlaying()) {
pause();
} else {
@ -308,7 +308,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
break;
case ACTION_PLAY_PLAYLIST:
Playlist playlist = intent.getParcelableExtra(INTENT_EXTRA_PLAYLIST);
int shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, getShuffleMode());
int shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE, getShuffleMode());
if (playlist != null) {
List<Song> playlistSongs = new ArrayList<>();
if (!playlistSongs.isEmpty()) {
@ -791,7 +791,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
pausedByTransientLossOfFocus = false;
if (playback.isPlaying()) {
playback.pause();
notifyChange(PLAY_STATE_CHANGED);
notifyChange(STATE_CHANGED);
}
}
@ -808,7 +808,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
notHandledMetaChangedForCurrentTrack = false;
}
notifyChange(PLAY_STATE_CHANGED);
notifyChange(STATE_CHANGED);
// fixes a bug where the volume would stay ducked because the AudioManager.AUDIOFOCUS_GAIN event is not sent
playerHandler.removeMessages(DUCK);
@ -957,7 +957,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private void handleChangeInternal(@NonNull final String what) {
switch (what) {
case PLAY_STATE_CHANGED:
case STATE_CHANGED:
updateNotification();
updateMediaSessionPlaybackState();
if (!isPlaying()) saveProgress();
@ -1016,7 +1016,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
@Override
public void onTrackStarted() {
progressHandler.sendEmptyMessage(PLAY_SONG);
notifyChange(PLAY_STATE_CHANGED);
notifyChange(STATE_CHANGED);
prepareNext();
}
@ -1083,7 +1083,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
if (service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
service.pause();
service.seek(0);
service.notifyChange(PLAY_STATE_CHANGED);
service.notifyChange(STATE_CHANGED);
} else {
service.position = service.nextPosition;
service.prepareNextImpl();
@ -1095,7 +1095,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
service.progressHandler.sendEmptyMessage(TRACK_ENDED);
// if there is a timer finished, don't continue
if (service.pendingQuit || service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
service.notifyChange(PLAY_STATE_CHANGED);
service.notifyChange(STATE_CHANGED);
service.seek(0);
if (service.pendingQuit) {
service.pendingQuit = false;
@ -1117,12 +1117,12 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
service.progressHandler.sendEmptyMessage(PLAY_SONG);
service.playSongAtImpl(msg.arg1);
// notification progress needs to be reset
service.notifyChange(PLAY_STATE_CHANGED);
service.notifyChange(STATE_CHANGED);
break;
case SET_POSITION:
service.openTrackAndPrepareNextAt(msg.arg1);
service.notifyChange(PLAY_STATE_CHANGED);
service.notifyChange(STATE_CHANGED);
break;
case PREPARE_NEXT:
@ -1193,7 +1193,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
@Override
public void run() {
notifyChange(PLAY_STATE_CHANGED);
notifyChange(STATE_CHANGED);
}
}

2
app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
View file

@ -175,7 +175,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
notificationLayoutBig.setOnClickPendingIntent(R.id.action_prev, pendingIntent);
// toggle play and pause
pendingIntent = buildPendingIntent(service, MusicService.ACTION_TOGGLE_PAUSE, serviceName);
pendingIntent = buildPendingIntent(service, MusicService.ACTION_TOGGLE, serviceName);
notificationLayout.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent);
notificationLayoutBig.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent);

4
app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
View file

@ -26,7 +26,7 @@ import com.dkanada.gramophone.util.PreferenceUtil;
import static com.dkanada.gramophone.service.MusicService.ACTION_REWIND;
import static com.dkanada.gramophone.service.MusicService.ACTION_SKIP;
import static com.dkanada.gramophone.service.MusicService.ACTION_TOGGLE_PAUSE;
import static com.dkanada.gramophone.service.MusicService.ACTION_TOGGLE;
public class PlayingNotificationImpl24 extends PlayingNotification {
@ -76,7 +76,7 @@ public class PlayingNotificationImpl24 extends PlayingNotification {
bitmap = BitmapFactory.decodeResource(service.getResources(), R.drawable.default_album_art);
NotificationCompat.Action playPauseAction = new NotificationCompat.Action(playButtonResId,
service.getString(R.string.action_play_pause),
retrievePlaybackAction(ACTION_TOGGLE_PAUSE));
retrievePlaybackAction(ACTION_TOGGLE));
NotificationCompat.Action previousAction = new NotificationCompat.Action(R.drawable.ic_skip_previous_white_24dp,
service.getString(R.string.action_previous),
retrievePlaybackAction(ACTION_REWIND));

2
app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
View file

@ -52,7 +52,7 @@ public class AppShortcutLauncherActivity extends Activity {
Bundle bundle = new Bundle();
bundle.putParcelable(MusicService.INTENT_EXTRA_PLAYLIST, playlist);
bundle.putInt(MusicService.INTENT_EXTRA_SHUFFLE_MODE, shuffleMode);
bundle.putInt(MusicService.INTENT_EXTRA_SHUFFLE, shuffleMode);
intent.putExtras(bundle);

4
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java
View file

@ -76,7 +76,7 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
musicStateReceiver = new MusicStateReceiver(this);
final IntentFilter filter = new IntentFilter();
filter.addAction(MusicService.PLAY_STATE_CHANGED);
filter.addAction(MusicService.STATE_CHANGED);
filter.addAction(MusicService.SHUFFLE_MODE_CHANGED);
filter.addAction(MusicService.REPEAT_MODE_CHANGED);
filter.addAction(MusicService.META_CHANGED);
@ -173,7 +173,7 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
case MusicService.QUEUE_CHANGED:
activity.onQueueChanged();
break;
case MusicService.PLAY_STATE_CHANGED:
case MusicService.STATE_CHANGED:
activity.onPlayStateChanged();
break;
case MusicService.REPEAT_MODE_CHANGED:

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
View file

@ -153,7 +153,7 @@ public class AppWidgetAlbum extends BaseAppWidget {
views.setOnClickPendingIntent(R.id.button_prev, pendingIntent);
// Play and pause
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE_PAUSE, serviceName);
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE, serviceName);
views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent);
// Next track

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
View file

@ -165,7 +165,7 @@ public class AppWidgetCard extends BaseAppWidget {
views.setOnClickPendingIntent(R.id.button_prev, pendingIntent);
// Play and pause
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE_PAUSE, serviceName);
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE, serviceName);
views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent);
// Next track

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
View file

@ -158,7 +158,7 @@ public class AppWidgetClassic extends BaseAppWidget {
views.setOnClickPendingIntent(R.id.button_prev, pendingIntent);
// Play and pause
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE_PAUSE, serviceName);
pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE, serviceName);
views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent);
// Next track

6
app/src/main/java/com/dkanada/gramophone/widgets/BaseAppWidget.java
View file

@ -33,8 +33,8 @@ public abstract class BaseAppWidget extends AppWidgetProvider {
public void onUpdate(final Context context, final AppWidgetManager appWidgetManager,
final int[] appWidgetIds) {
defaultAppWidget(context, appWidgetIds);
final Intent updateIntent = new Intent(MusicService.APP_WIDGET_UPDATE);
updateIntent.putExtra(MusicService.EXTRA_APP_WIDGET_NAME, NAME);
final Intent updateIntent = new Intent(MusicService.INTENT_EXTRA_WIDGET_UPDATE);
updateIntent.putExtra(MusicService.INTENT_EXTRA_WIDGET_NAME, NAME);
updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
context.sendBroadcast(updateIntent);
@ -46,7 +46,7 @@ public abstract class BaseAppWidget extends AppWidgetProvider {
*/
public void notifyChange(final MusicService service, final String what) {
if (hasInstances(service)) {
if (MusicService.META_CHANGED.equals(what) || MusicService.PLAY_STATE_CHANGED.equals(what)) {
if (MusicService.META_CHANGED.equals(what) || MusicService.STATE_CHANGED.equals(what)) {
performUpdate(service, null);
}
}