Add possibility edit user agent string in UI and save it to database

Author: sunkup

app/src/main/java/at/bitfire/icsdroid/db/AppDatabase.kt

@@ -29,7 +29,7 @@ import javax.inject.Singleton
 @TypeConverters(Converters::class)
 @Database(
     entities = [Subscription::class, Credential::class],
-    version = 4,
+    version = 5,
     autoMigrations = [
         AutoMigration (
             from = 1,
@@ -42,6 +42,10 @@ import javax.inject.Singleton
         AutoMigration (
             from = 3,
             to = 4
+        ),
+        AutoMigration (
+            from = 4,
+            to = 5
         )
     ]
 )

app/src/main/java/at/bitfire/icsdroid/model/EditSubscriptionModel.kt

@@ -105,6 +105,7 @@ class EditSubscriptionModel @AssistedInject constructor(
             setUrl(subscription.url.toString())
             setTitle(subscription.displayName)
             setColor(subscription.color)
+//            setCustomUserAgent(subscription.customUserAgent)
             setIgnoreAlerts(subscription.ignoreEmbeddedAlerts)
             setDefaultAlarmMinutes(subscription.defaultAlarmMinutes?.toString())
             setDefaultAllDayAlarmMinutes(subscription.defaultAllDayAlarmMinutes?.toString())
@@ -134,6 +135,7 @@ class EditSubscriptionModel @AssistedInject constructor(
                 val newSubscription = subscription.copy(
                     displayName = title ?: subscription.displayName,
                     color = color,
+//                    customUserAgent = customUserAgent,
                     defaultAlarmMinutes = defaultAlarmMinutes,
                     defaultAllDayAlarmMinutes = defaultAllDayAlarmMinutes,
                     ignoreEmbeddedAlerts = ignoreAlerts,

app/src/main/java/at/bitfire/icsdroid/model/SubscriptionSettingsUseCase.kt

@@ -19,6 +19,7 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         val urlError: String? = null,
         val title: String? = null,
         val color: Int? = null,
+        val customUserAgent: String? = null,
         val ignoreAlerts: Boolean = false,
         val defaultAlarmMinutes: Long? = null,
         val defaultAllDayAlarmMinutes: Long? = null,
@@ -67,6 +68,9 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         uiState = uiState.copy(color = value)
     }
 
+    fun setCustomUserAgent(value: String?) {
+        uiState = uiState.copy(customUserAgent = value)
+    }
     fun setIgnoreAlerts(value: Boolean) {
         uiState = uiState.copy(ignoreAlerts = value)
     }
@@ -87,6 +91,7 @@ class SubscriptionSettingsUseCase @Inject constructor() {
         uiState.url == subscription.url.toString()
             && uiState.title == subscription.displayName
             && uiState.color == subscription.color
+//            && uiState.customUserAgent == subscription.customUserAgent
             && uiState.ignoreAlerts == subscription.ignoreEmbeddedAlerts
             && uiState.defaultAlarmMinutes == subscription.defaultAlarmMinutes
             && uiState.defaultAllDayAlarmMinutes == subscription.defaultAllDayAlarmMinutes

app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt

@@ -188,6 +188,8 @@ fun AddSubscriptionScreen(
             onTitleChange = ::setTitle,
             color = uiState.color,
             onColorChange = ::setColor,
+            customUserAgent = uiState.customUserAgent,
+            onCustomUserAgentChange = ::setCustomUserAgent,
             ignoreAlerts = uiState.ignoreAlerts,
             onIgnoreAlertsChange = ::setIgnoreAlerts,
             defaultAlarmMinutes = uiState.defaultAlarmMinutes,
@@ -261,6 +263,8 @@ fun AddSubscriptionScreen(
     onTitleChange: (String) -> Unit,
     color: Int?,
     onColorChange: (Int) -> Unit,
+    customUserAgent: String?,
+    onCustomUserAgentChange: (String) -> Unit,
     ignoreAlerts: Boolean,
     onIgnoreAlertsChange: (Boolean) -> Unit,
     defaultAlarmMinutes: Long?,
@@ -320,6 +324,8 @@ fun AddSubscriptionScreen(
                     titleChanged = onTitleChange,
                     color = color,
                     colorChanged = onColorChange,
+                    customUserAgent = customUserAgent,
+                    customUserAgentChanged = onCustomUserAgentChange,
                     ignoreAlerts = ignoreAlerts,
                     ignoreAlertsChanged = onIgnoreAlertsChange,
                     defaultAlarmMinutes = defaultAlarmMinutes,

app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt

@@ -74,6 +74,8 @@ fun EditSubscriptionScreen(
             titleChanged = ::setTitle,
             color = uiState.color,
             colorChanged = ::setColor,
+            customUserAgent = uiState.customUserAgent,
+            customUserAgentChanged = ::setCustomUserAgent,
             ignoreAlerts = uiState.ignoreAlerts,
             ignoreAlertsChanged = ::setIgnoreAlerts,
             defaultAlarmMinutes = uiState.defaultAlarmMinutes,
@@ -110,6 +112,8 @@ fun EditSubscriptionScreen(
     titleChanged: (String) -> Unit,
     color: Int?,
     colorChanged: (Int) -> Unit,
+    customUserAgent: String?,
+    customUserAgentChanged: (String) -> Unit,
     ignoreAlerts: Boolean,
     ignoreAlertsChanged: (Boolean) -> Unit,
     defaultAlarmMinutes: Long?,
@@ -157,6 +161,8 @@ fun EditSubscriptionScreen(
                 titleChanged = titleChanged,
                 color = color,
                 colorChanged = colorChanged,
+                customUserAgent = customUserAgent,
+                customUserAgentChanged = customUserAgentChanged,
                 ignoreAlerts = ignoreAlerts,
                 ignoreAlertsChanged = ignoreAlertsChanged,
                 defaultAlarmMinutes = defaultAlarmMinutes,
@@ -275,6 +281,8 @@ fun EditSubscriptionScreen_Preview() {
             titleChanged = {},
             color = 0,
             colorChanged = {},
+            customUserAgent = "customUserAgent",
+            customUserAgentChanged = {},
             ignoreAlerts = true,
             ignoreAlertsChanged = {},
             defaultAlarmMinutes = 20L,

app/src/main/java/at/bitfire/icsdroid/ui/views/SubscriptionSettingsComposable.kt

@@ -45,6 +45,8 @@ fun SubscriptionSettingsComposable(
     titleChanged: (String) -> Unit,
     color: Int?,
     colorChanged: (Int) -> Unit,
+    customUserAgent: String?,
+    customUserAgentChanged: (String) -> Unit,
     ignoreAlerts: Boolean,
     ignoreAlertsChanged: (Boolean) -> Unit,
     defaultAlarmMinutes: Long?,
@@ -189,6 +191,24 @@ fun SubscriptionSettingsComposable(
             checked = ignoreDescription,
             onCheckedChange = onIgnoreDescriptionChanged
         )
+
+        // Custom User Agent
+        Text(
+            text = stringResource(R.string.add_calendar_custom_user_agent_title),
+            style = MaterialTheme.typography.bodyLarge,
+        )
+        Text(
+            text = stringResource(R.string.add_calendar_custom_user_agent_description),
+            color = Color.Gray,
+            style = MaterialTheme.typography.bodyMedium,
+        )
+        OutlinedTextField(
+            value = customUserAgent ?: "",
+            onValueChange = customUserAgentChanged,
+            label = { Text(stringResource(R.string.add_calendar_custom_user_agent_title)) },
+            modifier = Modifier.fillMaxWidth(),
+            enabled = !isCreating
+        )
     }
 }
 
@@ -202,6 +222,8 @@ fun SubscriptionSettingsComposable_Preview() {
             titleChanged = {},
             color = 0,
             colorChanged = {},
+            customUserAgent = "customUserAgent",
+            customUserAgentChanged = {},
             ignoreAlerts = true,
             ignoreAlertsChanged = {},
             defaultAlarmMinutes = 20L,

app/src/main/res/values/strings.xml

@@ -88,6 +88,8 @@
     <string name="add_calendar_advanced_title">Advanced</string>
     <string name="add_calendar_description_title">Ignore DESCRIPTION field</string>
     <string name="add_calendar_description_summary">If enabled, the DESCRIPTION field will be removed from events. Helpful if it contains spammy information.</string>
+    <string name="add_calendar_custom_user_agent_title">Custom User Agent</string>
+    <string name="add_calendar_custom_user_agent_description">This will override the default user agent</string>
 
     <!-- AlertFragment -->
     <string name="alert_share_details">Share details</string>