add extraction support for - "tar.bz2", "tar.gz", "tar.lz4", "tar.lzm…

…a", "tar.sz", "tar.xz", "tar.z", "tar.zstd"

app/build.gradle

@@ -19,7 +19,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable = false
             applicationIdSuffix '.release'
@@ -74,8 +74,11 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.0'
 
     //apache commons compress
-    implementation 'org.apache.commons:commons-compress:1.24.0'
-    implementation 'org.tukaani:xz:1.9'
+    implementation 'org.apache.commons:commons-compress:1.27.1'
+    implementation 'org.tukaani:xz:1.10'
+
+    //zstd-jni
+    implementation "com.github.luben:zstd-jni:1.5.6-3"
 
     //zip4j
     implementation 'net.lingala.zip4j:zip4j:2.11.5'

app/src/main/AndroidManifest.xml

@@ -112,6 +112,11 @@
             android:foregroundServiceType="dataSync"
             android:exported="false" />
 
+        <service
+            android:name=".service.ExtractCsArchiveService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
 
 
     </application>

app/src/main/java/com/wirelessalien/zipxtract/activity/MainActivity.kt

@@ -16,6 +16,7 @@ import android.os.FileObserver
 import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -62,6 +63,7 @@ import com.wirelessalien.zipxtract.service.Archive7zService
 import com.wirelessalien.zipxtract.service.ArchiveSplitZipService
 import com.wirelessalien.zipxtract.service.ArchiveZipService
 import com.wirelessalien.zipxtract.service.ExtractArchiveService
+import com.wirelessalien.zipxtract.service.ExtractCsArchiveService
 import com.wirelessalien.zipxtract.service.ExtractMultipart7zService
 import com.wirelessalien.zipxtract.service.ExtractMultipartZipService
 import com.wirelessalien.zipxtract.service.ExtractRarService
@@ -686,12 +688,19 @@ class MainActivity : AppCompatActivity(), FileAdapter.OnItemClickListener, FileA
         val btnCompress7z = bottomSheetView.findViewById<Button>(R.id.btnCompress7z)
         val btnMultiZipExtract = bottomSheetView.findViewById<Button>(R.id.btnMultiZipExtract)
 
-        // Show extract option only for archive files
-        btnExtract.visibility = if (isArchiveFile(file)) View.VISIBLE else View.GONE
 
         val filePath = file.absolutePath
+
         btnExtract.setOnClickListener {
-            showPasswordInputDialog(filePaths)
+            val fileExtension = file.name.split('.').takeLast(2).joinToString(".").lowercase()
+            Log.d("FileExtension", fileExtension)
+            val supportedExtensions = listOf("tar.bz2", "tar.gz", "tar.lz4", "tar.lzma", "tar.sz", "tar.xz", "tar.z", "tar.zstd")
+
+            if (supportedExtensions.any { fileExtension.endsWith(it) }) {
+                startExtractionCsService(filePaths)
+            } else {
+                showPasswordInputDialog(filePaths)
+            }
             bottomSheetDialog.dismiss()
         }
 
@@ -723,10 +732,6 @@ class MainActivity : AppCompatActivity(), FileAdapter.OnItemClickListener, FileA
         bottomSheetDialog.show()
     }
 
-    private fun isArchiveFile(file: File): Boolean {
-        val archiveExtensions = listOf("zip", "7z", "rar")
-        return archiveExtensions.contains(file.extension.lowercase())
-    }
 
     private fun showPasswordInputDialog(file: String) {
         val dialogView = layoutInflater.inflate(R.layout.password_input_dialog, null)
@@ -806,6 +811,15 @@ class MainActivity : AppCompatActivity(), FileAdapter.OnItemClickListener, FileA
         ContextCompat.startForegroundService(this, intent)
     }
 
