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

Removed ignore deprecation annotation from the MusicService class

Browse source
This commit is contained in:
Karim Abou Zeid 2015-09-05 10:09:50 +02:00
commit 0e940be79f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -58,7 +58,6 @@ import java.util.List;
/** /**
* @author Karim Abou Zeid (kabouzeid), Andrew Neal * @author Karim Abou Zeid (kabouzeid), Andrew Neal
*/ */
@SuppressWarnings("deprecation")
public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener { public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener {
public static final String TAG = MusicService.class.getSimpleName(); public static final String TAG = MusicService.class.getSimpleName();
@ -79,7 +78,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
public static final String PLAY_STATE_CHANGED = "com.kabouzeid.gramophone.playstatechanged"; public static final String PLAY_STATE_CHANGED = "com.kabouzeid.gramophone.playstatechanged";
public static final String REPEAT_MODE_CHANGED = "com.kabouzeid.gramophone.repeatmodechanged"; public static final String REPEAT_MODE_CHANGED = "com.kabouzeid.gramophone.repeatmodechanged";
public static final String SHUFFLE_MODE_CHANGED = "com.kabouzeid.gramophone.shufflemodechanged"; public static final String SHUFFLE_MODE_CHANGED = "com.kabouzeid.gramophone.shufflemodechanged";
public static final String MEDIA_STORE_CHANGED = "com.kabouzeid.gramophone.mediastorechanged"; public static final String MEDIA_STORE_CHANGED = "com.kabouzeid.gramophone.mediastorechanged";
public static final String SAVED_POSITION = "POSITION"; public static final String SAVED_POSITION = "POSITION";
@ -113,6 +111,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private boolean receiversAndRemoteControlClientRegistered; private boolean receiversAndRemoteControlClientRegistered;
private PlayingNotificationHelper playingNotificationHelper; private PlayingNotificationHelper playingNotificationHelper;
private AudioManager audioManager; private AudioManager audioManager;
@SuppressWarnings("deprecation")
private RemoteControlClient remoteControlClient; private RemoteControlClient remoteControlClient;
private PowerManager.WakeLock wakeLock; private PowerManager.WakeLock wakeLock;
private MusicPlayerHandler playerHandler; private MusicPlayerHandler playerHandler;
@ -194,6 +193,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private void registerReceiversAndRemoteControlClient() { private void registerReceiversAndRemoteControlClient() {
if (!receiversAndRemoteControlClientRegistered) { if (!receiversAndRemoteControlClientRegistered) {
registerReceiver(becomingNoisyReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)); registerReceiver(becomingNoisyReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
//noinspection deprecation
getAudioManager().registerMediaButtonEventReceiver(new ComponentName(getApplicationContext(), MediaButtonIntentReceiver.class)); getAudioManager().registerMediaButtonEventReceiver(new ComponentName(getApplicationContext(), MediaButtonIntentReceiver.class));
initRemoteControlClient(); initRemoteControlClient();
receiversAndRemoteControlClientRegistered = true; receiversAndRemoteControlClientRegistered = true;
@ -292,7 +292,9 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private void unregisterReceiversAndRemoteControlClient() { private void unregisterReceiversAndRemoteControlClient() {
if (receiversAndRemoteControlClientRegistered) { if (receiversAndRemoteControlClientRegistered) {
unregisterReceiver(becomingNoisyReceiver); unregisterReceiver(becomingNoisyReceiver);
//noinspection deprecation
getAudioManager().unregisterRemoteControlClient(remoteControlClient); getAudioManager().unregisterRemoteControlClient(remoteControlClient);
//noinspection deprecation
getAudioManager().unregisterMediaButtonEventReceiver(new ComponentName(getApplicationContext(), MediaButtonIntentReceiver.class)); getAudioManager().unregisterMediaButtonEventReceiver(new ComponentName(getApplicationContext(), MediaButtonIntentReceiver.class));
receiversAndRemoteControlClientRegistered = false; receiversAndRemoteControlClientRegistered = false;
} }