Add custom header support

app/src/main/java/io/homeassistant/companion/android/settings/server/ServerSettingsFragment.kt

@@ -31,6 +31,7 @@ import io.homeassistant.companion.android.launch.LaunchActivity
 import io.homeassistant.companion.android.settings.SettingsActivity
 import io.homeassistant.companion.android.settings.ssid.SsidFragment
 import io.homeassistant.companion.android.settings.url.ExternalUrlFragment
+import io.homeassistant.companion.android.settings.url.HeadersFragment
 import io.homeassistant.companion.android.settings.websocket.WebsocketSettingFragment
 import io.homeassistant.companion.android.webview.WebViewActivity
 import kotlinx.coroutines.launch
@@ -153,6 +154,18 @@ class ServerSettingsFragment : ServerSettingsView, PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        findPreference<Preference>("connection_headers")?.setOnPreferenceClickListener {
+            parentFragmentManager.commit {
+                replace(
+                    R.id.content,
+                    HeadersFragment::class.java,
+                    Bundle().apply { putInt(HeadersFragment.EXTRA_SERVER, serverId) }
+                )
+                addToBackStack(getString(commonR.string.pref_headers))
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         findPreference<Preference>("connection_internal_ssids")?.let {
             it.setOnPreferenceClickListener {
                 onDisplaySsidScreen()

app/src/main/java/io/homeassistant/companion/android/settings/url/HeadersFragment.kt

@@ -0,0 +1,51 @@
+package io.homeassistant.companion.android.settings.url
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import com.google.accompanist.themeadapter.material.MdcTheme
+import dagger.hilt.android.AndroidEntryPoint
+import io.homeassistant.companion.android.common.R
+import io.homeassistant.companion.android.settings.url.views.HeadersView
+
+@AndroidEntryPoint
+class HeadersFragment : Fragment() {
+
+    companion object {
+        const val EXTRA_SERVER = "server"
+    }
+
+    val viewModel by viewModels<HeadersViewModel>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        if (viewModel.headers.size == 0) {
+            viewModel.headers[""] = ""
+        }
+        return ComposeView(requireContext()).apply {
+            setContent {
+                MdcTheme {
+                    HeadersView( headersViewModel = viewModel )
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        activity?.title = getString(R.string.pref_headers)
+    }
+
+}

app/src/main/java/io/homeassistant/companion/android/settings/url/HeadersViewModel.kt

@@ -0,0 +1,66 @@
+package io.homeassistant.companion.android.settings.url
+
+import android.app.Application
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import io.homeassistant.companion.android.common.data.servers.ServerManager
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class HeadersViewModel @Inject constructor(
+    state: SavedStateHandle,
+    private val serverManager: ServerManager,
+    application: Application
+) : AndroidViewModel(application) {
+
+    var headers: SnapshotStateMap<String, String> = mutableStateMapOf()
+        private set
+
+    private var serverId = -1
+
+    init {
+        state.get<Int>(HeadersFragment.EXTRA_SERVER)?.let { serverId = it }
+        serverManager.getServer(serverId)?.let { server ->
+            server.connection.headers.entries.forEach { entry ->
+                headers[entry.key] = entry.value
+            }
+        }
+    }
+
+    fun removeHeader(headerName: String) {
+        headers.remove(headerName)
+        saveHeaders()
+    }
+
+    fun setHeader(headerName: String, headerValue: String) {
+        headers[headerName] = headerValue
+        saveHeaders()
+    }
+
+    fun setHeaders(newHeaders: MutableMap<String, String>) {
+        viewModelScope.launch {
+            headers.clear()
+            newHeaders.forEach {
+                headers[it.key] = it.value
+            }
+        }
+    }
+
+    private fun saveHeaders() {
+        serverManager.getServer(serverId)?.let {
+            serverManager.updateServer(
+                it.copy(
+                    connection = it.connection.copy(
+                        headers = headers
+                    )
+                )
+            )
+        }
+    }
+
+}

app/src/main/java/io/homeassistant/companion/android/settings/url/views/HeadersView.kt

@@ -0,0 +1,98 @@
+package io.homeassistant.companion.android.settings.url.views
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.PlusOne
+import androidx.compose.material.rememberScaffoldState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import io.homeassistant.companion.android.settings.url.HeadersViewModel
+import kotlinx.coroutines.handleCoroutineException
+import io.homeassistant.companion.android.common.R as commonR
+
+//private fun createHeaderRow(headerName: String, headerValue: String):  {
+//
+//}
+
+@Composable
+fun HeadersView(
+    headersViewModel: HeadersViewModel
+) {
+    Column(
+        modifier = Modifier.padding(vertical = 5.dp)
+    ) {
+        val scaffoldState = rememberScaffoldState()
+        val headerEntries = headersViewModel.headers.entries.toList()
+        Scaffold(
+            scaffoldState = scaffoldState
+        ) { padding ->
+            LazyColumn(modifier = Modifier.padding(padding)) {
+                items(headerEntries.size) {index ->
+                    val headerEntry = headerEntries[index]
+                    Row( modifier = Modifier.padding(horizontal = 16.dp, vertical = 5.dp) ) {
+                        Text(
+                            text = stringResource(commonR.string.pref_headers_heading, index + 1),
+                            fontWeight = FontWeight.Bold
+                        )
+                    }
+                    Row( modifier = Modifier.padding(horizontal = 16.dp, vertical = 5.dp) ) {
+                        TextField(
+                            label = {Text(stringResource(commonR.string.pref_headers_name_label))},
+                            value = headerEntry.key,
+                            onValueChange = {
+                                headersViewModel.removeHeader(headerEntry.key)
+                                headersViewModel.setHeader(it, headerEntry.value)
+                            },
+                        )
+                    }
+                    Row( modifier = Modifier.padding(horizontal = 16.dp, vertical = 5.dp) ) {
+                        TextField(
+                            label = {Text(stringResource(commonR.string.pref_headers_value_label))},
+                            value = headerEntry.value,
+                            onValueChange = { headersViewModel.setHeader(headerEntry.key, it) },
+                        )
+                        Icon(
+                            imageVector = Icons.Default.Clear,
+                            contentDescription = stringResource(commonR.string.pref_headers_remove_header),
+                            tint = colorResource(commonR.color.colorWarning),
+                            modifier = Modifier
+                                .clickable { headersViewModel.removeHeader(headerEntry.key) }
+                                .size(48.dp)
+                                .padding(all = 12.dp)
+                        )
+
+                        if (index == (headerEntries.size - 1)) {
+                            Icon(
+                                imageVector = Icons.Default.PlusOne,
+                                contentDescription = stringResource(commonR.string.pref_headers_add_header),
+                                tint = colorResource(commonR.color.colorPrimary),
+                                modifier = Modifier
+                                    .clickable { headersViewModel.setHeader("", "") }
+                                    .size(48.dp)
+                                    .padding(all = 12.dp)
+                            )
+                        }
+
+                    }
+                    Divider(modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp))
+                }
+            }
+        }
+    }
+}

app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt

@@ -1442,6 +1442,9 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
                         URLUtil.guessFileName(url, contentDisposition, mimetype)
                     )
                 val server = serverManager.getServer(presenter.getActiveServer())
+                server?.connection?.headers?.forEach {
+                    request.addRequestHeader(it.key, it.value)
+                }
                 if (url.startsWith(server?.connection?.getUrl(true).toString()) ||
                     url.startsWith(server?.connection?.getUrl(false).toString())
                 ) {

app/src/main/res/xml/preferences_server.xml

@@ -28,6 +28,11 @@
             android:key="connection_external"
             android:icon="@drawable/ic_globe"
             android:title="@string/pref_connection_url"/>
+        <Preference
+            android:icon="@drawable/leak"
+            android:key="connection_headers"
+            android:summary="@string/pref_headers_summary"
+            android:title="@string/pref_headers" />
         <Preference
             android:key="connection_internal_ssids"
             android:icon="@drawable/ic_wifi"

common/schemas/io.homeassistant.companion.android.database.AppDatabase/40.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 40,
-    "identityHash": "9ec60cb96f3febd24dc5713f23f65e50",
+    "identityHash": "391791dc932c818fce04429f3aca55be",
     "entities": [
       {
         "tableName": "sensor_attributes",
@@ -796,7 +796,7 @@
       },
       {
         "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `_name` TEXT NOT NULL, `name_override` TEXT, `_version` TEXT, `list_order` INTEGER NOT NULL, `device_name` TEXT, `external_url` TEXT NOT NULL, `internal_url` TEXT, `cloud_url` TEXT, `webhook_id` TEXT, `secret` TEXT, `cloudhook_url` TEXT, `use_cloud` INTEGER NOT NULL, `internal_ssids` TEXT NOT NULL, `prioritize_internal` INTEGER NOT NULL, `access_token` TEXT, `refresh_token` TEXT, `token_expiration` INTEGER, `token_type` TEXT, `install_id` TEXT, `user_id` TEXT, `user_name` TEXT, `user_is_owner` INTEGER, `user_is_admin` INTEGER)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `_name` TEXT NOT NULL, `name_override` TEXT, `_version` TEXT, `list_order` INTEGER NOT NULL, `device_name` TEXT, `external_url` TEXT NOT NULL, `headers` TEXT, `internal_url` TEXT, `cloud_url` TEXT, `webhook_id` TEXT, `secret` TEXT, `cloudhook_url` TEXT, `use_cloud` INTEGER NOT NULL, `internal_ssids` TEXT NOT NULL, `prioritize_internal` INTEGER NOT NULL, `access_token` TEXT, `refresh_token` TEXT, `token_expiration` INTEGER, `token_type` TEXT, `install_id` TEXT, `user_id` TEXT, `user_name` TEXT, `user_is_owner` INTEGER, `user_is_admin` INTEGER)",
         "fields": [
           {
             "fieldPath": "id",
@@ -840,6 +840,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "connection.headers",
+            "columnName": "headers",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "connection.internalUrl",
             "columnName": "internal_url",
@@ -988,7 +994,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9ec60cb96f3febd24dc5713f23f65e50')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '391791dc932c818fce04429f3aca55be')"
     ]
   }
 }