antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TEST - Removed wakelock manager from service

Browse source
This commit is contained in:
CappielloAntonio 2021-08-10 12:51:48 +02:00
parent 62fb57736a
commit b54e3588ba
2 changed files with 12 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/java/com/cappielloantonio/play/service/MusicService.java
View file

@ -71,11 +71,9 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
public static final int TRACK_STARTED = 9;
public static final int TRACK_CHANGED = 1;
public static final int TRACK_ENDED = 2;
public static final int RELEASE_WAKELOCK = 0;
public static final int PLAY_SONG = 3;
public static final int PREPARE_NEXT = 4;
public static final int SET_POSITION = 5;
public static final int LOAD_QUEUE = 9;
private static final long MEDIA_SESSION_ACTIONS = PlaybackStateCompat.ACTION_PLAY
| PlaybackStateCompat.ACTION_PAUSE
@ -93,7 +91,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
private int position = -1;
private int nextPosition = -1;
private boolean notHandledMetaChangedForCurrentTrack;
private boolean queuesRestored;
private PlayingNotification playingNotification;
private final BroadcastReceiver becomingNoisyReceiver = new BroadcastReceiver() {
@ -105,7 +102,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
}
};
private MediaSessionCompat mediaSession;
private PowerManager.WakeLock wakeLock;
private PlaybackHandler playerHandler;
private Handler uiThreadHandler;
private ThrottledSeekHandler throttledSeekHandler;
@ -116,10 +112,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
public void onCreate() {
super.onCreate();
final PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
wakeLock.setReferenceCounted(false);
playback = new MultiPlayer(this);
playback.setCallbacks(this);
@ -251,7 +243,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
mediaSession.setActive(false);
quit();
releaseResources();
wakeLock.release();
}
@Override
@ -274,28 +265,24 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
}
private void restoreState() {
if (!queuesRestored && playingQueue.isEmpty()) {
QueueRepository queueRepository = new QueueRepository(App.getInstance());
List<Song> restoredQueue = queueRepository.getSongs();
QueueRepository queueRepository = new QueueRepository(App.getInstance());
List<Song> restoredQueue = queueRepository.getSongs();
int restoredPosition = PreferenceUtil.getInstance(getApplicationContext()).getPosition();
int restoredPositionInTrack = PreferenceUtil.getInstance(getApplicationContext()).getProgress();
int restoredPosition = PreferenceUtil.getInstance(getApplicationContext()).getPosition();
int restoredPositionInTrack = PreferenceUtil.getInstance(getApplicationContext()).getProgress();
if (restoredQueue.size() > 0 && restoredPosition != -1) {
this.playingQueue = restoredQueue;
if (restoredQueue.size() > 0 && restoredPosition != -1) {
this.playingQueue = restoredQueue;
position = restoredPosition;
openCurrent();
position = restoredPosition;
openCurrent();
if (restoredPositionInTrack > 0) seek(restoredPositionInTrack);
if (restoredPositionInTrack > 0) seek(restoredPositionInTrack);
notHandledMetaChangedForCurrentTrack = true;
handleChangeInternal(META_CHANGED);
handleChangeInternal(QUEUE_CHANGED);
}
notHandledMetaChangedForCurrentTrack = true;
handleChangeInternal(META_CHANGED);
handleChangeInternal(QUEUE_CHANGED);
}
queuesRestored = true;
}
private void quit() {
@ -588,15 +575,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
return playback.getDuration();
}
public long getQueueDurationMillis(int position) {
long duration = 0;
for (int i = position + 1; i < playingQueue.size(); i++) {
duration += playingQueue.get(i).getDuration();
}
return duration;
}
public int seek(int millis) {
synchronized (this) {
playback.setProgress(millis);
@ -644,12 +622,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
return mediaSession;
}
public void releaseWakeLock() {
if (wakeLock.isHeld()) {
wakeLock.release();
}
}
private void increaseSongCount() {
SongRepository songRepository = new SongRepository(App.getInstance());
songRepository.scrobble(getCurrentSong().getId());
@ -721,12 +693,6 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
} else {
service.playNextSong();
}
sendEmptyMessage(RELEASE_WAKELOCK);
break;
case RELEASE_WAKELOCK:
service.releaseWakeLock();
break;
case PLAY_SONG:

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
View file

@ -131,10 +131,6 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
if (pageState != -1) {
MusicPlayerRemote.playSongAt(position);
pageState = -1;
// TODO: Soluzione termporanea e non totalmente funzionante al problema del cambio colore
// TODO: |_ delle righe delle canzoni già riprodotte
playerSongQueueAdapter.notifyDataSetChanged();
}
}
});