Merge pull request #3 from daneren2005/edge

5.4.3

13 files changed, 116 insertions, 48 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4c492eaa..e9bd19e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
 		applicationId "github.daneren2005.dsub"
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 199
-		versionName '5.4.2'
+		versionCode 200
+		versionName '5.4.3'
 		setProperty("archivesBaseName", "DSub $versionName")
 		resConfigs "de", "es", "fr", "hu", "nl", "pt-rPT", "ru", "sv"
 	}
diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml
index 0708a47e..d148a0b2 100644
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -5,7 +5,8 @@
     <application android:label="@string/common.appname"
          android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
          android:icon="@drawable/launch"
-         android:theme="@style/Theme.DSub.Light">
+         android:theme="@style/Theme.DSub.Light"
+         android:largeHeap="true">
 
         <meta-data
             android:name="com.google.android.backup.api_key"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06f79977..cfc70a55 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
     <application android:label="@string/common.appname"
     	android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
     	android:icon="@drawable/launch"
-    	android:theme="@style/Theme.DSub.Light">
+    	android:theme="@style/Theme.DSub.Light"
+		android:largeHeap="true">
     	
         <uses-library android:name="android.test.runner" />
 
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
index a1c5ceef..5948064d 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -144,7 +144,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 		applyTheme();
 		applyFullscreen();
 		super.onCreate(bundle);
-		startService(new Intent(this, DownloadService.class));
+		DownloadService.startService(this);
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
 		if(getIntent().hasExtra(Constants.FRAGMENT_POSITION)) {
@@ -1003,7 +1003,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 				break;
 			}
 			Log.w(TAG, "DownloadService not running. Attempting to start it.");
-			startService(new Intent(this, DownloadService.class));
+			DownloadService.startService(this);
 			Util.sleepQuietly(50L);
 		}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java b/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java
index 041eb8e1..ebf50936 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java
+++ b/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java
@@ -33,7 +33,7 @@ public class HeadphonePlugReceiver extends BroadcastReceiver {
 			if(headphoneState == 1 && Util.shouldStartOnHeadphones(context)) {
 				Intent start = new Intent(context, DownloadService.class);
 				start.setAction(DownloadService.START_PLAY);
-				context.startService(start);
+				DownloadService.startService(context, start);
 			}
 		}
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java b/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
index 8119ef2d..0f050801 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
+++ b/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
@@ -45,7 +45,7 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver {
 
         Intent serviceIntent = new Intent(context, DownloadService.class);
         serviceIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
-        context.startService(serviceIntent);
+        DownloadService.startService(context, serviceIntent);
         if (isOrderedBroadcast()) {
 			try {
 				abortBroadcast();
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java b/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java
index 2c04d829..aa3b9173 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java
+++ b/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java
@@ -40,7 +40,7 @@ public class PlayActionReceiver extends BroadcastReceiver {
 			start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR, data.getString(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR));
 			start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, data.getString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE));
 			start.putExtra(Constants.PREFERENCES_KEY_OFFLINE, data.getInt(Constants.PREFERENCES_KEY_OFFLINE));
-			context.startService(start);
+			DownloadService.startService(context, start);
 		}
 	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java b/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
