Merge remote-tracking branch 'origin/main'

NeoApplications · Feb 16, 2024 · e9d55ec · e9d55ec
2 parents e4acfc8 + 246e193
commit e9d55ec
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 51 deletions.
diff --git a/app/src/main/assets/files/tar.sh b/app/src/main/assets/files/tar.sh
@@ -47,7 +47,7 @@ elif [[ $command == "extract" ]]; then
   dir=$1
   shift
 
-  $utilbox tar -x -f "$archive" -C "$dir" $exclude
+  $utilbox tar -x -o -f "$archive" -C "$dir" $exclude
 
   exit $?
 fi

diff --git a/app/src/main/java/com/machiav3lli/backup/OABX.kt b/app/src/main/java/com/machiav3lli/backup/OABX.kt
@@ -77,7 +77,6 @@ import kotlinx.serialization.modules.SerializersModule
 import timber.log.Timber
 import java.lang.Integer.max
 import java.lang.ref.WeakReference
-import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -118,8 +117,8 @@ val pref_uncaughtExceptionsJumpToPreferences = BooleanPref(
 
 val pref_logToSystemLogcat = BooleanPref(
     key = "dev-log.logToSystemLogcat",
-    summary = "log to Android logcat, otherwise only internal (internal doesn't help if the app is restarted)",
-    defaultValue = false
+    summary = "log to Android logcat, otherwise only internal (internal doesn't help if the app is restarted or if you are catching logs externally, e.g. via Scoop)",
+    defaultValue = true
 )
 
 val pref_autoLogExceptions = BooleanPref(

diff --git a/app/src/main/java/com/machiav3lli/backup/actions/BackupAppAction.kt b/app/src/main/java/com/machiav3lli/backup/actions/BackupAppAction.kt
@@ -492,6 +492,10 @@ open class BackupAppAction(context: Context, work: AppActionWork?, shell: ShellH
             }
 
             result = true
+        } catch (e: IOException) {
+            val message = "${e.javaClass.canonicalName} occurred on $dataType backup: $e"
+            Timber.e(message)
+            throw BackupFailedException(message, e)
         } catch (e: Throwable) {
             val message = "${e.javaClass.canonicalName} occurred on $dataType backup: $e"
             LogsHandler.unexpectedException(e, message)

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/item/MainPackageItem.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/item/MainPackageItem.kt
@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
@@ -190,12 +190,12 @@ fun Selections(
     else {
         DropdownMenuItem(
             enabled = false, onClick = {},
-            text = { Text("selections saved:") }
+            text = { Text("--- selections saved ---") }
         )
         files.forEach { file ->
             file.name?.let { name ->
                 DropdownMenuItem(
-                    text = { Text(name) },
+                    text = { Text("  $name") },
                     onClick = {
                         when (action) {
                             "get" -> {
@@ -230,12 +230,12 @@ fun Selections(
         else {
             DropdownMenuItem(
                 enabled = false, onClick = {},
-                text = { Text("schedules include:") }
+                text = { Text("--- schedules include ---") }
             )
             schedules.forEach { schedule ->
                 schedule.name.let { name ->
                     DropdownMenuItem(
-                        text = { Text(name) },
+                        text = { Text("  $name") },
                         onClick = {
                             when (action) {
                                 "get" -> {
@@ -258,12 +258,12 @@ fun Selections(
             }
             DropdownMenuItem(
                 enabled = false, onClick = {},
-                text = { Text("schedules exclude:") }
+                text = { Text("--- schedules exclude ---") }
             )
             schedules.forEach { schedule ->
                 schedule.name.let { name ->
                     DropdownMenuItem(
-                        text = { Text(name) },
+                        text = { Text("  $name") },
                         onClick = {
                             when (action) {
                                 "get" -> {
@@ -284,29 +284,29 @@ fun Selections(
                     )
                 }
             }
-            DropdownMenuItem(
-                enabled = false, onClick = {},
-                text = { Text("global:") }
-            )
-            DropdownMenuItem(
-                text = { Text("blocklist") },
-                onClick = {
-                    when (action) {
-                        "get" -> {
-                            val newSelection =
-                                OABX.main?.viewModel?.getBlocklist()
-                                    ?: emptyList()
-                            onAction(newSelection)
-                        }
+        }
+        DropdownMenuItem(
+            enabled = false, onClick = {},
+            text = { Text("--- global ---") }
+        )
+        DropdownMenuItem(
+            text = { Text("  blocklist") },
+            onClick = {
+                when (action) {
+                    "get" -> {
+                        val newSelection =
+                            OABX.main?.viewModel?.getBlocklist()
+                                ?: emptyList()
+                        onAction(newSelection)
+                    }
 
-                        "put" -> {
-                            OABX.main?.viewModel?.setBlocklist(selection.toSet())
-                            onAction(selection)
-                        }
+                    "put" -> {
+                        OABX.main?.viewModel?.setBlocklist(selection.toSet())
+                        onAction(selection)
                     }
                 }
-            )
-        }
+            }
+        )
     }
 }
 
@@ -469,11 +469,11 @@ fun launchRestore(packages: List<Package>) {
     )
 }
 
-fun launchToBlocklist(packages: List<Package>) {
-    launchEachPackage(packages, "blocklist <-", parallel = false) {
-        OABX.main?.viewModel?.addToBlocklist(it.packageName)
-    }
-}
+// fun launchToBlocklist(packages: List<Package>) {
+//     launchEachPackage(packages, "blocklist <-", parallel = false) {
+//         OABX.main?.viewModel?.addToBlocklist(it.packageName)
+//     }
+// }
 
 fun launchEnable(packages: List<Package>) {
     launchEachPackage(packages, "enable", parallel = false) {
@@ -590,7 +590,7 @@ fun MainPackageContextMenu(
                 }
             )
 
-            Divider() //----------------------------------------------------------------------------
+            HorizontalDivider() //----------------------------------------------------------------------------
         }
 
         DropdownMenuItem(
@@ -673,7 +673,7 @@ fun MainPackageContextMenu(
 
         if (selection.count { it.value } > 0) {
 
-            Divider() //----------------------------------------------------------------------------
+            HorizontalDivider() //----------------------------------------------------------------------------
 
             DropdownMenuItem(
                 enabled = false, onClick = {},
@@ -699,20 +699,20 @@ fun MainPackageContextMenu(
                 }
             )
 
-            Divider() //----------------------------------------------------------------------------
+            //  Divider() //----------------------------------------------------------------------------
 
-            DropdownMenuItem(
-                text = { Text("Add to Blocklist...") },
-                onClick = {
-                    openSubMenu(subMenu) {
-                        Confirmation(expanded) {
-                            launchToBlocklist(selectedVisible)
-                        }
-                    }
-                }
-            )
+            //  DropdownMenuItem(
+            //      text = { Text("Add to Blocklist...") },
+            //      onClick = {
+            //          openSubMenu(subMenu) {
+            //              Confirmation(expanded) {
+            //                  launchToBlocklist(selectedVisible)
+            //              }
+            //          }
+            //      }
+            //  )
 
-            Divider() //----------------------------------------------------------------------------
+            HorizontalDivider() //----------------------------------------------------------------------------
 
             DropdownMenuItem(
                 text = { Text("Enable") },
@@ -744,7 +744,7 @@ fun MainPackageContextMenu(
                 }
             )
 
-            Divider() //----------------------------------------------------------------------------
+            HorizontalDivider() //----------------------------------------------------------------------------
 
             DropdownMenuItem(
                 text = { Text("Delete All Backups...") },