From 0f691ee65becd0b64479d3d01409333b08bbf4bd Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Sat, 18 May 2024 17:34:42 -0600 Subject: [PATCH] tasker: remove Can't do this right now, lifecycle is broken. --- CHANGELOG.md | 7 +- app/build.gradle | 3 - app/src/main/AndroidManifest.xml | 12 --- .../java/org/oxycblt/auxio/tasker/Start.kt | 76 ------------------- 4 files changed, 5 insertions(+), 93 deletions(-) delete mode 100644 app/src/main/java/org/oxycblt/auxio/tasker/Start.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e669761a..3907a19ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,10 @@ #### What's New - Android Auto support - Full media browser implementation -- Service can now operate independently of app -- Added basic tasker plugin #### What's Improved - Album covers are now loaded on a per-song basis +- Correctly interpret MP4 sort tags #### What's Fixed - Fixed repeat mode not restoring on startup @@ -18,6 +17,10 @@ - For the time being, the media notification will not follow Album Covers or 1:1 Covers settings - Playback will close automatically after some time left idle +#### dev -> dev1 changes +- Re-added ability to open app from clicking on notification +- Removed tasker plugin + ## 3.4.3 #### What's Improved diff --git a/app/build.gradle b/app/build.gradle index 8071688a0..f5bf46f91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -151,9 +151,6 @@ dependencies { // Speed dial implementation "com.leinardi.android:speed-dial:3.3.0" - // Tasker - implementation 'com.joaomgcd:taskerpluginlibrary:0.4.10' - // Testing debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' testImplementation "junit:junit:4.13.2" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d5c61525b..960d2c8ae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -135,17 +135,5 @@ android:resource="@xml/widget_info" /> - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt b/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt deleted file mode 100644 index 9e27486c6..000000000 --- a/app/src/main/java/org/oxycblt/auxio/tasker/Start.kt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2024 Auxio Project - * Start.kt is part of Auxio. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.oxycblt.auxio.tasker - -import android.app.Activity -import android.content.Context -import android.content.Intent -import android.os.Bundle -import androidx.core.content.ContextCompat -import com.joaomgcd.taskerpluginlibrary.action.TaskerPluginRunnerActionNoOutputOrInput -import com.joaomgcd.taskerpluginlibrary.config.TaskerPluginConfig -import com.joaomgcd.taskerpluginlibrary.config.TaskerPluginConfigHelperNoOutputOrInput -import com.joaomgcd.taskerpluginlibrary.config.TaskerPluginConfigNoInput -import com.joaomgcd.taskerpluginlibrary.input.TaskerInput -import com.joaomgcd.taskerpluginlibrary.runner.TaskerPluginResult -import com.joaomgcd.taskerpluginlibrary.runner.TaskerPluginResultSucess -import org.oxycblt.auxio.AuxioService - -private var serviceRunning = false - -fun indicateServiceRunning() { - serviceRunning = true -} - -fun indicateServiceStopped() { - serviceRunning = false -} - -class StartActionHelper(config: TaskerPluginConfig) : - TaskerPluginConfigHelperNoOutputOrInput(config) { - override val runnerClass: Class - get() = StartActionRunner::class.java - - override fun addToStringBlurb(input: TaskerInput, blurbBuilder: StringBuilder) { - blurbBuilder.append( - "Starts the Auxio Service. This will block until the service is fully initialized." + - "You must start active playback/foreground state after this or Auxio may" + - "crash.") - } -} - -class StartConfigBasicAction : Activity(), TaskerPluginConfigNoInput { - override val context: Context - get() = applicationContext - - private val taskerHelper by lazy { StartActionHelper(this) } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - taskerHelper.finishForTasker() - } -} - -class StartActionRunner : TaskerPluginRunnerActionNoOutputOrInput() { - override fun run(context: Context, input: TaskerInput): TaskerPluginResult { - ContextCompat.startForegroundService(context, Intent(context, AuxioService::class.java)) - while (!serviceRunning) {} - return TaskerPluginResultSucess() - } -}