From 158b1228d9ccd29a590e2781479a743e3c202af5 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Thu, 11 Jan 2024 19:41:28 +0530 Subject: [PATCH] fix: 'Sync project' message is incorrectly shown when 'Sync project' action is executed with unsaved Gradle files (fixes #1594) --- .../com/itsaky/androidide/actions/build/ProjectSyncAction.kt | 2 +- .../androidide/activities/editor/ProjectHandlerActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt b/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt index 27610c87b..eef2def0e 100644 --- a/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt +++ b/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt @@ -40,7 +40,7 @@ class ProjectSyncAction(context: Context, override val order: Int) : BaseBuildAc } override suspend fun execAction(data: ActionData): Any { - return data.requireActivity().saveAll() + return data.requireActivity().saveAll(requestSync = false) } override fun postExec(data: ActionData, result: Any) { diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt index 57a2d37fe..1be27d203 100644 --- a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt +++ b/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt @@ -230,7 +230,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() { private fun notifySyncNeeded(onConfirm: () -> Unit) { val buildService = Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE) - if (buildService == null || buildService.isBuildInProgress) return + if (buildService == null || editorViewModel.isInitializing || buildService.isBuildInProgress) return this.syncNotificationFlashbar?.dismiss()