From 30d6a4d9eb4195ee170fe25a6d12615dd0430ede Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 29 Feb 2020 00:42:11 -0500 Subject: [PATCH] restrictions apparantly cannot have a null default value --- src/Android/Resources/xml/app_restrictions.xml | 2 +- src/App/Utilities/AppHelpers.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Android/Resources/xml/app_restrictions.xml b/src/Android/Resources/xml/app_restrictions.xml index e6f7a37c3..68b5bb0fb 100644 --- a/src/Android/Resources/xml/app_restrictions.xml +++ b/src/Android/Resources/xml/app_restrictions.xml @@ -5,5 +5,5 @@ android:title="@string/SelfHostedServerUrl" android:restrictionType="string" android:description="@string/ServerUrl" - android:defaultValue="@null" /> + android:defaultValue="" /> diff --git a/src/App/Utilities/AppHelpers.cs b/src/App/Utilities/AppHelpers.cs index 82d75f96f..c039ca7a3 100644 --- a/src/App/Utilities/AppHelpers.cs +++ b/src/App/Utilities/AppHelpers.cs @@ -163,7 +163,7 @@ namespace Bit.App.Utilities { await environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData { - Base = setting.Value, + Base = string.IsNullOrWhiteSpace(setting.Value) ? null : setting.Value, Api = environmentService.ApiUrl, Identity = environmentService.IdentityUrl, WebVault = environmentService.WebVaultUrl,