Skip to content

Commit

Permalink
Merge pull request #82 from aschuhardt/beta
Browse files Browse the repository at this point in the history 
1.4.8 Bug Fixes
  • Loading branch information
@aschuhardt
aschuhardt authored Jul 28, 2024
2 parents c17e1df + 63ae094 commit 639a758
Show file tree
Hide file tree
Showing 10 changed files with 114 additions and 95 deletions.
12 changes: 5 additions & 7 deletions Database/BrowsingDatabase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,25 +236,23 @@ public bool TryGetCapsule(string hostname, out Capsule capsule)
return capsule != null;
}

public void AcceptHostCertificate(string host)
public void RemoveHostCertificate(string host)
{
if (!TryGetHostCertificate(host, out var cert))
{
_logger.LogWarning(@"Cannot accept a host certificate for {Host} that has not yet been stored", host);
_logger.LogWarning(@"Cannot removed stored certificate metadata for unknown host {Host}", host);
return;
}

_logger.LogDebug(@"Accepting new certificate for host {Host}", host);

cert.Accepted = true;
_logger.LogDebug(@"Removing certificate metadata for host {Host}", host);

try
{
_database.Update(cert);
_database.Delete(cert);
}
catch (Exception e)
{
_logger.LogError(e, @"Exception thrown while accepting a new host certificate");
_logger.LogError(e, @"Exception thrown while removing a host certificate");
}
}

Expand Down
2 changes: 1 addition & 1 deletion Interfaces/IBrowsingDatabase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public interface IBrowsingDatabase : INotifyPropertyChanged, ICertificateDatabas
IEnumerable<Visited> GetVisitedPage(int page, out bool lastPage);
void AddVisitedPage(Visited visited);
bool TryGetHostCertificate(string host, out HostCertificate certificate);
void AcceptHostCertificate(string host);
void RemoveHostCertificate(string host);
Task UpdateBookmarkOrder();
Task UpdateTabOrder();
void Update<T>(T obj);
Expand Down
5 changes: 5 additions & 0 deletions Models/Tab.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,9 @@ public virtual void OnLocationChanged()
{
OnPropertyChanged(nameof(Location));
}

public virtual void OnHasFindNextQueryChanged()
{
OnPropertyChanged(nameof(HasFindNextQuery));
}
}
4 changes: 0 additions & 4 deletions Platforms/Android/ActionMenuClickHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ public ActionMenuClickHandler(T argument, Action<T> action)
_action = action;
}

public IntPtr Handle { get; }

public bool OnMenuItemClick(IMenuItem item)
{
_action?.Invoke(_argument);
Expand All @@ -33,8 +31,6 @@ public ActionMenuClickHandler(Action action)
_action = action;
}

public IntPtr Handle { get; }