+    private fun startExtractionCsService(file: String) {
+        progressDialog.show()
+        val intent = Intent(this, ExtractCsArchiveService::class.java).apply {
+            putExtra(ExtractArchiveService.EXTRA_FILE_PATH, file)
+
+        }
+        ContextCompat.startForegroundService(this, intent)
+    }
+
     private fun startRarExtractionService(file: String, password: String?) {
         progressDialog.show()
         val intent = Intent(this, ExtractRarService::class.java).apply {

app/src/main/java/com/wirelessalien/zipxtract/adapter/FilePathAdapter.kt

@@ -0,0 +1,76 @@
+/*
+ *  Copyright (C) 2023  WirelessAlien <https://github.com/WirelessAlien>
+ *
+ *     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
+ *     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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.wirelessalien.zipxtract.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.wirelessalien.zipxtract.R
+import java.io.File
+
+class FilePathAdapter(private val filePaths: MutableList<String>, private val onDeleteClick: (String) -> Unit) :
+    RecyclerView.Adapter<FilePathAdapter.ViewHolder>() {
+
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val filePathText: TextView = itemView.findViewById(R.id.textFileName)
+        val deleteButton: Button = itemView.findViewById(R.id.deleteBtn)
+
+        init {
+            deleteButton.setOnClickListener {
+                val position = adapterPosition
+                if (position != RecyclerView.NO_POSITION) {
+                    val filePath = filePaths[position]
+                    onDeleteClick(filePath)
+                }
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.list_item_file, parent, false)
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val filePath = filePaths[position]
+        holder.filePathText.text = filePath
+
+        val file = File(filePath)
+        if (file.isDirectory) {
+            holder.deleteButton.visibility = View.GONE
+        } else {
+            holder.deleteButton.visibility = View.VISIBLE
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return filePaths.size
+    }
+
+    fun removeFilePath(filePath: String) {
+        val position = filePaths.indexOf(filePath)
+        if (position != -1) {
+            filePaths.removeAt(position)
+            notifyItemRemoved(position)
+            notifyItemRangeChanged(position, filePaths.size)
+        }
+    }
+}

app/src/main/java/com/wirelessalien/zipxtract/constant/BroadcastConstants.kt

@@ -29,6 +29,8 @@ object BroadcastConstants {
     const val ACTION_ARCHIVE_ERROR = "ACTION_ARCHIVE_ERROR"
     const val ACTION_EXTRACTION_COMPLETE = "ACTION_EXTRACTION_COMPLETE"
     const val ACTION_EXTRACTION_ERROR = "ACTION_EXTRACTION_ERROR"
+    const val ARCHIVE_NOTIFICATION_CHANNEL_ID = "archive_notification_channel"
+    const val EXTRACTION_NOTIFICATION_CHANNEL_ID = "extraction_notification_channel"
     const val ACTION_EXTRACTION_PROGRESS = "ACTION_EXTRACTION_PROGRESS"
     const val ACTION_ARCHIVE_PROGRESS = "ACTION_ARCHIVE_PROGRESS"
     const val EXTRA_PROGRESS = "progress"

app/src/main/java/com/wirelessalien/zipxtract/service/ArchiveZipService.kt

@@ -227,7 +227,6 @@ class ArchiveZipService : Service() {
         }
     }
 
-
     private fun updateProgress(progress: Int) {
         val notification = createNotification(progress)
         val notificationManager = getSystemService(NotificationManager::class.java)
@@ -253,15 +252,15 @@ class ArchiveZipService : Service() {
     private fun showCompletionNotification(error: String) {
         stopForegroundService()
 
-        val notification = NotificationCompat.Builder(this, ExtractArchiveService.CHANNEL_ID)
+        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle("Extraction Complete")
             .setContentText(error)
             .setSmallIcon(R.drawable.ic_notification_icon)
             .setAutoCancel(true)
             .build()
 
         val notificationManager = getSystemService(NotificationManager::class.java)
-        notificationManager.notify(ExtractArchiveService.NOTIFICATION_ID + 1, notification)
+        notificationManager.notify(NOTIFICATION_ID + 1, notification)
     }
 
     @Suppress("DEPRECATION")