Pause build and wait for directory access (with timeout)

Author: syntaxerror247

app/src/main/java/org/godotengine/godot_gradle_build_environment/BuildEnvironment.kt

@@ -45,6 +45,9 @@ class BuildEnvironment(
 
     private var currentProcess: Process? = null
 
+    private val accessLock = Object()
+    @Volatile private var grantedTreeUri: Uri? = null
+
     private fun getDefaultEnv(): List<String> {
         return try {
             File(rootfs, "env").readLines()
@@ -349,11 +352,17 @@ class BuildEnvironment(
         } else {
             outputHandler(OUTPUT_STDERR, "Unable to setup project: $projectPath is not accessible. Please give GABE app access to this directory.")
             showDirectoryAccessNotification(projectPath)
-            return 255
+            val uri = waitForDirectoryAccess(2 * 60 * 1000) // 2 minutes should be ideal?
+            if (uri == null) {
+                outputHandler(OUTPUT_STDERR, "Directory access not granted in time. Build canceled.")
+                return 255
+            }
+            projectTreeUri = uri
+            outputHandler(OUTPUT_STDOUT, "Access granted for $projectPath. Starting Gradle build...")
         }
 
         try {
-            outputHandler(OUTPUT_INFO, "> Importing project via SAF...")
+            outputHandler(OUTPUT_INFO, "> Importing project files...")
             SafProjectImporter.importAndroidProject(context, projectTreeUri, workDir)
         } catch (e: Exception) {
             outputHandler(OUTPUT_STDERR, "Unable to setup project: ${e.message}")
@@ -436,6 +445,28 @@ class BuildEnvironment(
         }
     }
 
+    fun waitForDirectoryAccess(timeoutMs: Long): Uri? {
+        val endTime = System.currentTimeMillis() + timeoutMs
+
+        synchronized(accessLock) {
+            while (grantedTreeUri == null) {
+                val remaining = endTime - System.currentTimeMillis()
+                if (remaining <= 0) {
+                    return null
+                }
+                accessLock.wait(remaining)
+            }
+            return grantedTreeUri
+        }
+    }
+
+    fun onDirectoryAccessGranted(uri: Uri) {
+        synchronized(accessLock) {
+            grantedTreeUri = uri
+            accessLock.notifyAll()
+        }
+    }
+
     private fun showDirectoryAccessNotification(projectPath: String) {
         if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
             return

app/src/main/java/org/godotengine/godot_gradle_build_environment/BuildEnvironmentService.kt

@@ -11,6 +11,7 @@ import android.os.Message
 import android.os.Messenger
 import android.os.RemoteException
 import android.util.Log
+import androidx.core.net.toUri
 import java.util.concurrent.LinkedBlockingQueue
 
 class BuildEnvironmentService : Service() {
@@ -26,6 +27,8 @@ class BuildEnvironmentService : Service() {
         const val MSG_CLEAN_GLOBAL_CACHE = 6
         const val MSG_INSTALL_ROOTFS = 7
         const val MSG_DELETE_ROOTFS = 8
+
+        const val MSG_RESUME_PENDING_BUILD = 9
     }
 
     private lateinit var mMessenger: Messenger
@@ -62,6 +65,12 @@ class BuildEnvironmentService : Service() {
                     MSG_CLEAN_GLOBAL_CACHE -> queueWork(WorkItem(copy, msg.arg1))
                     MSG_INSTALL_ROOTFS -> queueWork(WorkItem(copy, msg.arg1))
                     MSG_DELETE_ROOTFS -> queueWork(WorkItem(copy, msg.arg1))
+                    MSG_RESUME_PENDING_BUILD -> {
+                        val uri = msg.data.getString("tree_uri")?.toUri()
+                        if (uri != null) {
+                            mBuildEnvironment.onDirectoryAccessGranted(uri)
+                        }
+                    }
                 }
             }
         }

app/src/main/java/org/godotengine/godot_gradle_build_environment/MainActivity.kt

@@ -3,14 +3,18 @@ package org.godotengine.godot_gradle_build_environment
 import android.Manifest
 import android.app.NotificationChannel
 import android.app.NotificationManager
+import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
-import android.provider.DocumentsContract
-import android.provider.Settings
+import android.os.IBinder
+import android.os.Message
+import android.os.Messenger
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -43,7 +47,15 @@ class MainActivity : ComponentActivity() {
                 } else {
                     Log.e(TAG, "Failed to add project: tempProjectPath is null. This should never happen under normal conditions. Please report this issue.")
                 }
+
+                val msg = Message.obtain(null, BuildEnvironmentService.MSG_RESUME_PENDING_BUILD)
+                msg.data = Bundle().apply {
+                    putString("tree_uri", uri.toString())
+                }
+                serviceMessenger?.send(msg)
             }
+
+            finish()
         }
 
     private val notificationPermissionLauncher =
@@ -55,6 +67,17 @@ class MainActivity : ComponentActivity() {
             }
         }
 
+    private var serviceMessenger: Messenger? = null
+
+    private val connection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
+            serviceMessenger = Messenger(binder)
+        }
+        override fun onServiceDisconnected(name: ComponentName?) {
+            serviceMessenger = null
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -94,6 +117,19 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        val intent = Intent("org.godotengine.action.BUILD_PROVIDER").apply {
+            setPackage(packageName)
+        }
+        bindService(intent, connection, Context.BIND_AUTO_CREATE)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        unbindService(connection)
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         handleIntent(intent)

app/src/main/java/org/godotengine/godot_gradle_build_environment/screens/ProjectsScreen.kt

@@ -4,16 +4,13 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
 import android.util.Log
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -25,7 +22,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -57,7 +53,6 @@ import org.godotengine.godot_gradle_build_environment.CachedProject
 import org.godotengine.godot_gradle_build_environment.FileUtils
 import org.godotengine.godot_gradle_build_environment.ProjectInfo
 import org.godotengine.godot_gradle_build_environment.R
-import androidx.core.content.edit
 
 @Composable
 fun ProjectsScreen(modifier: Modifier = Modifier) {