index d4e544c6..e4edabc4 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
@@ -524,7 +524,7 @@ public class AutoMediaBrowserService extends MediaBrowserService {
 
 	public void getDownloadService() {
 		if(DownloadService.getInstance() == null) {
-			startService(new Intent(this, DownloadService.class));
+			DownloadService.startService(this);
 		}
 
 		waitForDownloadService();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
index a4ca705c..6c3cfbd7 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -71,6 +71,7 @@ import java.util.TimerTask;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.app.Service;
 import android.content.ComponentCallbacks2;
 import android.content.ComponentName;
@@ -273,7 +274,7 @@ public class DownloadService extends Service {
 		wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, this.getClass().getName());
 		wakeLock.setReferenceCounted(false);
 
-		WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+		WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 		wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, "downloadServiceLock");
 
 		try {
@@ -291,6 +292,10 @@ public class DownloadService extends Service {
 		shufflePlayBuffer = new ShufflePlayBuffer(this);
 		artistRadioBuffer = new ArtistRadioBuffer(this);
 		lifecycleSupport.onCreate();
+
+		if(Build.VERSION.SDK_INT >= 26) {
+			Notifications.shutGoogleUpNotification(this);
+		}
 	}
 
 	@Override
@@ -375,6 +380,17 @@ public class DownloadService extends Service {
 		Notifications.hideDownloadingNotification(this, this, handler);
 	}
 
+	public static void startService(Context context) {
+		startService(context, new Intent(context, DownloadService.class));
+	}
+	public static void startService(Context context, Intent intent) {
+		PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+		if (Build.VERSION.SDK_INT < 26 || (powerManager != null && powerManager.isIgnoringBatteryOptimizations(intent.getPackage()))) {
+			context.startService(intent);
+		} else {
+			context.startForegroundService(intent);
+		}
+	}
 	public static DownloadService getInstance() {
 		return instance;
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
index f0bd6766..59341ebf 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
@@ -51,6 +51,7 @@ public final class Notifications {
 	// Notification IDs.
 	public static final int NOTIFICATION_ID_PLAYING = 100;
 	public static final int NOTIFICATION_ID_DOWNLOADING = 102;
+	public static final int NOTIFICATION_ID_SHUT_GOOGLE_UP = 103;
 	public static final String NOTIFICATION_SYNC_GROUP = "github.daneren2005.dsub.sync";
 
 	private static boolean playShowing = false;
@@ -447,6 +448,23 @@ public final class Notifications {
 		return downloadingChannel;
 	}
 
+	@TargetApi(Build.VERSION_CODES.O)
+	public static void shutGoogleUpNotification(final DownloadService downloadService) {
+		// On Android O+, service crashes if startForeground isn't called within 5 seconds of starting
+		getDownloadingNotificationChannel(downloadService);
+
+		NotificationCompat.Builder builder;
+		builder = new NotificationCompat.Builder(downloadService)
+				.setSmallIcon(android.R.drawable.stat_sys_download)
+				.setContentTitle(downloadService.getResources().getString(R.string.download_downloading_title, 0))
+				.setContentText(downloadService.getResources().getString(R.string.download_downloading_summary, "Temp"))
+				.setChannelId("downloading-channel");
+
+		final Notification notification = builder.build();
+		downloadService.startForeground(NOTIFICATION_ID_SHUT_GOOGLE_UP, notification);
+		downloadService.stopForeground(true);
+	}
+
 	public static void showSyncNotification(final Context context, int stringId, String extra) {
 		showSyncNotification(context, stringId, extra, null);
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java
index 93004a48..5699cdf9 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -19,6 +19,9 @@ package github.daneren2005.dsub.util;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.support.annotation.RequiresApi;
 import android.support.annotation.StringRes;
 import android.support.v7.app.AlertDialog;
 import android.content.ClipboardManager;
@@ -113,6 +116,7 @@ public final class Util {
 	public static final String AVRCP_METADATA_CHANGED = "com.android.music.metachanged";
 
 	private static OnAudioFocusChangeListener focusListener;
+	private static AudioFocusRequest audioFocusRequest;
 	private static boolean pauseFocus = false;
 	private static boolean lowerFocus = false;
 
@@ -1324,43 +1328,68 @@ public final class Util {
     
     @TargetApi(8)
 	public static void requestAudioFocus(final Context context) {
-    	if (Build.VERSION.SDK_INT >= 8 && focusListener == null) {
+    	if(Build.VERSION.SDK_INT >= 26) {
+    		if(audioFocusRequest == null) {
+				final AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+
+				AudioAttributes playbackAttributes = new AudioAttributes.Builder()
+						.setUsage(AudioAttributes.USAGE_MEDIA)
+						.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+						.build();
+
+				audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+						.setAudioAttributes(playbackAttributes)
+						.setOnAudioFocusChangeListener(getAudioFocusChangeListener(context, audioManager))
+						.build();
+				audioManager.requestAudioFocus(audioFocusRequest);
+			}
+		} else if (Build.VERSION.SDK_INT >= 8 && focusListener == null) {
     		final AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-    		audioManager.requestAudioFocus(focusListener = new OnAudioFocusChangeListener() {
-				public void onAudioFocusChange(int focusChange) {
-					DownloadService downloadService = (DownloadService)context;
-					if((focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT || focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) && !downloadService.isRemoteEnabled()) {
-						if(downloadService.getPlayerState() == PlayerState.STARTED) {
-							Log.i(TAG, "Temporary loss of focus");
-							SharedPreferences prefs = getPreferences(context);
-							int lossPref = Integer.parseInt(prefs.getString(Constants.PREFERENCES_KEY_TEMP_LOSS, "1"));
-							if(lossPref == 2 || (lossPref == 1 && focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK)) {
-								lowerFocus = true;
-								downloadService.setVolume(0.1f);
-							} else if(lossPref == 0 || (lossPref == 1 && focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT)) {
-								pauseFocus = true;
-								downloadService.pause(true);
-							}
-						}
-					} else if (focusChange == AudioManager.AUDIOFOCUS_GAIN) {
-						if(pauseFocus) {
-							pauseFocus = false;
-							downloadService.start();
-						}
-						if(lowerFocus) {
-							lowerFocus = false;
-							downloadService.setVolume(1.0f);
+    		audioManager.requestAudioFocus(focusListener = getAudioFocusChangeListener(context, audioManager), AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
+    	}
+    }
+
+    private static OnAudioFocusChangeListener getAudioFocusChangeListener(final Context context, final AudioManager audioManager) {
+		return new OnAudioFocusChangeListener() {
+			public void onAudioFocusChange(int focusChange) {
+				DownloadService downloadService = (DownloadService)context;
+				if((focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT || focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) && !downloadService.isRemoteEnabled()) {
+					if(downloadService.getPlayerState() == PlayerState.STARTED) {
+						Log.i(TAG, "Temporary loss of focus");
+						SharedPreferences prefs = getPreferences(context);
+						int lossPref = Integer.parseInt(prefs.getString(Constants.PREFERENCES_KEY_TEMP_LOSS, "1"));
+						if(lossPref == 2 || (lossPref == 1 && focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK)) {
+							lowerFocus = true;
+							downloadService.setVolume(0.1f);
+						} else if(lossPref == 0 || (lossPref == 1 && focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT)) {
+							pauseFocus = true;
+							downloadService.pause(true);
 						}
-					} else if(focusChange == AudioManager.AUDIOFOCUS_LOSS && !downloadService.isRemoteEnabled()) {
-						Log.i(TAG, "Permanently lost focus");
-						focusListener = null;
-						downloadService.pause();
+					}
+				} else if (focusChange == AudioManager.AUDIOFOCUS_GAIN) {
+					if(pauseFocus) {
+						pauseFocus = false;
+						downloadService.start();
+					}
+					if(lowerFocus) {
+						lowerFocus = false;
+						downloadService.setVolume(1.0f);
+					}
+				} else if(focusChange == AudioManager.AUDIOFOCUS_LOSS && !downloadService.isRemoteEnabled()) {
+					Log.i(TAG, "Permanently lost focus");
+					focusListener = null;
+					downloadService.pause();
+
+					if(audioFocusRequest != null && Build.VERSION.SDK_INT >= 26) {
+						audioManager.abandonAudioFocusRequest(audioFocusRequest);
+						audioFocusRequest = null;
+					} else {
 						audioManager.abandonAudioFocus(this);
 					}
 				}
-			}, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
-    	}
-    }
+			}
+		};
+	}
 
 	public static void abandonAudioFocus(Context context) {
 		if(focusListener != null) {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java
index 9f1d5ebd..1229d024 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java
@@ -315,9 +315,9 @@ public class RemoteControlClientLP extends RemoteControlClientBase {
 				SearchResult results = musicService.search(searchCritera, downloadService, null);
 
 				if(results.hasArtists()) {
-					playFromParent(new Entry(results.getArtists().get(0)));
+					playFromParent(new Entry(results.getArtists().get(0)), true);
 				} else if(results.hasAlbums()) {
-					playFromParent(results.getAlbums().get(0));
+					playFromParent(results.getAlbums().get(0), false);
 				} else if(results.hasSongs()) {
 					playSong(results.getSongs().get(0));
 				} else {
@@ -327,10 +327,10 @@ public class RemoteControlClientLP extends RemoteControlClientBase {
 				return null;
 			}
 
-			private void playFromParent(Entry parent) throws Exception {
+			private void playFromParent(Entry parent, boolean shuffle) throws Exception {
 				List<Entry> songs = new ArrayList<>();
 				getSongsRecursively(parent, songs);
-				playSongs(songs);
+				playSongs(songs, shuffle, false, false);
 			}
 			private void getSongsRecursively(Entry parent, List<Entry> songs) throws Exception {
 				MusicDirectory musicDirectory;
@@ -421,7 +421,7 @@ public class RemoteControlClientLP extends RemoteControlClientBase {
 	}
 
 	private void playSong(Entry entry) {
-
+		playSong(entry, false);
 	}
 	private void playSong(Entry entry, boolean resumeFromBookmark) {
 		List<Entry> entries = new ArrayList<>();
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 516ab142..42e62e1d 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="5.4.3" versioncode="200" releasedate="09/11/2018">
+		<change>Fix more issues from targeting Android O</change>
+	</release>
 	<release version="5.4.2" versioncode="199" releasedate="08/23/2018">
 		<change>Implement notification channels</change>
 		<change>Fix lockscreen back/forward controls rewinding/fast forwarding instead</change>