release locks in player on stop

segler-alex · May 11, 2016 · 30fd193 · 30fd193
1 parent aeaece7
commit 30fd193
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/PlayerService.java b/app/src/main/java/net/programmierecke/radiodroid2/PlayerService.java
@@ -262,6 +262,8 @@ public void onCreate() {
 				wifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
 			}
 			wifiLock.setReferenceCounted(false);
+		}else{
+			Log.e(TAG,"could not aquire wifi lock");
 		}
 	}
 
@@ -307,14 +309,8 @@ public void SendMessage(String theTitle, String theMessage, String theTicker) {
 
 	@Override
 	public void onDestroy() {
+		Log.i(TAG,"onDestroy()");
 		Stop();
-		stopForeground(true);
-		wakeLock.release();
-		wakeLock = null;
-		if (wifiLock != null) {
-			wifiLock.release();
-			wifiLock = null;
-		}
 	}
 
 	public void PlayUrl(String theURL, String theName, String theID) {
@@ -437,6 +433,7 @@ public void streamStopped() {
 	}
 
 	public void Stop() {
+		Log.i(TAG,"stop()");
 		if (itsMediaPlayer != null) {
 			if (itsMediaPlayer.isPlaying()) {
 				itsMediaPlayer.stop();
@@ -455,5 +452,14 @@ public void Stop() {
 		clearTimer();
 		stopForeground(true);
 		sendBroadCast(PLAYER_SERVICE_STATUS_UPDATE);
+
+		if (wakeLock != null) {
+			wakeLock.release();
+			wakeLock = null;
+		}
+		if (wifiLock != null) {
+			wifiLock.release();
+			wifiLock = null;
+		}
 	}
 }