v1.1.1: Delete empty folders after upload regardless of album toggle

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.folderredirect.app"
         minSdk 26
         targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.1.1"
     }
 
     buildTypes {
@@ -31,6 +31,14 @@ android {
     buildFeatures {
         viewBinding true
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            def version = variant.versionName
+            def name = variant.buildType.name
+            outputFileName = "FolderRedirect-app-v${version}-${name}.apk"
+        }
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.FolderRedirectApp"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true">
 
         <activity
             android:name=".MainActivity"

app/src/main/java/com/folderredirect/app/FileMoveWorker.kt

@@ -119,6 +119,7 @@ class FileMoveWorker(appContext: Context, params: WorkerParameters) : CoroutineW
                 val totalFiles = filesToProcess.size
                 
                 if (totalFiles == 0) {
+                    deleteEmptyFoldersRecursively(sourceDir)
                     rulesManager.updateImmichRuleProgress(rule.id, 100)
                     sendProgressUpdate()
                     return@withContext 0
@@ -140,7 +141,7 @@ class FileMoveWorker(appContext: Context, params: WorkerParameters) : CoroutineW
                     }
                     
                     val relativePath = file.absolutePath.substringAfter(sourceDir.absolutePath.trimEnd('/'), "").trimStart('/')
-                    val albumName = getAlbumNameFromRelativePathImmich(relativePath)
+                    val albumName = if (rule.useFolderAsAlbum) getAlbumNameFromRelativePathImmich(relativePath) else null
                     
                     var retries = 3
                     var success = false
@@ -175,6 +176,8 @@ class FileMoveWorker(appContext: Context, params: WorkerParameters) : CoroutineW
                     sendProgressUpdate()
                 }
                 
+                deleteEmptyFoldersRecursively(sourceDir)
+                
                 return@withContext count
             } catch (e: Exception) {
                 Log.e(TAG, "Error procesando regla Immich: ${e.message}")
@@ -186,6 +189,9 @@ class FileMoveWorker(appContext: Context, params: WorkerParameters) : CoroutineW
     private fun deleteEmptyParentFoldersImmich(folder: File?, baseFolder: File) =
         FileUtils.deleteEmptyParentFolders(folder, baseFolder)
     
+    private fun deleteEmptyFoldersRecursively(baseFolder: File) =
+        FileUtils.deleteEmptyFoldersRecursively(baseFolder)
+    
     private fun getAllFilesRecursively(dir: File): List<File> =
         FileUtils.getAllFilesRecursively(dir)
     

app/src/main/java/com/folderredirect/app/FileUtils.kt

@@ -47,6 +47,20 @@ object FileUtils {
         }
     }
     
+    fun deleteEmptyFoldersRecursively(baseFolder: File) {
+        if (!baseFolder.exists() || !baseFolder.isDirectory) return
+        val children = baseFolder.listFiles() ?: return
+        for (child in children) {
+            if (child.isDirectory) {
+                deleteEmptyFoldersRecursively(child)
+                if (child.exists() && child.listFiles()?.isEmpty() == true) {
+                    child.delete()
+                    Log.d(TAG, "Carpeta vacía eliminada: ${child.absolutePath}")
+                }
+            }
+        }
+    }
+    
     fun getAllFilesRecursively(dir: File): List<File> {
         val files = mutableListOf<File>()
         dir.listFiles()?.forEach { file ->

app/src/main/java/com/folderredirect/app/ImmichUploadRule.kt

@@ -12,6 +12,7 @@ data class ImmichUploadRule(
     var isEnabled: Boolean = true,
     var fileTypeCategory: String = FileTypeCategory.IMAGES.name,
     var namePattern: String? = null,
+    var useFolderAsAlbum: Boolean = true,
     var progress: Int = 0
 ) : Serializable {
     

app/src/main/java/com/folderredirect/app/MainActivity.kt

@@ -399,6 +399,7 @@ class MainActivity : AppCompatActivity() {
         editApiKey = view.findViewById(R.id.editApiKey)
         radioGroupFileType = view.findViewById(R.id.radioGroupFileType)
         editNamePattern = view.findViewById(R.id.editNamePattern)
+        val switchUseFolderAsAlbum = view.findViewById<com.google.android.material.switchmaterial.SwitchMaterial>(R.id.switchUseFolderAsAlbum)
         val btnSelectSource = view.findViewById<Button>(R.id.btnSelectSource)
 
         editRuleName?.setText(rule?.name ?: "")
@@ -407,6 +408,7 @@ class MainActivity : AppCompatActivity() {
         editImmichUrl?.setText(rule?.immichUrl ?: "")
         editApiKey?.setText(rule?.apiKey ?: "")
         editNamePattern?.setText(currentPattern)
+        switchUseFolderAsAlbum.isChecked = rule?.useFolderAsAlbum ?: true
 
         when (currentCategory) {
             FileTypeCategory.IMAGES -> view.findViewById<RadioButton>(R.id.radioImages).isChecked = true
@@ -460,6 +462,7 @@ class MainActivity : AppCompatActivity() {
                         immichUrl = immichUrl,
                         apiKey = apiKey
                     )
+                    newRule.useFolderAsAlbum = switchUseFolderAsAlbum.isChecked
                     newRule.setCategory(fileTypeCategory)
                     if (namePattern.isNotEmpty()) {
                         newRule.setPattern(namePattern)
@@ -471,6 +474,7 @@ class MainActivity : AppCompatActivity() {
                     rule.sourcePath = sourcePath
                     rule.immichUrl = immichUrl
                     rule.apiKey = apiKey
+                    rule.useFolderAsAlbum = switchUseFolderAsAlbum.isChecked
                     rule.setCategory(fileTypeCategory)
                     if (namePattern.isNotEmpty()) {
                         rule.setPattern(namePattern)

app/src/main/res/layout/dialog_immich_rule.xml

@@ -175,6 +175,43 @@
         android:textSize="11sp"
         android:textColor="@android:color/darker_gray" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Usar carpetas como álbum"
+                android:textStyle="bold"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Al desactivar, todos los archivos se suben sin álbum"
+                android:textSize="11sp"
+                android:textColor="@android:color/darker_gray" />
+
+        </LinearLayout>
+
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/switchUseFolderAsAlbum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true" />
+
+    </LinearLayout>
+
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -199,7 +236,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:text="Las subcarpetas dentro de la carpeta monitoreada se usarán como nombres de álbum en Immich. Los archivos sin subcarpeta se subirán sin álbum."
+                android:text="Las subcarpetas dentro de la carpeta monitoreada se usarán como nombres de álbum en Immich. Puedes desactivar esta opción para subir todo sin álbum."
                 android:textSize="12sp"
                 android:textColor="?attr/colorOnPrimaryContainer" />