prepare to support backing up multiple directories and fix bluetooth adapter deprecation

Author: lhns

app/src/main/java/de/lolhens/resticui/BackupManager.kt

@@ -248,7 +248,7 @@ class BackupManager private constructor(context: Context) {
         updateNotification(context, folder.id, activeBackup)
 
         resticRepo.backup(
-            folder.path,
+            listOf(folder.path),
             { progress ->
                 val activeBackupProgress = activeBackupLiveData.value!!.progress(progress)
                 activeBackupLiveData.postValue(activeBackupProgress)

app/src/main/java/de/lolhens/resticui/config/FolderConfig.kt

@@ -12,6 +12,7 @@ import java.time.ZonedDateTime
 data class FolderConfig(
     val id: FolderConfigId,
     val repoId: RepoConfigId,
+    // TODO: support multiple paths
     val path: @Serializable(with = FileSerializer::class) File,
     val schedule: String,
     val keepLast: Int? = null,

app/src/main/java/de/lolhens/resticui/restic/ResticRepo.kt

@@ -123,12 +123,20 @@ abstract class ResticRepo(
         }
 
     fun backup(
-        path: File,
+        paths: List<File>,
         onProgress: (ResticBackupProgress) -> Unit,
         cancel: CompletableFuture<Unit>? = null
-    ): CompletableFuture<ResticBackupSummary> =
-        restic(
-            listOf("--json", "backup", "--host", restic.hostname, path.absolutePath),
+    ): CompletableFuture<ResticBackupSummary> {
+        require(paths.isNotEmpty())
+        return restic(
+            listOf(
+                "--json",
+                "backup",
+                "--host",
+                restic.hostname
+            ).plus(
+                paths.map { it.absolutePath }
+            ),
             filterOut = { line ->
                 val isStatus = line.contains("\"message_type\":\"status\"")
                 if (isStatus) {
@@ -142,4 +150,5 @@ abstract class ResticRepo(
             val json = out.joinToString("\n")
             format.decodeFromString<ResticBackupSummary>(json)
         }
+    }
 }

app/src/main/java/de/lolhens/resticui/util/HostnameUtil.kt

@@ -1,7 +1,7 @@
 package de.lolhens.resticui.util
 
 import android.Manifest
-import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
@@ -10,17 +10,14 @@ object HostnameUtil {
     private const val DEFAULT_HOSTNAME = "android-device"
 
     fun detectHostname(context: Context): String {
+        // Some Devices do not have a BluetoothAdapter e.g. the Android Emulator. They should not pass the permission check
         if (ActivityCompat.checkSelfPermission(
                 context,
                 Manifest.permission.BLUETOOTH_CONNECT
             ) == PackageManager.PERMISSION_GRANTED
         ) {
-            val bluetoothAdapter = BluetoothAdapter.getDefaultAdapter()
-
-            // Some Devices do not have a BluetoothAdapter e.g. the Android Emulator
-            if (bluetoothAdapter != null) {
-                return bluetoothAdapter.name
-            }
+            return (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager)
+                .adapter.name
         }
 
         return DEFAULT_HOSTNAME