Merge pull request #45 from iMattPro/1.0.0-rc6

1.0.0-RC6

Author: iMattPro

CHANGELOG.md

@@ -1,9 +1,10 @@
 # Changelog
 
-### 1.0.0-RC5 - 2024-05-31
+### 1.0.0-RC6 - 2024-06-01
 
 - New: Added an enable push subscriptions toggle switch to the footer of the Notifications drop down.
-- New: New and existing users will have push notification preferences for PMs and being quoted in posts set by default. (Note this will not apply to existing users of boards that have installed a previous version of this extension.)
+- Fixed an issue where the Subscribe button was appearing on some UCP pages unexpectedly.
+- Fixed an issue where push notifications failed on Android devices using Firefox as their browser.
 - Requires phpBB 3.3.12 or newer.
 
 ### 1.0.0-RC4 - 2024-05-26

composer.json

@@ -3,7 +3,7 @@
     "type": "phpbb-extension",
     "description": "An official phpBB extension that allows board users to receive browser-based push notifications.",
     "homepage": "https://www.phpbb.com",
-    "version": "1.0.0-RC5",
+    "version": "1.0.0-RC6",
     "license": "GPL-2.0-only",
     "authors": [
         {

notification/method/webpush.php

@@ -194,6 +194,12 @@ protected function notify_using_webpush(): void
 
 		$web_push = new \Minishlink\WebPush\WebPush($auth);
 
+		// Fix encryption payload size for Firefox on Android
+		if (preg_match('/android.*firefox/i', $this->user->browser))
+		{
+			$web_push->setAutomaticPadding(2820);
+		}
+
 		$number_of_notifications = 0;
 		$remove_subscriptions = [];
 

styles/all/template/event/notification_dropdown_footer_after.html

@@ -1,4 +1,4 @@
-{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined and notification_list is not defined %}
+{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
 	<div class="wpn-notification-dropdown-footer" title="{{ lang('NOTIFY_WEBPUSH_DROPDOWN_TITLE') }}">
 		<span class="ellipsis-text">{{ lang('NOTIFY_WEBPUSH_ENABLE_SHORT') ~ lang('COLON') }}</span>
 		<button id="subscribe_webpush" name="subscribe_webpush"><i class="icon fa-toggle-off fa-fw icon-lightgray"></i><span>{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}</span></button>