diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 000000000..94b83ee4a
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,16 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+app/src/main/jnilibs/
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
deleted file mode 100644
index 447a68251..000000000
--- a/android/AndroidManifest.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/apk/make-unsigned-apk.sh b/android/apk/make-unsigned-apk.sh
deleted file mode 100755
index 3bc4009fe..000000000
--- a/android/apk/make-unsigned-apk.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-S=`dirname "$0"`
-ANDROID_ABI=$1
-STRIP=$2
-ZIP=$3
-UNSIGNED_APK=$4
-LIBMPD_SO=$5
-CLASSES_DEX=$6
-RESOURCES_APK=$7
-D=`dirname "$UNSIGNED_APK"`
-
-rm -rf "$D/apk"
-mkdir -p "$D/apk/lib/$ANDROID_ABI"
-
-"$STRIP" "$LIBMPD_SO" -o "$D/apk/lib/$ANDROID_ABI/`basename $LIBMPD_SO`"
-cp "$CLASSES_DEX" "$D/apk/"
-cp "$RESOURCES_APK" "$UNSIGNED_APK"
-
-cd "$D/apk"
-exec zip -q -r -X "../`basename $UNSIGNED_APK`" .
diff --git a/android/apk/meson.build b/android/apk/meson.build
index 0ee395852..72fefa102 100644
--- a/android/apk/meson.build
+++ b/android/apk/meson.build
@@ -1,58 +1,13 @@
-unsigned_apk = custom_target(
- 'mpd-unsigned.apk',
- output: 'mpd-unsigned.apk',
- input: [mpd, classes_dex, resources_apk[0]],
+android_abi = get_option('android_abi')
+
+mpd_so = custom_target(
+ 'libmpd.so',
+ output: 'libmpd.so',
+ input: mpd,
command: [
- join_paths(meson.current_source_dir(), 'make-unsigned-apk.sh'),
- android_abi,
- get_option('android_strip'),
- zip,
- '@OUTPUT0@',
+ 'cp',
'@INPUT@',
+ join_paths(meson.current_source_dir(), '../app/src/main/jnilibs/', android_abi),
],
+ build_by_default: true
)
-
-aligned_apk = custom_target(
- 'mpd-aligned.apk',
- output: 'mpd-aligned.apk',
- input: unsigned_apk,
- command: [
- android_zipalign,
- '-f', '4',
- '@INPUT@', '@OUTPUT@',
- ],
-)
-
-if get_option('android_debug_keystore') != ''
- debug_apk = custom_target(
- 'mpd-debug.apk',
- output: 'mpd-debug.apk',
- input: aligned_apk,
- command: [
- android_apksigner, 'sign',
- '--in', '@INPUT@',
- '--out', '@OUTPUT@',
- '--debuggable-apk-permitted',
- '-ks', get_option('android_debug_keystore'),
- '--ks-key-alias', 'androiddebugkey',
- '--ks-pass', 'pass:android',
- ],
- build_by_default: true
- )
-endif
-
-if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != ''
- unaligned_apk = custom_target(
- 'mpd.apk',
- output: 'mpd.apk',
- input: aligned_apk,
- command: [
- android_apksigner, 'sign',
- '--in', '@INPUT@',
- '--out', '@OUTPUT@',
- '-ks', get_option('android_keystore'),
- '--ks-key-alias', get_option('android_keyalias'),
- '--ks-pass', 'pass:' + get_option('android_keypass'),
- ],
- )
-endif
diff --git a/android/app/.gitignore b/android/app/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/android/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
new file mode 100644
index 000000000..f6fdbf5a8
--- /dev/null
+++ b/android/app/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+ id("com.android.application")
+}
+
+android {
+ namespace = "org.musicpd"
+ compileSdk = 34
+
+ defaultConfig {
+ applicationId = "org.musicpd"
+ minSdk = 24
+ targetSdk = 30
+ versionCode = 1
+ versionName = "1.0"
+ }
+
+ buildFeatures {
+ aidl = true
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+}
+
+dependencies {
+ implementation("androidx.appcompat:appcompat:1.6.1")
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d35d06883
--- /dev/null
+++ b/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/src/IMain.aidl b/android/app/src/main/aidl/org/musicpd/IMain.aidl
similarity index 100%
rename from android/src/IMain.aidl
rename to android/app/src/main/aidl/org/musicpd/IMain.aidl
diff --git a/android/src/IMainCallback.aidl b/android/app/src/main/aidl/org/musicpd/IMainCallback.aidl
similarity index 100%
rename from android/src/IMainCallback.aidl
rename to android/app/src/main/aidl/org/musicpd/IMainCallback.aidl
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 000000000..9c27e1a7c
Binary files /dev/null and b/android/app/src/main/ic_launcher-playstore.png differ
diff --git a/android/src/Bridge.java b/android/app/src/main/java/org/musicpd/Bridge.java
similarity index 100%
rename from android/src/Bridge.java
rename to android/app/src/main/java/org/musicpd/Bridge.java
diff --git a/android/src/Loader.java b/android/app/src/main/java/org/musicpd/Loader.java
similarity index 100%
rename from android/src/Loader.java
rename to android/app/src/main/java/org/musicpd/Loader.java
diff --git a/android/src/Main.java b/android/app/src/main/java/org/musicpd/Main.java
similarity index 97%
rename from android/src/Main.java
rename to android/app/src/main/java/org/musicpd/Main.java
index 0076e55aa..e943a6089 100644
--- a/android/src/Main.java
+++ b/android/app/src/main/java/org/musicpd/Main.java
@@ -23,11 +23,14 @@ import android.os.RemoteException;
import android.util.Log;
import android.widget.RemoteViews;
+import androidx.core.app.ServiceCompat;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
public class Main extends Service implements Runnable {
private static final String TAG = "Main";
+ private static final String WAKELOCK_TAG = "mpd:wakelockmain";
private static final String REMOTE_ERROR = "MPD process was killed";
private static final int MAIN_STATUS_ERROR = -1;
private static final int MAIN_STATUS_STOPPED = 0;
@@ -198,7 +201,7 @@ public class Main extends Service implements Runnable {
mainIntent.setAction("android.intent.action.MAIN");
mainIntent.addCategory("android.intent.category.LAUNCHER");
final PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
- mainIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+ mainIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Notification.Builder nBuilder;
if (Build.VERSION.SDK_INT >= 26 /* Build.VERSION_CODES.O */)
@@ -262,7 +265,7 @@ public class Main extends Service implements Runnable {
private void setWakelockEnabled(boolean enabled) {
if (enabled && mWakelock == null) {
PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
- mWakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+ mWakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG);
mWakelock.acquire();
Log.d(TAG, "Wakelock acquired");
} else if (!enabled && mWakelock != null) {
diff --git a/android/src/Receiver.java b/android/app/src/main/java/org/musicpd/Receiver.java
similarity index 100%
rename from android/src/Receiver.java
rename to android/app/src/main/java/org/musicpd/Receiver.java
diff --git a/android/src/Settings.java b/android/app/src/main/java/org/musicpd/Settings.java
similarity index 100%
rename from android/src/Settings.java
rename to android/app/src/main/java/org/musicpd/Settings.java
diff --git a/android/app/src/main/res/drawable/ic_banner_foreground.xml b/android/app/src/main/res/drawable/ic_banner_foreground.xml
new file mode 100644
index 000000000..42bded022
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_banner_foreground.xml
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+
+
+
+
+
+