public bool OnMenuItemClick(IMenuItem item)
{
_action?.Invoke();
Expand Down
26 changes: 13 additions & 13 deletions Platforms/Android/Resources/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<resources>
<!-- Base application theme. -->
<style name="Maui.MainTheme" parent="Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="appBarLayoutStyle">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="bottomNavigationViewStyle">@style/Widget.Design.BottomNavigationView</item>
<item name="materialButtonStyle">@style/MauiMaterialButton</item>
<item name="checkboxStyle">@style/MauiCheckBox</item>
<item name="android:colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorAccent">@color/colorAccent</item>
<!--<item name="android:appBarLayoutStyle">@style/Base.Theme.MaterialComponents.Light.DarkActionBar</item>-->
<!--<item name="android:bottomNavigationViewStyle">@style/Widget.Design.BottomNavigationView</item>-->
<!--<item name="android:materialButtonStyle">@style/MauiMaterialButton</item>-->
<item name="android:checkboxStyle">@style/MauiCheckBox</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="Maui.MainTheme.NoActionBar" parent="Maui.MainTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">?attr/colorPrimary</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/colorPrimary</item>
<item name="android:actionModeStyle">@style/ActionMode</item>
</style>

<style name="ActionMode">
<item name="android:background">?attr/colorPrimary</item>
<item name="android:height">?attr/actionBarSize</item>
<item name="android:background">@color/colorPrimary</item>
<item name="android:height">?android:attr/actionBarSize</item>
</style>

<!-- Splash theme -->
Expand Down
46 changes: 23 additions & 23 deletions Resources/Localization/Text.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,73 +400,73 @@
<value>Share URL</value>
</data>
<data name="TitanUploadPage_ToggleVisible" xml:space="preserve">
<value>Toggle visible</value>
<value>Toggle visible</value>
</data>
<data name="TitanUploadPage_ToggleTokenVisibleHint" xml:space="preserve">
<value>Toggle the visibility of the password</value>
<value>Toggle the visibility of the password</value>
</data>
<data name="TitanUploadPage_Title" xml:space="preserve">
<value>Upload</value>
<value>Upload</value>
</data>
<data name="TitanUploadPage_TokenPlaceholder" xml:space="preserve">
<value>token</value>
<value>token</value>
</data>
<data name="TitanUploadPage_UploadText" xml:space="preserve">
<value>Upload Text</value>
<value>Upload Text</value>
</data>
<data name="TitanUploadPage_UploadFile" xml:space="preserve">
<value>Upload File</value>
<value>Upload File</value>
</data>
<data name="SettingsPage_AllowIPv6Requests" xml:space="preserve">
<value>Allow IPv6 requests</value>
<value>Allow IPv6 requests</value>
</data>
<data name="SettingsPage_Preview" xml:space="preserve">
<value>Preview</value>
<value>Preview</value>
</data>
<data name="SettingsPage_PreviewHint" xml:space="preserve">
<value>An example of a page rendered using the selected theme</value>
<value>An example of a page rendered using the selected theme</value>
</data>
<data name="SettingsPage_Version" xml:space="preserve">
<value>Version</value>
<value>Version</value>
</data>
<data name="SettingsPage_VersionHint" xml:space="preserve">
<value>The application's version number</value>
<value>The application's version number</value>
</data>
<data name="SettingsPage_CopyVersion" xml:space="preserve">
<value>Copy</value>
<value>Copy</value>
</data>
<data name="SettingsPage_CopyVersionHint" xml:space="preserve">
<value>Copy the version number</value>
<value>Copy the version number</value>
</data>
<data name="MainPage_PageInformation" xml:space="preserve">
<value>Information</value>
<value>Information</value>
</data>
<data name="MainPage_PageInformationHint" xml:space="preserve">
<value>Display information about the page</value>
<value>Display information about the page</value>
</data>
<data name="MainPage_Bookmark" xml:space="preserve">
<value>Bookmark</value>
<value>Bookmark</value>
</data>
<data name="MainPage_BookmarkHint" xml:space="preserve">
<value>Toggle a bookmark for the current page</value>
<value>Toggle a bookmark for the current page</value>
</data>
<data name="MainPage_Home" xml:space="preserve">
<value>Home</value>
<value>Home</value>
</data>
<data name="MainPage_HomeHint" xml:space="preserve">
<value>Hold to set a home page, tap to navigate to the home page</value>
<value>Hold to set a home page, tap to navigate to the home page</value>
</data>
<data name="MainPage_Next" xml:space="preserve">
<value>Next</value>
<value>Next</value>
</data>
<data name="MainPage_NextHint" xml:space="preserve">
<value>Find the next occurrence of the text being searched for</value>
<value>Find the next occurrence of the text being searched for</value>
</data>
<data name="MainPage_MainPage_That_address_is_invalid" xml:space="preserve">
<value>That address is invalid</value>
<value>That address is invalid</value>
</data>
<data name="SettingsPage_WhatsNew" xml:space="preserve">
<value>What's New</value>
<value>What's New</value>
</data>
<data name="SettingsPage_Swipe_to_move_between_tabs" xml:space="preserve">
<value>Swipe to move between tabs</value>
Expand Down
5 changes: 5 additions & 0 deletions Resources/Raw/whats-new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
margin-top: 0!important;
}
</style>
<h4>Version 1.4.8 - July 28th, 2024</h4>
<ul>
<li><a class="tracker-id" href="gemini://bbs.geminispace.org/s/Rosy-Crow-Issues/47">#47</a> <i>Find in Page</i> now works correctly.</li>
<li><a class="tracker-id" href="gemini://bbs.geminispace.org/s/Rosy-Crow-Issues/26">#26</a>, <a class="tracker-id" href="gemini://bbs.geminispace.org/s/Rosy-Crow-Issues/48">#48</a> Fixed an issue which was causing the app to repeatedly prompt the user to accept a changed host certificate.</li>
</ul>
<h4>Version 1.4.7 - January 6th, 2024</h4>
<p>Happy new year!</p>
<ul>
Expand Down
34 changes: 17 additions & 17 deletions RosyCrow.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,31 +89,31 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="MimeTypes" Version="2.4.1">
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="MimeTypes" Version="2.5.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Opal" Version="1.7.6" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.5" />
<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.17" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.141-beta" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.6" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.6" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.6" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.6" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.8" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.8" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.8" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.8" />
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.3.0.1" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 639a758

Please sign in to comment.