Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Treat warnings as errors enabled #264

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Treat warnings as errors enabled #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ea85e0
Treat warnings as errors enabled
ValeraFinebits Jun 14, 2024
43213ea
warning level
ValeraFinebits Jun 15, 2024
aad6da2
Treat warnings as errors enabled
ValeraFinebits Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Eppie.App/Eppie.App.Converters/BoolToValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ namespace Tuvi.App.Converters
{
public class BoolToValueConverter<T> : IValueConverter
{
public T FalseValue { get; set; }
public T TrueValue { get; set; }
public T? FalseValue { get; set; }
public T? TrueValue { get; set; }

public object Convert(object value, Type targetType, object parameter, string language)
public object? Convert(object value, Type targetType, object parameter, string language)
{
if (value == null)
return FalseValue;
Expand Down Expand Up @@ -46,9 +46,9 @@ public class BoolToThicknessConverter : BoolToValueConverter<Thickness> { }

public class BoolToResourceConverter : BoolToStringConverter
{
private ResourceLoader _resourceLoader;
private string _resource;
public String Resource
private ResourceLoader? _resourceLoader;
private string? _resource;
public String? Resource
{
get { return _resource; }
set
Expand All @@ -61,8 +61,8 @@ public String Resource
}
}

private string _falseKey;
public String FalseKey
private string? _falseKey;
public String? FalseKey
{
get { return _falseKey; }
set
Expand All @@ -73,8 +73,8 @@ public String FalseKey
}
}

private string _trueKey;
public String TrueKey
private string? _trueKey;
public String? TrueKey
{
get { return _trueKey; }
set
Expand Down Expand Up @@ -105,12 +105,12 @@ private void Update()

if (TrueKey != null && TrueValue == null)
{
TrueValue = _resourceLoader.GetString(TrueKey);
TrueValue = _resourceLoader?.GetString(TrueKey);
}

if (FalseKey != null && FalseValue == null)
{
FalseValue = _resourceLoader.GetString(FalseKey);
FalseValue = _resourceLoader?.GetString(FalseKey);
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions src/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,46 @@
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>CA1014</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>CA1014</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|uap10.0.19041|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|uap10.0.19041|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|xamarinios10|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|xamarinios10|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|monoandroid12.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|monoandroid12.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="4.8.39" />
Expand Down
12 changes: 6 additions & 6 deletions src/Eppie.App/Eppie.App.Converters/StringConverters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Tuvi.App.Converters
{
public abstract class ValueToStringConverter<T> : IValueConverter
{
public T DefaultValue { get; set; }
public T? DefaultValue { get; set; }

public string DefaultString { get; set; }

Expand All @@ -15,18 +15,18 @@ protected ValueToStringConverter()
DefaultString = "";
}

public virtual string Convert(T value)
public virtual string? Convert(T value)
{
return value.ToString();
return value?.ToString();
}
public abstract T ConvertBack(string value);

public object Convert(object value, Type targetType, object parameter, string language)
public object? Convert(object value, Type targetType, object parameter, string language)
{
return value != null ? Convert((T)value) : DefaultString;
}

public object ConvertBack(object value, Type targetType, object parameter, string language)
public object? ConvertBack(object value, Type targetType, object parameter, string language)
{
return value != null ? ConvertBack((string)value) : DefaultValue;
}
Expand All @@ -46,4 +46,4 @@ public override int ConvertBack(string value)
}
}

}
}
6 changes: 3 additions & 3 deletions src/Eppie.App/Tuvi.OAuth2/AuthorizationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public static ITokenRefresher GetTokenRefresher(AuthorizationProvider authProvid

public class AuthorizationConfiguration
{
public Func<IAuthenticationBroker> AuthenticationBrokerCreator { get; set; }
public Func<GoogleConfiguration> GoogleConfigurationCreator { get; set; }
public Func<OutlookConfiguration> OutlookConfigurationCreator { get; set; }
public Func<IAuthenticationBroker>? AuthenticationBrokerCreator { get; set; }
public Func<GoogleConfiguration>? GoogleConfigurationCreator { get; set; }
public Func<OutlookConfiguration>? OutlookConfigurationCreator { get; set; }
}
}
4 changes: 2 additions & 2 deletions src/Eppie.App/Tuvi.OAuth2/AuthorizationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Tuvi.OAuth2
{
public class AuthorizationProvider
{
public static AuthorizationProvider Create(HttpClient httpClient, Func<IAuthenticationBroker> brokerCreator, Func<GoogleConfiguration> googleConfigCreator, Func<OutlookConfiguration> outlookConfigCreator)
public static AuthorizationProvider Create(HttpClient httpClient, Func<IAuthenticationBroker>? brokerCreator, Func<GoogleConfiguration>? googleConfigCreator, Func<OutlookConfiguration>? outlookConfigCreator)
{
return new AuthorizationProvider(httpClient, brokerCreator, googleConfigCreator, outlookConfigCreator);
}
Expand All @@ -20,7 +20,7 @@ public static AuthorizationProvider Create(HttpClient httpClient, Func<IAuthenti
private readonly Func<GoogleConfiguration> _googleConfigurationCreator;
private readonly Func<OutlookConfiguration> _outlookConfigurationCreator;

private AuthorizationProvider(HttpClient httpClient, Func<IAuthenticationBroker> brokerCreator, Func<GoogleConfiguration> googleConfigCreator, Func<OutlookConfiguration> outlookConfigCreator)
private AuthorizationProvider(HttpClient httpClient, Func<IAuthenticationBroker>? brokerCreator, Func<GoogleConfiguration>? googleConfigCreator, Func<OutlookConfiguration>? outlookConfigCreator)
{
if (httpClient is null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Eppie.App/Tuvi.OAuth2/DefaultEmailConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static Account CreateDefaultOAuth2Account(MailService mailService)
return CreateOAuth2Account(mailService, null, null);
}

public static Account CreateOAuth2Account(MailService mailService, string email, string refreshToken)
public static Account CreateOAuth2Account(MailService mailService, string? email, string? refreshToken)
{
var accountData = Account.Default;

Expand Down Expand Up @@ -70,11 +70,11 @@ public static Account CreateOAuth2Account(MailService mailService, string email,
internal class DefaultAccountData
{
public MailProtocol IncomingMailProtocol { get; set; } = MailProtocol.IMAP;
public string IncomingServerAddress { get; set; }
public string? IncomingServerAddress { get; set; }
public int IncomingServerPort { get; set; } = 993;

public MailProtocol OutgoingMailProtocol { get; set; } = MailProtocol.SMTP;
public string OutgoingServerAddress { get; set; }
public string? OutgoingServerAddress { get; set; }
public int OutgoingServerPort { get; set; } = 465; // SSL
}
}
6 changes: 4 additions & 2 deletions src/Eppie.App/Tuvi.OAuth2/Tuvi.OAuth2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
</PropertyGroup>

<ItemGroup>
Expand Down