Merge branch 'bootfix' of https://github.com/DDRBoxman/MPD

MusicPlayerDaemon · Dec 27, 2023 · bd408cd · bd408cd
2 parents a4c7041 + 3d8e285
commit bd408cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_9
+        targetCompatibility = JavaVersion.VERSION_1_9
     }
 }
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -44,6 +44,9 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
         </receiver>
 
         <service

diff --git a/android/app/src/main/java/org/musicpd/Receiver.java b/android/app/src/main/java/org/musicpd/Receiver.java
@@ -8,11 +8,19 @@
 import android.content.Intent;
 import android.util.Log;
 
+import java.util.Set;
+
 public class Receiver extends BroadcastReceiver {
+
+	private static final Set<String> BOOT_ACTIONS = Set.of(
+			"android.intent.action.BOOT_COMPLETED",
+			"android.intent.action.QUICKBOOT_POWERON"
+	);
+
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		Log.d("Receiver", "onReceive: " + intent);
-		if (intent.getAction() == "android.intent.action.BOOT_COMPLETED") {
+		if (BOOT_ACTIONS.contains(intent.getAction())) {
 			if (Settings.Preferences.getBoolean(context,
 							    Settings.Preferences.KEY_RUN_ON_BOOT,
 							    false)) {