summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2024-03-10 10:16:13 +0100
committerGitHub <noreply@github.com>2024-03-10 10:16:13 +0100
commitbaa58ac17f43b61e90e7091c148aabbd095f831b (patch)
tree96cbdfaa6bb203e47240a2ea0193517d814fcf6e /core
parent095a6b3e9d7125bf2686e3510bd4cb2031c72da5 (diff)
downloadAntennaPod-baa58ac17f43b61e90e7091c148aabbd095f831b.zip
Remove wearable support library (#6978)
The library is the last one requiring Jetifier and we only use 3 string constants in that whole library anyway.
Diffstat (limited to 'core')
-rw-r--r--core/build.gradle4
-rw-r--r--core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java17
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java (renamed from core/src/play/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java)7
3 files changed, 3 insertions, 25 deletions
diff --git a/core/build.gradle b/core/build.gradle
index b864c4455..b36d87129 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -67,10 +67,6 @@ dependencies {
implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
- // Non-free dependencies:
- playApi "com.google.android.support:wearable:$wearableSupportVersion"
- compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
-
testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "org.awaitility:awaitility:$awaitilityVersion"
testImplementation "junit:junit:$junitVersion"
diff --git a/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java b/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
deleted file mode 100644
index 5998a1e2f..000000000
--- a/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.danoeh.antennapod.core.service.playback;
-
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
-
-class WearMediaSession {
- /**
- * Take a custom action builder and add no extras, because this is not the Play version of the app.
- */
- static void addWearExtrasToAction(PlaybackStateCompat.CustomAction.Builder actionBuilder) {
- // no-op
- }
-
- static void mediaSessionSetExtraForWear(MediaSessionCompat mediaSession) {
- // no-op
- }
-}
diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
index 47881da0b..854562e2c 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.core.service.playback;
import android.os.Bundle;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.wearable.media.MediaControlConstants;
public class WearMediaSession {
/**
@@ -12,14 +11,14 @@ public class WearMediaSession {
*/
static void addWearExtrasToAction(PlaybackStateCompat.CustomAction.Builder actionBuilder) {
Bundle actionExtras = new Bundle();
- actionExtras.putBoolean(MediaControlConstants.EXTRA_CUSTOM_ACTION_SHOW_ON_WEAR, true);
+ actionExtras.putBoolean("android.support.wearable.media.extra.CUSTOM_ACTION_SHOW_ON_WEAR", true);
actionBuilder.setExtras(actionExtras);
}
static void mediaSessionSetExtraForWear(MediaSessionCompat mediaSession) {
Bundle sessionExtras = new Bundle();
- sessionExtras.putBoolean(MediaControlConstants.EXTRA_RESERVE_SLOT_SKIP_TO_PREVIOUS, false);
- sessionExtras.putBoolean(MediaControlConstants.EXTRA_RESERVE_SLOT_SKIP_TO_NEXT, false);
+ sessionExtras.putBoolean("android.support.wearable.media.extra.RESERVE_SLOT_SKIP_TO_PREVIOUS", false);
+ sessionExtras.putBoolean("android.support.wearable.media.extra.RESERVE_SLOT_SKIP_TO_NEXT", false);
mediaSession.setExtras(sessionExtras);
}
}