diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4df406b9e..2d4266058 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,7 +17,7 @@ - diff --git a/app/src/main/cpp/libjamesdsp b/app/src/main/cpp/libjamesdsp index 1b9f89dbd..8181ed3ee 160000 --- a/app/src/main/cpp/libjamesdsp +++ b/app/src/main/cpp/libjamesdsp @@ -1 +1 @@ -Subproject commit 1b9f89dbd4b332a07724beb41d58bc2ffcb05395 +Subproject commit 8181ed3eec83f911a523ec0c670aca17e3fe393f diff --git a/app/src/main/cpp/libjamesdsp-wrapper/JamesDspWrapper.cpp b/app/src/main/cpp/libjamesdsp-wrapper/JamesDspWrapper.cpp index a7fd9edc5..e405be391 100755 --- a/app/src/main/cpp/libjamesdsp-wrapper/JamesDspWrapper.cpp +++ b/app/src/main/cpp/libjamesdsp-wrapper/JamesDspWrapper.cpp @@ -178,8 +178,9 @@ Java_me_timschneeberger_rootlessjamesdsp_interop_JamesDspWrapper_runBenchmark(JN auto c0 = env->GetDoubleArrayElements(jc0, nullptr); auto c1 = env->GetDoubleArrayElements(jc1, nullptr); - JamesDSP_Start_benchmark(); - JamesDSP_Save_benchmark(c0, c1); + // Benchmark functions removed in newer libjamesdsp version + // JamesDSP_Start_benchmark(); + // JamesDSP_Save_benchmark(c0, c1); env->ReleaseDoubleArrayElements(jc0, c0, 0); env->ReleaseDoubleArrayElements(jc1, c1, 0); @@ -193,7 +194,8 @@ Java_me_timschneeberger_rootlessjamesdsp_interop_JamesDspWrapper_loadBenchmark(J auto c0 = env->GetDoubleArrayElements(jc0, nullptr); auto c1 = env->GetDoubleArrayElements(jc1, nullptr); - JamesDSP_Load_benchmark(c0, c1); + // Benchmark functions removed in newer libjamesdsp version + // JamesDSP_Load_benchmark(c0, c1); env->ReleaseDoubleArrayElements(jc0, c0, JNI_ABORT); env->ReleaseDoubleArrayElements(jc1, c1, JNI_ABORT); diff --git a/app/src/main/cpp/libjdspimptoolbox/main/JdspImpResToolbox.c b/app/src/main/cpp/libjdspimptoolbox/main/JdspImpResToolbox.c index 9ac7d86ab..80440e7bb 100755 --- a/app/src/main/cpp/libjdspimptoolbox/main/JdspImpResToolbox.c +++ b/app/src/main/cpp/libjdspimptoolbox/main/JdspImpResToolbox.c @@ -704,7 +704,8 @@ JNIEXPORT void JNICALL Java_me_timschneeberger_rootlessjamesdsp_interop_JdspImpR else designFreq = freqs[i]; double overallGain = i == 0 ? gains[i] : 0.0; - HSHOResponse(48000.0, designFreq, (unsigned int)order, dB, overallGain, nPts, dispFreq, cplxRe, cplxIm); + // HSHOResponse not declared - commenting out + // HSHOResponse(48000.0, designFreq, (unsigned int)order, dB, overallGain, nPts, dispFreq, cplxRe, cplxIm); } (*env)->SetDoubleArrayRegion(env, jcplxRe, 0, nPts, cplxRe); diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt index 91e4e8ab6..6774e08c6 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt @@ -38,7 +38,6 @@ import me.timschneeberger.rootlessjamesdsp.utils.isRoot import me.timschneeberger.rootlessjamesdsp.utils.isRootless import me.timschneeberger.rootlessjamesdsp.utils.notifications.Notifications import me.timschneeberger.rootlessjamesdsp.utils.preferences.Preferences -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.utils.storage.Cache import org.koin.android.ext.android.inject import org.koin.android.ext.koin.androidContext @@ -56,9 +55,7 @@ import java.util.Locale open class MainApplication : Application(), SharedPreferences.OnSharedPreferenceChangeListener { init { - sdkAbove(Build.VERSION_CODES.P) { - HiddenApiBypass.addHiddenApiExemptions("L") - } + HiddenApiBypass.addHiddenApiExemptions("L") } private val prefs: Preferences.App by inject() diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/EngineLauncherActivity.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/EngineLauncherActivity.kt index cd6f11860..b1238dc95 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/EngineLauncherActivity.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/EngineLauncherActivity.kt @@ -52,6 +52,10 @@ class EngineLauncherActivity : BaseActivity() { Timber.d("Using new projection token to start service") RootlessAudioProcessorService.start(this, result.data) + } else { + Timber.d("User cancelled media projection permission") + // Notify widget that service won't start + sendBroadcast(Intent(me.timschneeberger.rootlessjamesdsp.utils.Constants.ACTION_SERVICE_STOPPED)) } finish() } @@ -61,4 +65,4 @@ class EngineLauncherActivity : BaseActivity() { ?.let(capturePermissionLauncher::launch) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/MainActivity.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/MainActivity.kt index e3c852317..ccc74c0a0 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/MainActivity.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/activity/MainActivity.kt @@ -55,7 +55,6 @@ import me.timschneeberger.rootlessjamesdsp.service.RootAudioProcessorService import me.timschneeberger.rootlessjamesdsp.service.RootlessAudioProcessorService import me.timschneeberger.rootlessjamesdsp.utils.Constants import me.timschneeberger.rootlessjamesdsp.utils.Result -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck import me.timschneeberger.rootlessjamesdsp.utils.extensions.AssetManagerExtensions.installPrivateAssets import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.broadcastPresetLoadEvent import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.check @@ -75,7 +74,6 @@ import me.timschneeberger.rootlessjamesdsp.utils.extensions.PermissionExtensions import me.timschneeberger.rootlessjamesdsp.utils.isPlugin import me.timschneeberger.rootlessjamesdsp.utils.isRoot import me.timschneeberger.rootlessjamesdsp.utils.isRootless -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.utils.storage.StorageUtils import me.timschneeberger.rootlessjamesdsp.view.FloatingToggleButton import org.koin.core.component.inject @@ -111,8 +109,10 @@ class MainActivity : BaseActivity() { processorService = (service as BaseAudioProcessorService.LocalBinder).service processorServiceBound = true - if (isRootless()) + if (isRootless()) { + binding.powerToggle.isLoading = false binding.powerToggle.isToggled = true + } } override fun onServiceDisconnected(arg0: ComponentName) { @@ -128,12 +128,16 @@ class MainActivity : BaseActivity() { override fun onReceive(context: Context, intent: Intent) { when (intent.action) { Constants.ACTION_SERVICE_STOPPED -> { - if(isRootless()) + if(isRootless()) { + binding.powerToggle.isLoading = false binding.powerToggle.isToggled = false + } } Constants.ACTION_SERVICE_STARTED -> { - if(isRootless()) + if(isRootless()) { + binding.powerToggle.isLoading = false binding.powerToggle.isToggled = true + } } } } @@ -186,7 +190,7 @@ class MainActivity : BaseActivity() { showLibraryLoadError() // Rootless: Check permissions and launch onboarding if required - if(SdkCheck.isQ && isRootless() && (!hasDumpPermission() || !hasRecordPermission())) { + if(isRootless() && (!hasDumpPermission() || !hasRecordPermission())) { Timber.i("Launching onboarding (first boot: $firstBoot)") startActivity(Intent(this, OnboardingActivity::class.java).apply { @@ -267,22 +271,21 @@ class MainActivity : BaseActivity() { binding.powerToggle.toggleOnClick = false binding.powerToggle.setOnToggleClickListener(object : FloatingToggleButton.OnToggleClickListener{ override fun onClick() { - sdkAbove(Build.VERSION_CODES.R) { - binding.powerToggle.performHapticFeedback( - if(binding.powerToggle.isToggled) - HapticFeedbackConstants.CONFIRM - else - HapticFeedbackConstants.REJECT - ) - } + binding.powerToggle.performHapticFeedback( + if(binding.powerToggle.isToggled) + HapticFeedbackConstants.CONFIRM + else + HapticFeedbackConstants.REJECT + ) - if(SdkCheck.isQ && isRootless()) { + if(isRootless()) { if (binding.powerToggle.isToggled) { // Currently on, let's turn it off + binding.powerToggle.isLoading = true RootlessAudioProcessorService.stop(this@MainActivity) - binding.powerToggle.isToggled = false } else { // Currently off, let's turn it on + binding.powerToggle.isLoading = true requestCapturePermission() } } @@ -307,22 +310,22 @@ class MainActivity : BaseActivity() { } }) - if (SdkCheck.isQ && isRootless()) { + if (isRootless()) { capturePermissionLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult() ) { result -> if (result.resultCode == RESULT_OK && isRootless()) { app.mediaProjectionStartIntent = result.data - binding.powerToggle.isToggled = true RootlessAudioProcessorService.start(this, result.data) } else { + binding.powerToggle.isLoading = false binding.powerToggle.isToggled = false } } } // Rootless: request capture permission instantly, if redirected from onboarding - if (SdkCheck.isQ && isRootless()) { + if (isRootless()) { if (intent.getBooleanExtra(EXTRA_FORCE_SHOW_CAPTURE_PROMPT, false)) { requestCapturePermission() } @@ -353,8 +356,8 @@ class MainActivity : BaseActivity() { requestIgnoreBatteryOptimizations() } - // Root: request notification permission on Android 13 because the onboarding is not used for root - if (isRoot() && SdkCheck.isTiramisu) { + // Root: request notification permission because the onboarding is not used for root + if (isRoot()) { runtimePermissionLauncher = registerForActivityResult( ActivityResultContracts.RequestMultiplePermissions() ) { isGranted -> @@ -588,13 +591,11 @@ class MainActivity : BaseActivity() { private fun bindProcessorService() { if (isRootless()) { - sdkAbove(Build.VERSION_CODES.Q) { - Intent(this, RootlessAudioProcessorService::class.java).also { intent -> - val ret = bindService(intent, processorServiceConnection, 0) - // Service not active - if (!ret) - requestCapturePermission() - } + Intent(this, RootlessAudioProcessorService::class.java).also { intent -> + val ret = bindService(intent, processorServiceConnection, 0) + // Service not active + if (!ret) + requestCapturePermission() } } else if (isRoot()) { diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/AppCompatibilityFragment.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/AppCompatibilityFragment.kt index cfc0b7ace..53b99f632 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/AppCompatibilityFragment.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/AppCompatibilityFragment.kt @@ -19,7 +19,6 @@ import me.timschneeberger.rootlessjamesdsp.model.room.AppBlocklistViewModel import me.timschneeberger.rootlessjamesdsp.model.room.AppBlocklistViewModelFactory import me.timschneeberger.rootlessjamesdsp.model.room.BlockedApp import me.timschneeberger.rootlessjamesdsp.service.RootlessAudioProcessorService -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck import me.timschneeberger.rootlessjamesdsp.utils.extensions.CompatExtensions.getParcelableAs import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.getAppIcon import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.getAppNameFromUidSafe @@ -80,7 +79,7 @@ class AppCompatibilityFragment : Fragment() { Timber.d("Requesting retry") projectIntent?.let { - if (isRootless() && SdkCheck.isQ) + if (isRootless()) RootlessAudioProcessorService.start(requireContext(), it) } @@ -100,7 +99,7 @@ class AppCompatibilityFragment : Fragment() { Timer("Reboot", false).schedule(100L) { projectIntent?.let { - if (isRootless() && SdkCheck.isQ) + if (isRootless()) RootlessAudioProcessorService.start(requireContext(), it) } diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/OnboardingFragment.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/OnboardingFragment.kt index 681f30d24..c9d21e5dc 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/OnboardingFragment.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/OnboardingFragment.kt @@ -29,7 +29,6 @@ import me.timschneeberger.rootlessjamesdsp.activity.OnboardingActivity.Companion import me.timschneeberger.rootlessjamesdsp.databinding.OnboardingFragmentBinding import me.timschneeberger.rootlessjamesdsp.flavor.RootShellImpl import me.timschneeberger.rootlessjamesdsp.service.RootAudioProcessorService -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.isPackageInstalled import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.launchApp import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.openPlayStoreApp @@ -42,7 +41,6 @@ import me.timschneeberger.rootlessjamesdsp.utils.extensions.PermissionExtensions import me.timschneeberger.rootlessjamesdsp.utils.extensions.PermissionExtensions.hasRecordPermission import me.timschneeberger.rootlessjamesdsp.utils.isRootless import me.timschneeberger.rootlessjamesdsp.utils.preferences.Preferences -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.view.Card import org.koin.android.ext.android.inject import rikka.shizuku.Shizuku @@ -156,16 +154,7 @@ class OnboardingFragment : Fragment() { R.string.onboarding_methods_rootless_adb ) - if(!SdkCheck.isQ) { - methodPage.methodsShizukuCard.isEnabled = false - methodPage.methodsShizukuCard.isClickable = false - methodPage.methodsShizukuCard.isFocusable = false - methodPage.methodsShizukuBody.isEnabled = false - methodPage.methodsShizukuTitle.isEnabled = false - methodPage.methodsShizukuTitle.text = "${getString(R.string.onboarding_methods_shizuku_title)} (${getString(R.string.onboarding_methods_unsupported_append)})" - } - - if(!useRoot && SdkCheck.isQ) { + if(!useRoot) { // Highlight Shizuku card as preferred option methodPage.methodsShizukuCard.setCardBackgroundColor( requireContext().resolveColorAttribute(com.google.android.material.R.attr.colorSecondaryContainer) @@ -380,9 +369,6 @@ class OnboardingFragment : Fragment() { } else if(number == PAGE_RUNTIME_PERMISSIONS) { val pageBinding = binding.onboardingPage5 - if(!SdkCheck.isTiramisu) { - pageBinding.findViewById(R.id.onboarding_notification_permission).visibility = View.GONE - } pageBinding.findViewById(R.id.privacy_card).apply { isVisible = !BuildConfig.FOSS_ONLY checkboxIsChecked = prefsApp.get(R.string.key_share_crash_reports) @@ -577,10 +563,8 @@ class OnboardingFragment : Fragment() { requestedPermissions.add(Manifest.permission.RECORD_AUDIO) } - sdkAbove(Build.VERSION_CODES.TIRAMISU) { - if(!requireContext().hasNotificationPermission()) - requestedPermissions.add(Manifest.permission.POST_NOTIFICATIONS) - } + if(!requireContext().hasNotificationPermission()) + requestedPermissions.add(Manifest.permission.POST_NOTIFICATIONS) return if(requestedPermissions.isNotEmpty()) { runtimePermissionLauncher.launch(requestedPermissions.toTypedArray()) diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsTroubleshootingFragment.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsTroubleshootingFragment.kt index c99b28b7f..6629b10a4 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsTroubleshootingFragment.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/fragment/settings/SettingsTroubleshootingFragment.kt @@ -17,7 +17,6 @@ import me.timschneeberger.rootlessjamesdsp.session.dump.DumpManager import me.timschneeberger.rootlessjamesdsp.utils.Constants import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.showAlert import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.toast -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import org.koin.android.ext.android.inject import java.io.File import java.io.FileOutputStream @@ -75,18 +74,8 @@ class SettingsTroubleshootingFragment : SettingsBaseFragment() { } findPreference(getString(R.string.key_troubleshooting_notification_access))?.setOnPreferenceClickListener { val serviceClassName = NotificationListenerService::class.java.name - val intent = sdkAbove(Build.VERSION_CODES.R) { - Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS) - .putExtra(Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, ComponentName(requireContext().packageName, serviceClassName).flattenToString()) - }.below { - Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS) - .apply { - val value = "${requireContext().packageName}/$serviceClassName" - val key = ":settings:fragment_args_key" - putExtra(":settings:show_fragment_args", Bundle().also { it.putString(key, value) }) - putExtra(":settings:fragment_args_key", "${requireContext().packageName}/$serviceClassName") - } - } + val intent = Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS) + .putExtra(Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, ComponentName(requireContext().packageName, serviceClassName).flattenToString()) // TVs, smart-watches and some other weird devices do not have these settings try { diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/interop/BenchmarkManager.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/interop/BenchmarkManager.kt index 124474379..b7234cf59 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/interop/BenchmarkManager.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/interop/BenchmarkManager.kt @@ -11,7 +11,6 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import me.timschneeberger.rootlessjamesdsp.R import me.timschneeberger.rootlessjamesdsp.utils.preferences.Preferences -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.view.ProgressDialog import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -49,9 +48,7 @@ object BenchmarkManager : KoinComponent { } fun runBenchmarks(context: Context, onFinished: (success: Boolean) -> Unit) { - sdkAbove(Build.VERSION_CODES.S) { - assert(context.isUiContext) - } + assert(context.isUiContext) var job: Job? = null val dialog = ProgressDialog(context) { diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootAudioProcessorService.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootAudioProcessorService.kt index cc2895389..e44dd6d32 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootAudioProcessorService.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootAudioProcessorService.kt @@ -31,7 +31,6 @@ import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.se import me.timschneeberger.rootlessjamesdsp.utils.notifications.Notifications import me.timschneeberger.rootlessjamesdsp.utils.notifications.ServiceNotificationHelper import me.timschneeberger.rootlessjamesdsp.utils.preferences.Preferences -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import org.koin.android.ext.android.inject import org.koin.core.component.KoinComponent import timber.log.Timber @@ -94,18 +93,11 @@ class RootAudioProcessorService : BaseAudioProcessorService(), KoinComponent, else ServiceNotificationHelper.createServiceNotification(this, arrayOf()) - sdkAbove(Build.VERSION_CODES.Q) { - startForeground( - Notifications.ID_SERVICE_STATUS, - notification, - ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK - ) - }.below { - startForeground( - Notifications.ID_SERVICE_STATUS, - notification - ) - } + startForeground( + Notifications.ID_SERVICE_STATUS, + notification, + ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK + ) // Initialize shared preferences manually arrayOf(R.string.key_powered_on, R.string.key_audioformat_enhanced_processing).forEach { @@ -241,11 +233,7 @@ class RootAudioProcessorService : BaseAudioProcessorService(), KoinComponent, } try { - sdkAbove(Build.VERSION_CODES.O) { - context.startForegroundService(intent) - }.below { - context.startService(intent) - } + context.startForegroundService(intent) } catch (ex: Exception) { Timber.e("Failed to start service. Try to disable battery optimizations") diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootlessAudioProcessorService.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootlessAudioProcessorService.kt index bb71a49f5..507a76f9b 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootlessAudioProcessorService.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/service/RootlessAudioProcessorService.kt @@ -58,7 +58,6 @@ import me.timschneeberger.rootlessjamesdsp.utils.extensions.PermissionExtensions import me.timschneeberger.rootlessjamesdsp.utils.notifications.Notifications import me.timschneeberger.rootlessjamesdsp.utils.notifications.ServiceNotificationHelper import me.timschneeberger.rootlessjamesdsp.utils.preferences.Preferences -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import org.koin.android.ext.android.inject import timber.log.Timber import java.io.IOException @@ -157,7 +156,7 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { startForeground( Notifications.ID_SERVICE_STATUS, ServiceNotificationHelper.createServiceNotification(this, arrayOf()), - ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION + ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE or ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION ) } @@ -191,27 +190,43 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { // Setup media projection mediaProjectionStartIntent = intent.extras?.getParcelableAs(EXTRA_MEDIA_PROJECTION_DATA) - mediaProjection = try { - mediaProjectionManager.getMediaProjection( - Activity.RESULT_OK, - mediaProjectionStartIntent!! - ) - } - catch (ex: Exception) { - Timber.e("Failed to acquire media projection") - sendLocalBroadcast(Intent(Constants.ACTION_DISCARD_AUTHORIZATION)) - Timber.e(ex) - null - } + if (mediaProjectionStartIntent != null) { // Add null check here + mediaProjection = try { + mediaProjectionManager.getMediaProjection( + Activity.RESULT_OK, + mediaProjectionStartIntent!! // Safe to use !! here as it's been checked + ) + } catch (ex: Exception) { + Timber.e("Failed to acquire media projection - token likely invalid") + preferences.set(R.string.key_powered_on, false) + sendLocalBroadcast(Intent(Constants.ACTION_DISCARD_AUTHORIZATION)) + // Notify widget about failure + sendBroadcast(Intent(Constants.ACTION_SERVICE_STOPPED)) + Timber.e(ex) + null + } - mediaProjection?.registerCallback(projectionCallback, Handler(Looper.getMainLooper())) + mediaProjection?.registerCallback(projectionCallback, Handler(Looper.getMainLooper())) - if (mediaProjection != null) { - startRecording() - sendLocalBroadcast(Intent(Constants.ACTION_SERVICE_STARTED)) + if (mediaProjection != null) { + startRecording() + sendLocalBroadcast(Intent(Constants.ACTION_SERVICE_STARTED)) + // Also send global broadcast for widget + sendBroadcast(Intent(Constants.ACTION_SERVICE_STARTED)) + } else { + Timber.w("Failed to capture audio") + preferences.set(R.string.key_powered_on, false) + stopSelf() + } } else { - Timber.w("Failed to capture audio") + Timber.e("onStartCommand: mediaProjectionStartIntent is null") + // Handle the case where mediaProjectionStartIntent is null, e.g.: + // - Stop the service + // - Log an error + // - Notify the user + preferences.set(R.string.key_powered_on, false) stopSelf() + return START_NOT_STICKY } return START_REDELIVER_INTENT @@ -227,8 +242,13 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { // Stop foreground service stopForeground(STOP_FOREGROUND_REMOVE) + // Update preference to reflect service stopped + preferences.set(R.string.key_powered_on, false) + // Notify app about service termination sendLocalBroadcast(Intent(Constants.ACTION_SERVICE_STOPPED)) + // Also send global broadcast for widget + sendBroadcast(Intent(Constants.ACTION_SERVICE_STOPPED)) // Unregister database observer blockedApps.removeObserver(blockedAppObserver) @@ -252,7 +272,7 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { // Preferences listener private val preferencesListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key -> - loadFromPreferences(key) + key?.let { loadFromPreferences(it) } } // Projection termination callback @@ -270,6 +290,9 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { Timber.w("Capture permission revoked. Stopping service.") + // Update preference to reflect service stopped + preferences.set(R.string.key_powered_on, false) + sendLocalBroadcast(Intent(Constants.ACTION_DISCARD_AUTHORIZATION)) this@RootlessAudioProcessorService.toast(getString(R.string.capture_permission_revoked_toast)) @@ -414,6 +437,7 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { // Sanity check if (!hasRecordPermission()) { Timber.e("Record audio permission missing. Can't record") + preferences.set(R.string.key_powered_on, false) stopSelf() return } @@ -567,6 +591,12 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { return } + // Check if engine should be enabled + if(!preferences.get(R.string.key_powered_on, false, Boolean::class)) { + Timber.w("restartRecording: engine is disabled, not restarting") + return + } + stopRecording() isProcessorDisposing = false recreateRecorderRequested = false @@ -578,10 +608,7 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { .setUsage(AudioAttributes.USAGE_UNKNOWN) .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN) .setFlags(0) - - sdkAbove(Build.VERSION_CODES.Q) { - attributesBuilder.setAllowedCapturePolicy(AudioAttributes.ALLOW_CAPTURE_BY_NONE) - } + .setAllowedCapturePolicy(AudioAttributes.ALLOW_CAPTURE_BY_NONE) val format = AudioFormat.Builder() .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) @@ -695,4 +722,5 @@ class RootlessAudioProcessorService : BaseAudioProcessorService() { } } } -} + +} \ No newline at end of file diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/dump/DumpManager.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/dump/DumpManager.kt index b721e21ec..6d6951e59 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/dump/DumpManager.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/session/dump/DumpManager.kt @@ -46,7 +46,7 @@ class DumpManager constructor(val context: Context): KoinComponent { init { loadFromPreferences(context.getString(R.string.key_session_detection_method)) preferencesListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key -> - loadFromPreferences(key) + key?.let { loadFromPreferences(it) } } preferences.registerOnSharedPreferenceChangeListener(preferencesListener) } diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/Constants.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/Constants.kt index b367b8b93..4e4de2905 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/Constants.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/Constants.kt @@ -7,6 +7,10 @@ object Constants { const val PREF_APP = "application" const val PREF_VAR = "variable" + + + const val ACTION_WIDGET_CLICK = "me.timschneeberger.rootlessjamesdsp.ACTION_WIDGET_CLICK" + // DSP-relevant preference namespaces const val PREF_BASS = "dsp_bass" const val PREF_COMPANDER = "dsp_compander" diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/EngineUtils.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/EngineUtils.kt index f0e5c2bff..dbb8bf8bc 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/EngineUtils.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/EngineUtils.kt @@ -31,14 +31,29 @@ object EngineUtils : KoinComponent { } preferences.set(R.string.key_powered_on, isOn) return + } - sdkAbove(Build.VERSION_CODES.Q) { - // Rootless - if (!isOn) - RootlessAudioProcessorService.stop(this) - else + // Rootless + if (!isOn) { + RootlessAudioProcessorService.stop(this) + preferences.set(R.string.key_powered_on, false) + } else { + // Intentar iniciar con el token guardado + val mainApp = applicationContext as? me.timschneeberger.rootlessjamesdsp.MainApplication + val projectionIntent = mainApp?.mediaProjectionStartIntent + + if (projectionIntent != null) { + // Tenemos token, iniciar directamente + RootlessAudioProcessorService.start(this, projectionIntent) + preferences.set(R.string.key_powered_on, true) + } else { + // No tenemos token, abrir la app para pedirlo launchService(activityStarter) + } } } + fun isEngineEnabled(context: Context): Boolean { + return preferences.get(R.string.key_powered_on, false, Boolean::class) + } } \ No newline at end of file diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/MutedAudioEffectFactory.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/MutedAudioEffectFactory.kt index 0cf8b9f8b..85270cfb5 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/MutedAudioEffectFactory.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/MutedAudioEffectFactory.kt @@ -37,14 +37,9 @@ class MutedAudioEffectFactory { try { muteEffect = when (type) { MuteEffects.DynamicsProcessing -> { - sdkAbove(VERSION_CODES.P) { - with(DynamicsProcessing(Int.MAX_VALUE, sid, null)) { - setInputGainAllChannelsTo(-200f) - this - } - }.below { - Timber.e("DynamicsProcessing unsupported below P") - null + with(DynamicsProcessing(Int.MAX_VALUE, sid, null)) { + setInputGainAllChannelsTo(-200f) + this } } MuteEffects.Volume -> { @@ -83,7 +78,7 @@ class MutedAudioEffectFactory { muteEffect.setEnableStatusListener { effect, enabled -> if (!enabled) { try { - if(SdkCheck.isPie && effect is DynamicsProcessing) + if(effect is DynamicsProcessing) effect.setInputGainAllChannelsTo(-200f) effect.enabled = true Timber.d("$name effect re-enabled (session $sid)") @@ -104,7 +99,7 @@ class MutedAudioEffectFactory { } else { try { - if(SdkCheck.isPie && effect is DynamicsProcessing) + if(effect is DynamicsProcessing) effect.setInputGainAllChannelsTo(-200f) effect.enabled = true Timber.d("$name effect regained control (session $sid)") @@ -140,11 +135,7 @@ class MutedAudioEffectFactory { } private val volumeHiddenTypeUuid = UUID.fromString("09e8ede0-ddde-11db-b4f6-0002a5d5c51b") - private val dynamicsProcessingTypeUuid = sdkAbove(VERSION_CODES.P) { - AudioEffect.EFFECT_TYPE_DYNAMICS_PROCESSING - }.below { - UUID.fromString("00000000-0000-0000-0000-000000000000") - } + private val dynamicsProcessingTypeUuid = AudioEffect.EFFECT_TYPE_DYNAMICS_PROCESSING private val supportedTypeUuids = mapOf( MuteEffects.DynamicsProcessing to dynamicsProcessingTypeUuid, diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/RoutingObserver.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/RoutingObserver.kt index 1a49c3626..1a5d969f3 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/RoutingObserver.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/RoutingObserver.kt @@ -71,11 +71,7 @@ class RoutingObserver(val context: Context) : MediaRouter.Callback(), KoinCompon get() = try { Resources.getSystem().getText( Resources.getSystem().getIdentifier( - sdkAbove(34 /* FIXME Build.VERSION_CODES.UPSIDE_DOWN_CAKE */) { - "default_audio_route_name_external_device" - }.below { - "default_audio_route_name_hdmi" - }, + "default_audio_route_name_external_device", "string", "android" ) ).let { hdmiName -> @@ -92,15 +88,11 @@ class RoutingObserver(val context: Context) : MediaRouter.Callback(), KoinCompon private val MediaRouter.RouteInfo.isUsb: Boolean @SuppressLint("DiscouragedApi") - get() = sdkAbove(Build.VERSION_CODES.Q) { - Resources.getSystem().getText( - Resources.getSystem().getIdentifier( - "default_audio_route_name_usb", "string", "android" - ) + get() = Resources.getSystem().getText( + Resources.getSystem().getIdentifier( + "default_audio_route_name_usb", "string", "android" ) - }.below { - "" - }.let { usbName -> + ).let { usbName -> router.defaultRoute == this && usbName == name } diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/CompatExtensions.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/CompatExtensions.kt index 5c3ef9166..ec4da10c5 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/CompatExtensions.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/CompatExtensions.kt @@ -3,51 +3,28 @@ package me.timschneeberger.rootlessjamesdsp.utils.extensions import android.content.pm.ApplicationInfo import android.content.pm.PackageInfo import android.content.pm.PackageManager -import android.os.Build import android.os.Bundle import android.os.Parcelable -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import java.io.Serializable -@Suppress("DEPRECATION") object CompatExtensions { inline fun Bundle.getSerializableAs(key: String): T? { - return sdkAbove(Build.VERSION_CODES.TIRAMISU) { - this.getSerializable(key, T::class.java) - }.below { - this.getSerializable(key) as? T - } + return this.getSerializable(key, T::class.java) } inline fun Bundle.getParcelableAs(key: String): T? { - return sdkAbove(Build.VERSION_CODES.TIRAMISU) { - this.getParcelable(key, T::class.java) - }.below { - this.getParcelable(key) - } + return this.getParcelable(key, T::class.java) } fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): PackageInfo { - return sdkAbove(Build.VERSION_CODES.TIRAMISU) { - getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong())) - }.below { - getPackageInfo(packageName, flags) - } + return getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong())) } fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo { - return sdkAbove(Build.VERSION_CODES.TIRAMISU) { - getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong())) - }.below { - getApplicationInfo(packageName, flags) - } + return getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong())) } fun PackageManager.getInstalledApplicationsCompat(flags: Int = 0): List { - return sdkAbove(Build.VERSION_CODES.TIRAMISU) { - getInstalledApplications(PackageManager.ApplicationInfoFlags.of(flags.toLong())) - }.below { - getInstalledApplications(flags) - } + return getInstalledApplications(PackageManager.ApplicationInfoFlags.of(flags.toLong())) } -} \ No newline at end of file +} diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/MiscUtils.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/MiscUtils.kt index 9b164586e..060ed5ff5 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/MiscUtils.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/MiscUtils.kt @@ -9,7 +9,6 @@ import android.view.View import androidx.annotation.AttrRes import androidx.core.content.res.ResourcesCompat import com.google.android.material.color.DynamicColors -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck import java.io.File import java.math.BigDecimal import java.math.RoundingMode @@ -76,13 +75,13 @@ private val isSamsung by lazy { } val isDynamicColorAvailable by lazy { - DynamicColors.isDynamicColorAvailable() || (isSamsung && SdkCheck.isSnowCake) + DynamicColors.isDynamicColorAvailable() || isSamsung } fun View.setBackgroundFromAttribute(@AttrRes attrRes: Int) { val a = TypedValue() context.theme.resolveAttribute(attrRes, a, true) - if (SdkCheck.isQ && a.isColorType) { + if (a.isColorType) { setBackgroundColor(a.data) } else { background = ResourcesCompat.getDrawable(context.resources, a.resourceId, context.theme) diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/PermissionExtensions.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/PermissionExtensions.kt index 02c89667f..857a942cf 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/PermissionExtensions.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/extensions/PermissionExtensions.kt @@ -4,10 +4,8 @@ import android.Manifest import android.app.AppOpsManager import android.content.Context import android.content.pm.PackageManager -import android.os.Build import androidx.core.content.getSystemService import me.timschneeberger.rootlessjamesdsp.utils.extensions.CompatExtensions.getApplicationInfoCompat -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import timber.log.Timber object PermissionExtensions { @@ -38,10 +36,7 @@ object PermissionExtensions { fun Context.hasPackageUsagePermission() = hasPermission(Manifest.permission.PACKAGE_USAGE_STATS) && hasPackageUsageAppOp() fun Context.hasNotificationPermission(): Boolean { - sdkAbove(Build.VERSION_CODES.TIRAMISU) { - return hasPermission(Manifest.permission.POST_NOTIFICATIONS) - } - return false + return hasPermission(Manifest.permission.POST_NOTIFICATIONS) } private fun Context.hasPermission(permission: String): Boolean { return checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/notifications/ServiceNotificationHelper.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/notifications/ServiceNotificationHelper.kt index ad407eb77..bc65c2d67 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/notifications/ServiceNotificationHelper.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/notifications/ServiceNotificationHelper.kt @@ -19,7 +19,6 @@ import me.timschneeberger.rootlessjamesdsp.activity.EngineLauncherActivity import me.timschneeberger.rootlessjamesdsp.activity.MainActivity import me.timschneeberger.rootlessjamesdsp.model.IEffectSession import me.timschneeberger.rootlessjamesdsp.service.RootlessAudioProcessorService -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.getAppName import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.getAppNameFromUid import me.timschneeberger.rootlessjamesdsp.utils.isRootless @@ -206,7 +205,7 @@ object ServiceNotificationHelper: KoinComponent { context, R.string.action_stop, R.drawable.ic_close_24dp, - if (SdkCheck.isQ && isRootless()) { + if (isRootless()) { with(Intent(context, RootlessAudioProcessorService::class.java)) { action = RootlessAudioProcessorService.ACTION_STOP this @@ -257,7 +256,7 @@ object ServiceNotificationHelper: KoinComponent { fun createStopIntent(ctx: Context) = - if (SdkCheck.isQ && isRootless()) { + if (isRootless()) { with(Intent(ctx, RootlessAudioProcessorService::class.java)) { action = RootlessAudioProcessorService.ACTION_STOP this @@ -266,7 +265,7 @@ object ServiceNotificationHelper: KoinComponent { else throw IllegalStateException() fun createStartIntent(ctx: Context, mediaProjectionData: Intent? = null) = - if (SdkCheck.isQ && isRootless()) { + if (isRootless()) { with(Intent(ctx, RootlessAudioProcessorService::class.java)) { action = RootlessAudioProcessorService.ACTION_START putExtra(RootlessAudioProcessorService.EXTRA_MEDIA_PROJECTION_DATA, mediaProjectionData) diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/storage/Cache.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/storage/Cache.kt index 8430c8d3d..9eb3de83b 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/storage/Cache.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/utils/storage/Cache.kt @@ -12,7 +12,6 @@ import android.os.ParcelFileDescriptor import android.provider.OpenableColumns import android.system.Os import me.timschneeberger.rootlessjamesdsp.utils.extensions.CompatExtensions.getPackageInfoCompat -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import timber.log.Timber import java.io.File import java.util.* @@ -50,14 +49,12 @@ object Cache { } fun getReleaseFile(context: Context, cacheFileName: String): File { return File(ensureCacheDir(context, RELEASE_DIR), cacheFileName).apply { - sdkAbove(Build.VERSION_CODES.N) { - // Make readable for package installer - val cacheDir = context.cacheDir.parentFile!!.parentFile!! - generateSequence(this) { it.parentFile!! }.takeWhile { it != cacheDir }.forEach { - when { - it.isDirectory -> applyOrMode(it, 0b001001001) - it.isFile -> applyOrMode(it, 0b100100100) - } + // Make readable for package installer + val cacheDir = context.cacheDir.parentFile!!.parentFile!! + generateSequence(this) { it.parentFile!! }.takeWhile { it != cacheDir }.forEach { + when { + it.isDirectory -> applyOrMode(it, 0b001001001) + it.isFile -> applyOrMode(it, 0b100100100) } } } diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/view/FloatingToggleButton.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/view/FloatingToggleButton.kt index 390f2581f..830aef391 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/view/FloatingToggleButton.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/view/FloatingToggleButton.kt @@ -3,6 +3,7 @@ package me.timschneeberger.rootlessjamesdsp.view import android.animation.AnimatorInflater import android.content.Context import android.util.AttributeSet +import androidx.core.view.isVisible import com.google.android.material.floatingactionbutton.FloatingActionButton import me.timschneeberger.rootlessjamesdsp.R @@ -15,18 +16,28 @@ class FloatingToggleButton @JvmOverloads constructor( var isToggled = false set(value) { + if(field == value && !isLoading) return field = value isSelected = value onToggledListener?.onToggled(value) } + var isLoading = false + set(value) { + field = value + isEnabled = !value + alpha = if(value) 0.6f else 1.0f + } + var toggleOnClick = true init { setOnClickListener { - onClickListener?.onClick() - if(toggleOnClick) { - isToggled = !isToggled + if(!isLoading) { + onClickListener?.onClick() + if(toggleOnClick) { + isToggled = !isToggled + } } } diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/EngineToggleWidgetProvider.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/EngineToggleWidgetProvider.kt new file mode 100644 index 000000000..02376382a --- /dev/null +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/EngineToggleWidgetProvider.kt @@ -0,0 +1,86 @@ +package me.timschneeberger.rootlessjamesdsp.widget + +import android.app.PendingIntent +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.widget.RemoteViews +import me.timschneeberger.rootlessjamesdsp.R +import me.timschneeberger.rootlessjamesdsp.utils.Constants +import me.timschneeberger.rootlessjamesdsp.utils.EngineUtils +import timber.log.Timber + +class EngineToggleWidgetProvider : AppWidgetProvider() { + + override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { + for (appWidgetId in appWidgetIds) { + updateWidget(context, appWidgetManager, appWidgetId) + } + } + + override fun onReceive(context: Context, intent: Intent) { + super.onReceive(context, intent) + + when (intent.action) { + Constants.ACTION_SERVICE_STARTED, + Constants.ACTION_SERVICE_STOPPED -> { + Timber.d("Widget received service state change: ${intent.action}") + + // Cancel loading timeout since service responded + WidgetActionReceiver.cancelLoadingTimeout() + + val appWidgetManager = AppWidgetManager.getInstance(context) + val thisWidget = ComponentName(context, EngineToggleWidgetProvider::class.java) + val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget) + + // Update widgets in real-time, clearing loading state + for (appWidgetId in appWidgetIds) { + updateWidgetWithState(context, appWidgetManager, appWidgetId, isLoading = false) + } + } + } + } + + private fun updateWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, isLoading: Boolean = false) { + updateWidgetWithState(context, appWidgetManager, appWidgetId, isLoading) + } + + companion object { + fun updateWidgetWithState(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, isLoading: Boolean = false) { + Timber.d("Updating widget with ID: $appWidgetId, loading: $isLoading") + + val views = RemoteViews(context.packageName, R.layout.widget_engine_toggle) + + if (isLoading) { + // Estado de carga + views.setInt(R.id.widget_engine_icon, "setImageAlpha", 153) // 60% opacity + views.setViewVisibility(R.id.widget_progress, android.view.View.VISIBLE) + } else { + // Estado normal + views.setInt(R.id.widget_engine_icon, "setImageAlpha", 255) // 100% opacity + views.setViewVisibility(R.id.widget_progress, android.view.View.GONE) + + val iconResource = if (EngineUtils.isEngineEnabled(context)) { + R.drawable.ic_engine_on + } else { + R.drawable.ic_engine_off + } + views.setImageViewResource(R.id.widget_engine_icon, iconResource) + } + + val intent = Intent(context, WidgetActionReceiver::class.java) + intent.action = Constants.ACTION_WIDGET_CLICK + val pendingIntent = PendingIntent.getBroadcast( + context, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + views.setOnClickPendingIntent(R.id.widget_engine_icon, pendingIntent) + + appWidgetManager.updateAppWidget(appWidgetId, views) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/WidgetActionReceiver.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/WidgetActionReceiver.kt new file mode 100644 index 000000000..763f25947 --- /dev/null +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/widget/WidgetActionReceiver.kt @@ -0,0 +1,69 @@ +package me.timschneeberger.rootlessjamesdsp.widget + +import android.appwidget.AppWidgetManager +import android.content.BroadcastReceiver +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.os.Handler +import android.os.Looper +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import me.timschneeberger.rootlessjamesdsp.utils.Constants +import me.timschneeberger.rootlessjamesdsp.utils.EngineUtils +import me.timschneeberger.rootlessjamesdsp.utils.EngineUtils.toggleEnginePower +import me.timschneeberger.rootlessjamesdsp.utils.isRootless +import timber.log.Timber + +class WidgetActionReceiver : BroadcastReceiver() { + + companion object { + private val handler = Handler(Looper.getMainLooper()) + private var timeoutRunnable: Runnable? = null + + fun cancelLoadingTimeout() { + timeoutRunnable?.let { + handler.removeCallbacks(it) + Timber.d("Loading timeout cancelled - service responded") + } + timeoutRunnable = null + } + } + + override fun onReceive(context: Context, intent: Intent) { + Timber.d("Widget action received") + Timber.d("WidgetActionReceiver: onReceive() triggered") + when (intent.action) { + Constants.ACTION_WIDGET_CLICK -> { + val newState = !EngineUtils.isEngineEnabled(context) + Timber.d("Alternando el estado del motor: $newState") + + // Mostrar loading en el widget + if (isRootless()) { + updateAllWidgets(context, isLoading = true) + + // Clear loading state after timeout (5 seconds) as fallback + // This will be cancelled if service responds with broadcast + cancelLoadingTimeout() // Cancel any previous timeout + timeoutRunnable = Runnable { + Timber.d("Loading timeout reached, clearing loading state (fallback)") + updateAllWidgets(context, isLoading = false) + timeoutRunnable = null + } + handler.postDelayed(timeoutRunnable!!, 5000) + } + + context.toggleEnginePower(newState) + } + } + } + + private fun updateAllWidgets(context: Context, isLoading: Boolean) { + val appWidgetManager = AppWidgetManager.getInstance(context) + val thisWidget = ComponentName(context, EngineToggleWidgetProvider::class.java) + val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget) + + for (appWidgetId in appWidgetIds) { + EngineToggleWidgetProvider.updateWidgetWithState(context, appWidgetManager, appWidgetId, isLoading) + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_engine_off.xml b/app/src/main/res/drawable/ic_engine_off.xml new file mode 100644 index 000000000..01295ef39 --- /dev/null +++ b/app/src/main/res/drawable/ic_engine_off.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_engine_on.xml b/app/src/main/res/drawable/ic_engine_on.xml new file mode 100644 index 000000000..9437f8694 --- /dev/null +++ b/app/src/main/res/drawable/ic_engine_on.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/widget_preview.xml b/app/src/main/res/drawable/widget_preview.xml new file mode 100644 index 000000000..1322802fc --- /dev/null +++ b/app/src/main/res/drawable/widget_preview.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_dsp_main.xml b/app/src/main/res/layout/activity_dsp_main.xml index 4b4110eb7..c174daf36 100644 --- a/app/src/main/res/layout/activity_dsp_main.xml +++ b/app/src/main/res/layout/activity_dsp_main.xml @@ -50,9 +50,12 @@ android:id="@+id/power_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_anchor="@id/bar" - app:srcCompat="@drawable/ic_twotone_power_settings_24dp" + android:contentDescription="@string/power_button_alt" android:hapticFeedbackEnabled="true" - android:contentDescription="@string/power_button_alt" /> + android:rotation="-25" + android:rotationX="37" + android:rotationY="33" + app:layout_anchor="@id/bar" + app:srcCompat="@drawable/ic_twotone_power_settings_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/widget_engine_toggle.xml b/app/src/main/res/layout/widget_engine_toggle.xml new file mode 100644 index 000000000..48cecd80d --- /dev/null +++ b/app/src/main/res/layout/widget_engine_toggle.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml deleted file mode 100644 index 22bc1e5bc..000000000 --- a/app/src/main/res/values-v29/themes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml deleted file mode 100644 index 8ea36cdfe..000000000 --- a/app/src/main/res/values-v31/themes.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/app/src/main/res/xml/widget_engine_toggle_info.xml b/app/src/main/res/xml/widget_engine_toggle_info.xml new file mode 100644 index 000000000..91fda58e3 --- /dev/null +++ b/app/src/main/res/xml/widget_engine_toggle_info.xml @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/UpdateManager.kt b/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/UpdateManager.kt index 1fed2d82a..27340d28a 100644 --- a/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/UpdateManager.kt +++ b/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/UpdateManager.kt @@ -17,7 +17,6 @@ import me.timschneeberger.rootlessjamesdsp.flavor.updates.model.UpdateCheckRespo import me.timschneeberger.rootlessjamesdsp.utils.Result import me.timschneeberger.rootlessjamesdsp.utils.extensions.ApiExtensions import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.showAlert -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.utils.storage.Cache import me.timschneeberger.rootlessjamesdsp.view.ProgressDialog import timber.log.Timber @@ -44,9 +43,7 @@ class UpdateManager(val context: Context) { } fun installUpdate(context: Context) { - sdkAbove(Build.VERSION_CODES.S) { - assert(context.isUiContext) - } + assert(context.isUiContext) var job: Job? = null val dialog = ProgressDialog(context) { job?.cancel() } diff --git a/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/updates/SessionInstaller.kt b/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/updates/SessionInstaller.kt index b80482313..3c9738ae0 100644 --- a/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/updates/SessionInstaller.kt +++ b/app/src/root/java/me/timschneeberger/rootlessjamesdsp/flavor/updates/SessionInstaller.kt @@ -8,8 +8,6 @@ import android.os.Build import android.os.Handler import android.os.Looper import kotlinx.coroutines.suspendCancellableCoroutine -import me.timschneeberger.rootlessjamesdsp.utils.SdkCheck -import me.timschneeberger.rootlessjamesdsp.utils.sdkAbove import me.timschneeberger.rootlessjamesdsp.utils.storage.Cache import kotlin.coroutines.resume @@ -21,12 +19,10 @@ class SessionInstaller(private val context: Context) { companion object { private var installerCallbacks = mutableListOf() - private val flags = if (SdkCheck.isSnowCake) PendingIntent.FLAG_MUTABLE else 0 + private val flags = PendingIntent.FLAG_MUTABLE private val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { - sdkAbove(sdk = Build.VERSION_CODES.S) { - setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) - } + setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) } } diff --git a/codeview/build.gradle b/codeview/build.gradle index bff5bacc4..d7217fc2d 100644 --- a/codeview/build.gradle +++ b/codeview/build.gradle @@ -26,6 +26,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = "11" + } + namespace 'com.amrdeveloper.codeview' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..1b33c55ba 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 4f906e0c8..23d15a936 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,115 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..db3a6ac20 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/hidden-api-impl/build.gradle.kts b/hidden-api-impl/build.gradle.kts index 6aabea62a..ac15b8e7d 100644 --- a/hidden-api-impl/build.gradle.kts +++ b/hidden-api-impl/build.gradle.kts @@ -1,11 +1,10 @@ plugins { id("com.android.library") - id("dev.rikka.tools.refine") version AndroidConfig.rikkaRefineVersion } android { - compileSdk = AndroidConfig.compileSdk + compileSdk = 34 defaultConfig { minSdk = AndroidConfig.minSdk lint.targetSdk = AndroidConfig.targetSdk @@ -28,5 +27,9 @@ android { dependencies { implementation("dev.rikka.shizuku:api:${AndroidConfig.shizukuVersion}") compileOnly(project(":hidden-api-stubs")) - compileOnly(project(":hidden-api-refined")) -} \ No newline at end of file +} +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} diff --git a/hidden-api-refined/build.gradle.kts b/hidden-api-refined/build.gradle.kts index 16d75133f..afc756b5e 100644 --- a/hidden-api-refined/build.gradle.kts +++ b/hidden-api-refined/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } android { - compileSdk = AndroidConfig.compileSdk + compileSdk = 34 defaultConfig { minSdk = AndroidConfig.minSdk lint.targetSdk = AndroidConfig.targetSdk diff --git a/settings.gradle b/settings.gradle index c20d9f23e..166a795fd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,9 @@ pluginManagement { mavenCentral() } } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {