From 1e4f3976cd655fa8011c43160f0b102942eed597 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 05:54:24 +0300
Subject: [PATCH 01/14] Add POST_NOTIFICATIONS to AndroidManifest

---
 WordPress/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index 97ad667775c6..b39f3cca8215 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!-- GCM all build types configuration -->
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

From 3ecad02dc224678e0861aa96c83f43725d9fcf4f Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 06:01:21 +0300
Subject: [PATCH 02/14] Add NotificationsPermissionBottomSheetFragment

NotificationsPermissionBottomSheetFragment is a bottom sheet to navigate user to the App Settings.
---
 ...ificationsPermissionBottomSheetFragment.kt | 39 +++++++++++++
 .../notifications_permission_bottom_sheet.xml | 57 +++++++++++++++++++
 WordPress/src/main/res/values/strings.xml     |  6 ++
 WordPress/src/main/res/values/styles.xml      | 53 ++++++++++-------
 4 files changed, 133 insertions(+), 22 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsPermissionBottomSheetFragment.kt
 create mode 100644 WordPress/src/main/res/layout/notifications_permission_bottom_sheet.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsPermissionBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsPermissionBottomSheetFragment.kt
new file mode 100644
index 000000000000..9ba6f79f6cf2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsPermissionBottomSheetFragment.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.notifications
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.wordpress.android.R
+import org.wordpress.android.databinding.NotificationsPermissionBottomSheetBinding
+import org.wordpress.android.util.WPPermissionUtils
+
+class NotificationsPermissionBottomSheetFragment : BottomSheetDialogFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = inflater.inflate(R.layout.notifications_permission_bottom_sheet, container)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        (dialog as? BottomSheetDialog)?.behavior?.state = BottomSheetBehavior.STATE_EXPANDED
+        with(NotificationsPermissionBottomSheetBinding.bind(view)) {
+            val appName = getString(R.string.app_name)
+            description.text = getString(R.string.notifications_permission_bottom_sheet_description_2, appName)
+
+            primaryButton.setOnClickListener {
+                WPPermissionUtils.showNotificationsSettings(requireActivity())
+                dismiss()
+            }
+        }
+    }
+
+    companion object {
+        const val TAG = "NOTIFICATIONS_PERMISSION_BOTTOM_SHEET_FRAGMENT"
+    }
+}
diff --git a/WordPress/src/main/res/layout/notifications_permission_bottom_sheet.xml b/WordPress/src/main/res/layout/notifications_permission_bottom_sheet.xml
new file mode 100644
index 000000000000..d1c52dbf057e
--- /dev/null
+++ b/WordPress/src/main/res/layout/notifications_permission_bottom_sheet.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:animateLayoutChanges="true"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/handle"
+        layout="@layout/bottom_sheet_handle_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_small" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="130dp"
+        android:layout_gravity="center"
+        android:importantForAccessibility="no"
+        android:src="@drawable/img_illustration_bell_yellow_96dp" />
+
+    <TextView
+        style="@style/WordPress.BottomSheetDialogTheme.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/margin_extra_large"
+        android:paddingHorizontal="@dimen/margin_extra_extra_medium_large"
+        android:text="@string/notifications_permission_bottom_sheet_title" />
+
+    <TextView
+        style="@style/WordPress.BottomSheetDialogTheme.Caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/margin_extra_large"
+        android:paddingHorizontal="@dimen/margin_extra_large"
+        android:text="@string/notifications_permission_bottom_sheet_description_1" />
+
+    <TextView
+        android:id="@+id/description"
+        style="@style/WordPress.BottomSheetDialogTheme.Text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_extra_large"
+        android:paddingBottom="@dimen/margin_extra_large"
+        android:paddingHorizontal="@dimen/margin_extra_large"
+        tools:text="@string/notifications_permission_bottom_sheet_description_2" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/primary_button"
+        style="@style/WordPress.BottomSheetDialogTheme.PrimaryButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/margin_extra_large"
+        android:text="@string/notifications_permission_bottom_sheet_button" />
+</LinearLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 7ab09264aede..bd884e301f84 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1497,6 +1497,12 @@
     <string name="notifications_tab_title_follows">Follows</string>
     <string name="notifications_tab_title_likes">Likes</string>
 
+    <!-- Notification permission -->
+    <string name="notifications_permission_bottom_sheet_title">Push notifications are turned off</string>
+    <string name="notifications_permission_bottom_sheet_description_1">You’ll need to open the app to see notifications.</string>
+    <string name="notifications_permission_bottom_sheet_description_2">Go to Settings → Notifications → App Settings, and turn %1$s on to be notified immediately.</string>
+    <string name="notifications_permission_bottom_sheet_button">Turn on notifications</string>
+
     <!-- Notification Settings -->
     <string name="notification_settings">Notification Settings</string>
     <string name="notification_settings_main_status_on">On</string>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 5dced5d17a6e..cc97e79f5e00 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -1571,6 +1571,33 @@
         <item name="fontFamily">sans-serif</item>
     </style>
 
+    <!-- Bottom Sheet Styles -->
+    <style name="WordPress.BottomSheetDialogTheme.Text">
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:textColor">@color/login_on_surface_high_selector</item>
+    </style>
+
+    <style name="WordPress.BottomSheetDialogTheme.Title" parent="WordPress.BottomSheetDialogTheme.Text">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="fontFamily">serif</item>
+    </style>
+
+    <style name="WordPress.BottomSheetDialogTheme.Caption" parent="WordPress.BottomSheetDialogTheme.Text">
+        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
+    </style>
+
+    <style name="WordPress.BottomSheetDialogTheme.PrimaryButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+        <item name="android:textColor">?attr/colorOnSecondary</item>
+        <item name="android:backgroundTint">@color/secondary_gray_20_disabled_selector</item>
+    </style>
+
     <!-- Modal Layout Picker Styles -->
 
     <style name="ModalLayoutPickerText">
@@ -1739,30 +1766,16 @@
         <item name="android:minWidth">@dimen/min_touch_target_sz</item>
     </style>
 
-    <style name="BloggingRemindersText">
-        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAlignment">center</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:textColor">@color/login_on_surface_high_selector</item>
-    </style>
+    <style name="BloggingRemindersText" parent="WordPress.BottomSheetDialogTheme.Text" />
 
     <style name="BloggingRemindersText.MediumEmphasis" parent="BloggingRemindersText">
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
         <item name="android:textColor">@color/on_surface_selector</item>
     </style>
 
-    <style name="BloggingRemindersText.Title" parent="BloggingRemindersText">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="fontFamily">serif</item>
-    </style>
+    <style name="BloggingRemindersText.Title" parent="WordPress.BottomSheetDialogTheme.Title" />
 
-    <style name="BloggingRemindersCaption" parent="BloggingRemindersText">
-        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
-    </style>
+    <style name="BloggingRemindersCaption" parent="WordPress.BottomSheetDialogTheme.Caption" />
 
     <style name="BloggingRemindersDayBubble">
         <item name="android:gravity">center</item>
@@ -1771,11 +1784,7 @@
         <item name="android:textAppearance">?attr/textAppearanceButton</item>
     </style>
 
-    <style name="BloggingRemindersPrimaryButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
-        <item name="android:textColor">?attr/colorOnSecondary</item>
-        <item name="android:backgroundTint">@color/secondary_gray_20_disabled_selector</item>
-    </style>
+    <style name="BloggingRemindersPrimaryButton" parent="WordPress.BottomSheetDialogTheme.PrimaryButton" />
 
     <style name="BloggingRemindersTipTitle">
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>

From c5cba1c8929d161a244d3a401681e7548bd4a2a2 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 06:12:19 +0300
Subject: [PATCH 03/14] Update the version of WordPress-Utils library

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3243cd8bf789..a3ff7cdd8191 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ ext {
     wordPressFluxCVersion = '2.22.0'
     wordPressLoginVersion = '116-9e75c5927871287fccb0617f15f69bb066656570'
     wordPressPersistentEditTextVersion = '1.0.2'
-    wordPressUtilsVersion = '3.5.0'
+    wordPressUtilsVersion = '127-c06360491ae9a0645b8d2adf0df64ca0acba4162'
 
     // debug
     stethoVersion = '1.6.0'

From 65b62a3742564e871cd3025164b127a901fd33c4 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 06:15:18 +0300
Subject: [PATCH 04/14] Add a function for showing notification settings of
 device

---
 .../android/util/WPPermissionUtils.java        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
index 99544ddb1f6c..d80a5e5cb8b8 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
@@ -7,6 +7,8 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
@@ -221,4 +223,20 @@ public static void showAppSettings(@NonNull Context context) {
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
+
+    /*
+     * open the device's notification settings page for this app so the user can edit permissions
+     */
+    public static void showNotificationsSettings(@NonNull Context context) {
+        if (VERSION.SDK_INT >= VERSION_CODES.O) {
+            Intent intent = new Intent();
+            intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        } else {
+            // We can't open notifications settings screen directly. Instead, open the app settings.
+            showAppSettings(context);
+        }
+    }
 }

From 4c21506bd233c02af2873f675dc6937c20a76417 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 06:14:22 +0300
Subject: [PATCH 05/14] Add permission warning message to the notifications
 screen

---
 .../NotificationsListFragment.kt              | 61 ++++++++++++++++++-
 .../NotificationsListViewModel.kt             | 13 ++++
 .../wordpress/android/ui/prefs/AppPrefs.java  | 11 ++++
 .../android/ui/prefs/AppPrefsWrapper.kt       |  4 ++
 .../android/util/WPPermissionUtils.java       |  4 ++
 .../layout/notifications_list_fragment.xml    | 52 ++++++++++++++--
 WordPress/src/main/res/values/strings.xml     |  3 +
 7 files changed, 141 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
index 4fa1055660b9..8b7533bc9396 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
@@ -2,8 +2,10 @@
 
 package org.wordpress.android.ui.notifications
 
+import android.Manifest
 import android.app.Activity
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -13,6 +15,7 @@ import android.view.View
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.text.HtmlCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.RecyclerView
@@ -30,6 +33,7 @@ import org.wordpress.android.analytics.AnalyticsTracker.NOTIFICATIONS_SELECTED_F
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.NOTIFICATION_TAPPED_SEGMENTED_CONTROL
 import org.wordpress.android.databinding.NotificationsListFragmentBinding
 import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.models.JetpackPoweredScreen
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS
 import org.wordpress.android.ui.JetpackConnectionWebViewActivity
@@ -54,8 +58,10 @@ import org.wordpress.android.ui.notifications.services.NotificationsUpdateServic
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.JetpackBrandingUtils
-import org.wordpress.android.models.JetpackPoweredScreen
 import org.wordpress.android.util.NetworkUtils
+import org.wordpress.android.util.PermissionUtils
+import org.wordpress.android.util.WPPermissionUtils
+import org.wordpress.android.util.WPPermissionUtils.NOTIFICATIONS_PERMISSION_REQUEST_CODE
 import org.wordpress.android.util.WPUrlUtils
 import org.wordpress.android.util.extensions.setLiftOnScrollTargetViewIdAndRequestLayout
 import org.wordpress.android.viewmodel.observeEvent
@@ -174,6 +180,7 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
                 }
             }
             setSelectedTab(lastTabPosition)
+            setNotificationPermissionWarning()
         }
         viewModel.onResume()
     }
@@ -202,6 +209,58 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
         tabLayout.getTabAt(lastTabPosition)?.select()
     }
 
+    private fun NotificationsListFragmentBinding.setNotificationPermissionWarning() {
+        val hasPermission = PermissionUtils.checkNotificationsPermission(activity)
+        if (hasPermission) {
+            // If the permissions is granted, we should reset the state of the warning. Because the permission may be
+            // disabled later, then we should be able to show the warning again to inform the user.
+            viewModel.resetNotificationsPermissionWarningDismissState()
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
+            hasPermission ||
+            viewModel.isNotificationsPermissionsWarningDismissed
+        ) {
+            // If the user dismissed the warning, don't show it again.
+            notificationPermissionWarning.isVisible = false
+        } else {
+            notificationPermissionWarning.isVisible = true
+            permissionFixButton.setOnClickListener {
+                val isAlwaysDenied = WPPermissionUtils.isPermissionAlwaysDenied(
+                    requireActivity(),
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+                if (isAlwaysDenied) {
+                    NotificationsPermissionBottomSheetFragment().show(
+                        parentFragmentManager,
+                        NotificationsPermissionBottomSheetFragment.TAG
+                    )
+                } else {
+                    requestPermissions(
+                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                        NOTIFICATIONS_PERMISSION_REQUEST_CODE
+                    )
+                }
+            }
+            permissionDismissButton.setOnClickListener {
+                notificationPermissionWarning.isVisible = false
+                viewModel.onNotificationsPermissionWarningDismissed()
+            }
+        }
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        WPPermissionUtils.setPermissionListAsked(
+            requireActivity(),
+            requestCode,
+            permissions,
+            grantResults,
+            false
+        )
+        viewModel.resetNotificationsPermissionWarningDismissState()
+    }
+
     private fun NotificationsListFragmentBinding.showConnectJetpackView() {
         clearToolbarScrollFlags()
         jetpackSetup.setOnClickListener {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListViewModel.kt
index 12d853754376..f9f8b14113a9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListViewModel.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalOverlayUtil
 import org.wordpress.android.ui.jetpackoverlay.JetpackOverlayConnectedFeature.NOTIFICATIONS
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.JetpackBrandingUtils
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
@@ -16,6 +17,7 @@ import javax.inject.Named
 @HiltViewModel
 class NotificationsListViewModel @Inject constructor(
     @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
+    private val appPrefsWrapper: AppPrefsWrapper,
     private val jetpackBrandingUtils: JetpackBrandingUtils,
     private val jetpackFeatureRemovalOverlayUtil: JetpackFeatureRemovalOverlayUtil
 
@@ -26,6 +28,9 @@ class NotificationsListViewModel @Inject constructor(
     private val _showJetpackOverlay = MutableLiveData<Event<Boolean>>()
     val showJetpackOverlay: LiveData<Event<Boolean>> = _showJetpackOverlay
 
+    val isNotificationsPermissionsWarningDismissed
+        get() = appPrefsWrapper.notificationPermissionsWarningDismissed
+
     init {
         if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) showJetpackPoweredBottomSheet()
     }
@@ -42,4 +47,12 @@ class NotificationsListViewModel @Inject constructor(
     private fun showJetpackOverlay() {
         _showJetpackOverlay.value = Event(true)
     }
+
+    fun onNotificationsPermissionWarningDismissed() {
+        appPrefsWrapper.notificationPermissionsWarningDismissed = true
+    }
+
+    fun resetNotificationsPermissionWarningDismissState() {
+        appPrefsWrapper.notificationPermissionsWarningDismissed = false
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
index 55fa780ffd7b..d0c2430b5a39 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
@@ -189,6 +189,7 @@ public enum DeletablePrefKey implements PrefKey {
         // Jetpack Individual Plugin overlay for WordPress app
         WP_JETPACK_INDIVIDUAL_PLUGIN_OVERLAY_SHOWN_COUNT,
         WP_JETPACK_INDIVIDUAL_PLUGIN_OVERLAY_LAST_SHOWN_TIMESTAMP,
+        NOTIFICATIONS_PERMISSION_WARNING_DISMISSED,
     }
 
     /**
@@ -234,6 +235,8 @@ public enum UndeletablePrefKey implements PrefKey {
         ASKED_PERMISSION_STORAGE_READ,
         ASKED_PERMISSION_CAMERA,
 
+        ASKED_PERMISSION_NOTIFICATIONS,
+
         // Updated after WP.com themes have been fetched
         LAST_WP_COM_THEMES_SYNC,
 
@@ -1633,4 +1636,12 @@ public static long getWPJetpackIndividualPluginOverlayLastShownTimestamp() {
     public static void setWPJetpackIndividualPluginOverlayLastShownTimestamp(long timestamp) {
         setLong(DeletablePrefKey.WP_JETPACK_INDIVIDUAL_PLUGIN_OVERLAY_LAST_SHOWN_TIMESTAMP, timestamp);
     }
+
+    public static boolean getNotificationsPermissionsWarningDismissed() {
+        return getBoolean(DeletablePrefKey.NOTIFICATIONS_PERMISSION_WARNING_DISMISSED, false);
+    }
+
+    public static void setNotificationsPermissionWarningDismissed(boolean dismissed) {
+        setBoolean(DeletablePrefKey.NOTIFICATIONS_PERMISSION_WARNING_DISMISSED, dismissed);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
index 6e2268824249..35118bef3260 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
@@ -93,6 +93,10 @@ class AppPrefsWrapper @Inject constructor() {
         get() = AppPrefs.getWPJetpackIndividualPluginOverlayLastShownTimestamp()
         set(timestamp) = AppPrefs.setWPJetpackIndividualPluginOverlayLastShownTimestamp(timestamp)
 
+    var notificationPermissionsWarningDismissed: Boolean
+        get() = AppPrefs.getNotificationsPermissionsWarningDismissed()
+        set(dismissed) = AppPrefs.setNotificationsPermissionWarningDismissed(dismissed)
+
     fun getAppWidgetSiteId(appWidgetId: Int) = AppPrefs.getStatsWidgetSelectedSiteId(appWidgetId)
     fun setAppWidgetSiteId(siteId: Long, appWidgetId: Int) = AppPrefs.setStatsWidgetSelectedSiteId(siteId, appWidgetId)
     fun removeAppWidgetSiteId(appWidgetId: Int) = AppPrefs.removeStatsWidgetSelectedSiteId(appWidgetId)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
index d80a5e5cb8b8..7d1797106ea2 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java
@@ -39,6 +39,8 @@ public class WPPermissionUtils {
     public static final int EDITOR_DRAG_DROP_PERMISSION_REQUEST_CODE = 70;
     public static final int READER_FILE_DOWNLOAD_PERMISSION_REQUEST_CODE = 80;
 
+    public static final int NOTIFICATIONS_PERMISSION_REQUEST_CODE = 90;
+
     /**
      * called by the onRequestPermissionsResult() of various activities and fragments - tracks
      * the permission results, remembers that the permissions have been asked for, and optionally
@@ -148,6 +150,8 @@ private static AppPrefs.PrefKey getPermissionAskedKey(@NonNull String permission
                 return AppPrefs.UndeletablePrefKey.ASKED_PERMISSION_STORAGE_READ;
             case android.Manifest.permission.CAMERA:
                 return AppPrefs.UndeletablePrefKey.ASKED_PERMISSION_CAMERA;
+            case Manifest.permission.POST_NOTIFICATIONS:
+                return AppPrefs.UndeletablePrefKey.ASKED_PERMISSION_NOTIFICATIONS;
             default:
                 AppLog.w(AppLog.T.UTILS, "No key for requested permission");
                 return null;
diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
index e37e140fb948..4e5c3fafcade 100644
--- a/WordPress/src/main/res/layout/notifications_list_fragment.xml
+++ b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -21,12 +21,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar_main"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/toolbar_height"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:theme="@style/WordPress.ActionBar" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/toolbar_height"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:theme="@style/WordPress.ActionBar" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
@@ -37,6 +37,46 @@
             app:tabGravity="fill"
             app:tabMode="scrollable" />
 
+        <LinearLayout
+            android:id="@+id/notification_permission_warning"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_height"
+            android:background="@color/warning_0"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/margin_extra_large"
+                android:layout_weight="1"
+                android:gravity="start|center_vertical"
+                android:text="@string/notifications_permission_off_desc"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?attr/colorOnSurface" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/permission_fix_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_touch_target_sz"
+                android:background="?selectableItemBackgroundBorderless"
+                android:gravity="center"
+                android:minWidth="@dimen/min_touch_target_sz"
+                android:text="@string/notifications_permission_fix"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
+                android:textColor="@color/warning_60" />
+
+            <ImageView
+                android:id="@+id/permission_dismiss_button"
+                android:layout_width="@dimen/min_touch_target_sz"
+                android:layout_height="@dimen/min_touch_target_sz"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/notifications_permission_dismiss_content_description"
+                android:padding="@dimen/margin_large"
+                android:src="@drawable/ic_cross_small_white_24dp"
+                app:tint="?attr/colorOnSurface" />
+        </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index bd884e301f84..4cd238deb23f 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1498,6 +1498,9 @@
     <string name="notifications_tab_title_likes">Likes</string>
 
     <!-- Notification permission -->
+    <string name="notifications_permission_fix">Fix</string>
+    <string name="notifications_permission_dismiss_content_description">Dismiss notification permission warning.</string>
+    <string name="notifications_permission_off_desc">Push notifications are turned off.</string>
     <string name="notifications_permission_bottom_sheet_title">Push notifications are turned off</string>
     <string name="notifications_permission_bottom_sheet_description_1">You’ll need to open the app to see notifications.</string>
     <string name="notifications_permission_bottom_sheet_description_2">Go to Settings → Notifications → App Settings, and turn %1$s on to be notified immediately.</string>

From ddbac7772eeb4a100a6330153a19471ae56658b3 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 06:28:06 +0300
Subject: [PATCH 06/14] Add notifications permission step to blogging reminders
 flow

---
 .../BloggingReminderBottomSheetFragment.kt    | 68 +++++++++++++++++--
 .../BloggingRemindersViewModel.kt             | 65 +++++++++++++++++-
 .../NotificationsPermissionBuilder.kt         | 40 +++++++++++
 WordPress/src/main/res/values/strings.xml     |  4 ++
 .../BloggingRemindersViewModelTest.kt         | 12 +++-
 5 files changed, 180 insertions(+), 9 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
index 46c150846f4c..91eef8eaaff2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
@@ -1,7 +1,9 @@
 package org.wordpress.android.ui.bloggingreminders
 
+import android.Manifest
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -19,6 +21,8 @@ import org.wordpress.android.databinding.RecyclerViewPrimaryButtonBottomSheetBin
 import org.wordpress.android.ui.bloggingprompts.onboarding.BloggingPromptsOnboardingDialogFragment
 import org.wordpress.android.ui.bloggingprompts.onboarding.BloggingPromptsOnboardingDialogFragment.DialogType.INFORMATION
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.PermissionUtils
+import org.wordpress.android.util.WPPermissionUtils
 import org.wordpress.android.util.extensions.disableAnimation
 import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
@@ -61,8 +65,10 @@ class BloggingReminderBottomSheetFragment : BottomSheetDialogFragment() {
                     }
                 }
             })
-            viewModel =
-                ViewModelProvider(requireActivity(), viewModelFactory).get(BloggingRemindersViewModel::class.java)
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)[BloggingRemindersViewModel::class.java]
+
+            setPermissionState()
+
             viewModel.uiState.observe(this@BloggingReminderBottomSheetFragment) { uiState ->
                 (contentRecyclerView.adapter as? BloggingRemindersAdapter)?.submitList(uiState?.uiItems ?: listOf())
                 if (uiState?.primaryButton != null) {
@@ -86,11 +92,10 @@ class BloggingReminderBottomSheetFragment : BottomSheetDialogFragment() {
             BloggingReminderUtils.observeTimePicker(
                 viewModel.isTimePickerShowing,
                 viewLifecycleOwner,
-                BloggingReminderTimePicker.TAG,
-                {
-                    requireActivity().supportFragmentManager
-                }
-            )
+                BloggingReminderTimePicker.TAG
+            ) {
+                requireActivity().supportFragmentManager
+            }
 
             savedInstanceState?.let { viewModel.restoreState(it) }
 
@@ -101,6 +106,55 @@ class BloggingReminderBottomSheetFragment : BottomSheetDialogFragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        val hasPermission = PermissionUtils.checkNotificationsPermission(activity)
+        if (hasPermission) {
+            viewModel.onPermissionGranted()
+        }
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        val granted = WPPermissionUtils.setPermissionListAsked(
+            requireActivity(),
+            requestCode,
+            permissions,
+            grantResults,
+            false
+        )
+        if (granted) {
+            viewModel.onPermissionGranted()
+        } else {
+            viewModel.onPermissionDenied()
+        }
+    }
+
+    private fun setPermissionState() {
+        val isAlwaysDenied = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                WPPermissionUtils.isPermissionAlwaysDenied(
+                    requireActivity(),
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+        viewModel.setPermissionState(PermissionUtils.checkNotificationsPermission(activity), isAlwaysDenied)
+
+        @Suppress("DEPRECATION")
+        viewModel.requestPermission.observeEvent(this@BloggingReminderBottomSheetFragment) { request: Boolean ->
+            if (request && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                requestPermissions(
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    WPPermissionUtils.NOTIFICATIONS_PERMISSION_REQUEST_CODE
+                )
+            }
+        }
+        viewModel.showDevicePermissionSettings
+            .observeEvent(this@BloggingReminderBottomSheetFragment) { show: Boolean ->
+                if (show) {
+                    WPPermissionUtils.showNotificationsSettings(requireActivity())
+                }
+            }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         viewModel.saveState(outState)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
index 9ee9631943b7..588f17df9bbc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
@@ -8,6 +8,7 @@ import androidx.lifecycle.distinctUntilChanged
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
+import org.wordpress.android.R
 import org.wordpress.android.fluxc.store.BloggingRemindersStore
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.modules.UI_THREAD
@@ -22,6 +23,7 @@ import org.wordpress.android.util.extensions.getSerializableCompat
 import org.wordpress.android.util.merge
 import org.wordpress.android.util.perform
 import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.workers.reminder.ReminderScheduler
 import java.time.DayOfWeek
@@ -35,11 +37,13 @@ class BloggingRemindersViewModel @Inject constructor(
     private val prologueBuilder: PrologueBuilder,
     private val daySelectionBuilder: DaySelectionBuilder,
     private val epilogueBuilder: EpilogueBuilder,
+    private val notificationsPermissionBuilder: NotificationsPermissionBuilder,
     private val dayLabelUtils: DayLabelUtils,
     private val analyticsTracker: BloggingRemindersAnalyticsTracker,
     private val reminderScheduler: ReminderScheduler,
     private val mapper: BloggingRemindersModelMapper,
-    private val siteStore: SiteStore
+    private val siteStore: SiteStore,
+    private val resourceProvider: ResourceProvider
 ) : ScopedViewModel(mainDispatcher) {
     private val _isBottomSheetShowing = MutableLiveData<Event<Boolean>>()
     val isBottomSheetShowing = _isBottomSheetShowing as LiveData<Event<Boolean>>
@@ -50,11 +54,19 @@ class BloggingRemindersViewModel @Inject constructor(
     private val _showBloggingPromptHelpDialogVisible = MutableLiveData<Event<Boolean>>()
     val showBloggingPromptHelpDialogVisible = _showBloggingPromptHelpDialogVisible as LiveData<Event<Boolean>>
 
+    private val _requestPermission = MutableLiveData<Event<Boolean>>()
+    val requestPermission = _requestPermission as LiveData<Event<Boolean>>
+
+    private val _showDevicePermissionSettings = MutableLiveData<Event<Boolean>>()
+    val showDevicePermissionSettings = _showDevicePermissionSettings as LiveData<Event<Boolean>>
+
     private val _selectedScreen = MutableLiveData<Screen>()
     private val selectedScreen = _selectedScreen.perform { onScreenChanged(it) }
 
     private val _bloggingRemindersModel = MutableLiveData<BloggingRemindersUiModel>()
     private val _isFirstTimeFlow = MutableLiveData<Boolean>()
+    private val _hasNotificationsPermission = MutableLiveData<Boolean>()
+    private val _notificationsPermissionAlwaysDenied = MutableLiveData<Boolean>()
 
     val uiState: LiveData<UiState> = merge(
         selectedScreen,
@@ -72,6 +84,9 @@ class BloggingRemindersViewModel @Inject constructor(
                     this::togglePromptSwitch,
                     this::showBloggingPromptDialog
                 )
+                Screen.NOTIFICATIONS_PERMISSION -> {
+                    notificationsPermissionBuilder.buildUiItems(resourceProvider.getString(R.string.app_name))
+                }
                 Screen.EPILOGUE -> epilogueBuilder.buildUiItems(bloggingRemindersModel)
             }
             val primaryButton = when (screen) {
@@ -84,6 +99,7 @@ class BloggingRemindersViewModel @Inject constructor(
                     isFirstTimeFlow == true,
                     this::onSelectionButtonClick
                 )
+                Screen.NOTIFICATIONS_PERMISSION -> notificationsPermissionBuilder.buildPrimaryButton(showAppSettings)
                 Screen.EPILOGUE -> epilogueBuilder.buildPrimaryButton(finish)
             }
             UiState(uiItems, primaryButton)
@@ -103,6 +119,10 @@ class BloggingRemindersViewModel @Inject constructor(
         _isBottomSheetShowing.value = Event(false)
     }
 
+    private val showAppSettings: () -> Unit = {
+        _showDevicePermissionSettings.value = Event(true)
+    }
+
     private fun onScreenChanged(screen: Screen) {
         analyticsTracker.trackScreenShown(screen)
     }
@@ -146,6 +166,11 @@ class BloggingRemindersViewModel @Inject constructor(
         _bloggingRemindersModel.value = currentState.copy(enabledDays = enabledDays)
     }
 
+    fun setPermissionState(hasNotificationsPermission: Boolean, notificationsPermissionAlwaysDenied: Boolean) {
+        _hasNotificationsPermission.value = hasNotificationsPermission
+        _notificationsPermissionAlwaysDenied.value = notificationsPermissionAlwaysDenied
+    }
+
     fun selectTime() {
         _isTimePickerShowing.value = Event(true)
     }
@@ -185,6 +210,10 @@ class BloggingRemindersViewModel @Inject constructor(
                 )
                 val daysCount = bloggingRemindersModel.enabledDays.size
                 if (daysCount > 0) {
+                    if (!checkPermission()) {
+                        // There is no permission
+                        return@launch
+                    }
                     reminderScheduler.schedule(
                         bloggingRemindersModel.siteId,
                         bloggingRemindersModel.hour,
@@ -203,6 +232,22 @@ class BloggingRemindersViewModel @Inject constructor(
         }
     }
 
+    private fun checkPermission(): Boolean {
+        val hasPermission = _hasNotificationsPermission.value == true
+        val alwaysDenied = _notificationsPermissionAlwaysDenied.value == true
+        return when {
+            !hasPermission && alwaysDenied -> {
+                _selectedScreen.value = Screen.NOTIFICATIONS_PERMISSION
+                false
+            }
+            !hasPermission -> {
+                _requestPermission.value = Event(true)
+                false
+            }
+            else -> true // Already has permission
+        }
+    }
+
     fun saveState(outState: Bundle) {
         _selectedScreen.value?.let {
             outState.putSerializable(SELECTED_SCREEN, it)
@@ -274,16 +319,34 @@ class BloggingRemindersViewModel @Inject constructor(
         when (val screen = selectedScreen.value) {
             Screen.PROLOGUE,
             Screen.PROLOGUE_SETTINGS,
+            Screen.NOTIFICATIONS_PERMISSION,
             Screen.SELECTION -> analyticsTracker.trackFlowDismissed(screen)
             Screen.EPILOGUE -> analyticsTracker.trackFlowCompleted()
             null -> Unit // Do nothing
         }
     }
 
+    fun onPermissionGranted() {
+        if (_hasNotificationsPermission.value == false) {
+            // Permission state is changed.
+            _hasNotificationsPermission.value = true
+            _notificationsPermissionAlwaysDenied.value = false
+            if (_selectedScreen.value == Screen.NOTIFICATIONS_PERMISSION) {
+                onSelectionButtonClick(_bloggingRemindersModel.value)
+            }
+        }
+    }
+
+    fun onPermissionDenied() {
+        _hasNotificationsPermission.value = false
+        _selectedScreen.value = Screen.NOTIFICATIONS_PERMISSION
+    }
+
     enum class Screen(val trackingName: String) {
         PROLOGUE("main"), // displayed after post is published
         PROLOGUE_SETTINGS("main"), // displayed from Site Settings before showing cadence selector
         SELECTION("day_picker"), // cadence selector
+        NOTIFICATIONS_PERMISSION("notifications_permission"),
         EPILOGUE("all_set")
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt
new file mode 100644
index 000000000000..e41079f3d228
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.bloggingreminders
+
+import org.wordpress.android.R.drawable
+import org.wordpress.android.R.string
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersItem.Caption
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersItem.EmphasizedText
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersItem.HighEmphasisText
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersItem.Illustration
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersItem.Title
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersViewModel.UiState.PrimaryButton
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import javax.inject.Inject
+
+class NotificationsPermissionBuilder @Inject constructor() {
+    fun buildUiItems(appName: String): List<BloggingRemindersItem> {
+        val title = UiStringRes(string.blogging_reminders_notifications_permission_title)
+
+        val body = UiString.UiStringResWithParams(
+            string.blogging_reminders_notifications_permission_description,
+            UiString.UiStringText(appName)
+        )
+
+        return listOf(
+            Illustration(drawable.img_illustration_bell_yellow_96dp),
+            Title(title),
+            Caption(UiStringRes(string.blogging_reminders_notifications_permission_caption)),
+            HighEmphasisText(EmphasizedText(body, false))
+        )
+    }
+
+    fun buildPrimaryButton(onDone: () -> Unit): PrimaryButton {
+        return PrimaryButton(
+            UiStringRes(string.blogging_reminders_notifications_permission_primary_button),
+            enabled = true,
+            ListItemInteraction.create(onDone)
+        )
+    }
+}
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 4cd238deb23f..fe45c0eb3d7b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -4067,6 +4067,10 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="blogging_reminders_notify_me">Notify me</string>
     <string name="blogging_reminders_update">Update</string>
     <string name="blogging_reminders_done">Done</string>
+    <string name="blogging_reminders_notifications_permission_title">Turn on push notifications</string>
+    <string name="blogging_reminders_notifications_permission_caption">To use blogging reminders, you’ll need to turn on push notifications.</string>
+    <string name="blogging_reminders_notifications_permission_description">@string/notifications_permission_bottom_sheet_description_2</string>
+    <string name="blogging_reminders_notifications_permission_primary_button">@string/notifications_permission_bottom_sheet_button</string>
     <string name="blogging_reminders_epilogue_title">All set!</string>
     <string name="blogging_reminders_epilogue_not_set_title">Reminders removed!</string>
     <string name="blogging_reminders_epilogue_body_days_with_time">You\'ll get reminders to blog %1$s a week on %2$s at %3$s.</string>
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModelTest.kt
index e1ab9e5163d1..5ca57407ccf2 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModelTest.kt
@@ -43,6 +43,7 @@ import org.wordpress.android.ui.utils.ListItemInteraction.Companion
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.workers.reminder.ReminderConfig.WeeklyReminder
 import org.wordpress.android.workers.reminder.ReminderScheduler
 import java.time.DayOfWeek
@@ -61,6 +62,9 @@ class BloggingRemindersViewModelTest : BaseUnitTest() {
     @Mock
     lateinit var epilogueBuilder: EpilogueBuilder
 
+    @Mock
+    lateinit var notificationsPermissionBuilder: NotificationsPermissionBuilder
+
     @Mock
     lateinit var daySelectionBuilder: DaySelectionBuilder
 
@@ -75,6 +79,9 @@ class BloggingRemindersViewModelTest : BaseUnitTest() {
 
     @Mock
     lateinit var siteStore: SiteStore
+
+    @Mock
+    lateinit var resourceProvider: ResourceProvider
     private lateinit var viewModel: BloggingRemindersViewModel
     private val siteId = 123
     private val hour = 10
@@ -91,12 +98,15 @@ class BloggingRemindersViewModelTest : BaseUnitTest() {
             prologueBuilder,
             daySelectionBuilder,
             epilogueBuilder,
+            notificationsPermissionBuilder,
             dayLabelUtils,
             analyticsTracker,
             reminderScheduler,
             BloggingRemindersModelMapper(),
-            siteStore
+            siteStore,
+            resourceProvider
         )
+        viewModel.setPermissionState(hasNotificationsPermission = true, notificationsPermissionAlwaysDenied = true)
         events = mutableListOf()
         events = viewModel.isBottomSheetShowing.eventToList()
         uiState = viewModel.uiState.toList()

From 63431aaae797679b35f73e0b0a50648e608680fb Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 13:08:16 +0300
Subject: [PATCH 07/14] Make the whole notifications permission banner
 clickable

---
 .../android/ui/notifications/NotificationsListFragment.kt    | 5 ++---
 .../src/main/res/layout/notifications_list_fragment.xml      | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
index 8b7533bc9396..15a310182506 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
@@ -217,15 +217,14 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
             viewModel.resetNotificationsPermissionWarningDismissState()
         }
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-            hasPermission ||
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || hasPermission ||
             viewModel.isNotificationsPermissionsWarningDismissed
         ) {
             // If the user dismissed the warning, don't show it again.
             notificationPermissionWarning.isVisible = false
         } else {
             notificationPermissionWarning.isVisible = true
-            permissionFixButton.setOnClickListener {
+            notificationPermissionWarning.setOnClickListener {
                 val isAlwaysDenied = WPPermissionUtils.isPermissionAlwaysDenied(
                     requireActivity(),
                     Manifest.permission.POST_NOTIFICATIONS
diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
index 4e5c3fafcade..33205b7b7c42 100644
--- a/WordPress/src/main/res/layout/notifications_list_fragment.xml
+++ b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -57,10 +57,8 @@
                 android:textColor="?attr/colorOnSurface" />
 
             <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/permission_fix_button"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/min_touch_target_sz"
-                android:background="?selectableItemBackgroundBorderless"
                 android:gravity="center"
                 android:minWidth="@dimen/min_touch_target_sz"
                 android:text="@string/notifications_permission_fix"

From fb0ece3de4118f9a4b561b4a0249f6a97bdca116 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 13:08:46 +0300
Subject: [PATCH 08/14] Prevent updating reminders in no permission case

---
 .../ui/bloggingreminders/BloggingRemindersViewModel.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
index 588f17df9bbc..96ce4d3d0052 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
@@ -203,17 +203,17 @@ class BloggingRemindersViewModel @Inject constructor(
         analyticsTracker.trackPrimaryButtonPressed(Screen.SELECTION)
         if (bloggingRemindersModel != null) {
             launch {
+                val daysCount = bloggingRemindersModel.enabledDays.size
+                if (!checkPermission()) {
+                    // There is no permission
+                    return@launch
+                }
                 bloggingRemindersStore.updateBloggingReminders(
                     mapper.toDomainModel(
                         bloggingRemindersModel
                     )
                 )
-                val daysCount = bloggingRemindersModel.enabledDays.size
                 if (daysCount > 0) {
-                    if (!checkPermission()) {
-                        // There is no permission
-                        return@launch
-                    }
                     reminderScheduler.schedule(
                         bloggingRemindersModel.siteId,
                         bloggingRemindersModel.hour,

From af470adfb3c0c77d65a714f06784f89ace026822 Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Thu, 6 Apr 2023 23:50:12 +0300
Subject: [PATCH 09/14] Improve notifications permission flow on blogging
 reminders

---
 .../BloggingReminderBottomSheetFragment.kt    |  7 ++-
 .../BloggingRemindersViewModel.kt             | 48 +++++++++++--------
 .../NotificationsPermissionBuilder.kt         | 11 +++--
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
index 91eef8eaaff2..7356d5aff0d3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderBottomSheetFragment.kt
@@ -126,7 +126,12 @@ class BloggingReminderBottomSheetFragment : BottomSheetDialogFragment() {
         if (granted) {
             viewModel.onPermissionGranted()
         } else {
-            viewModel.onPermissionDenied()
+            val isAlwaysDenied = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                    WPPermissionUtils.isPermissionAlwaysDenied(
+                        requireActivity(),
+                        Manifest.permission.POST_NOTIFICATIONS
+                    )
+            viewModel.onPermissionDenied(isAlwaysDenied)
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
index 96ce4d3d0052..3378085a404e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt
@@ -65,8 +65,8 @@ class BloggingRemindersViewModel @Inject constructor(
 
     private val _bloggingRemindersModel = MutableLiveData<BloggingRemindersUiModel>()
     private val _isFirstTimeFlow = MutableLiveData<Boolean>()
-    private val _hasNotificationsPermission = MutableLiveData<Boolean>()
-    private val _notificationsPermissionAlwaysDenied = MutableLiveData<Boolean>()
+    private var hasNotificationsPermissionState = false
+    private var notificationsPermissionAlwaysDeniedState = false
 
     val uiState: LiveData<UiState> = merge(
         selectedScreen,
@@ -85,7 +85,10 @@ class BloggingRemindersViewModel @Inject constructor(
                     this::showBloggingPromptDialog
                 )
                 Screen.NOTIFICATIONS_PERMISSION -> {
-                    notificationsPermissionBuilder.buildUiItems(resourceProvider.getString(R.string.app_name))
+                    notificationsPermissionBuilder.buildUiItems(
+                        appName = resourceProvider.getString(R.string.app_name),
+                        showAppSettingsGuide = notificationsPermissionAlwaysDeniedState
+                    )
                 }
                 Screen.EPILOGUE -> epilogueBuilder.buildUiItems(bloggingRemindersModel)
             }
@@ -99,7 +102,9 @@ class BloggingRemindersViewModel @Inject constructor(
                     isFirstTimeFlow == true,
                     this::onSelectionButtonClick
                 )
-                Screen.NOTIFICATIONS_PERMISSION -> notificationsPermissionBuilder.buildPrimaryButton(showAppSettings)
+                Screen.NOTIFICATIONS_PERMISSION -> {
+                    notificationsPermissionBuilder.buildPrimaryButton(onPermissionButtonTapped)
+                }
                 Screen.EPILOGUE -> epilogueBuilder.buildPrimaryButton(finish)
             }
             UiState(uiItems, primaryButton)
@@ -119,8 +124,12 @@ class BloggingRemindersViewModel @Inject constructor(
         _isBottomSheetShowing.value = Event(false)
     }
 
-    private val showAppSettings: () -> Unit = {
-        _showDevicePermissionSettings.value = Event(true)
+    private val onPermissionButtonTapped: () -> Unit = {
+        if (notificationsPermissionAlwaysDeniedState) {
+            _showDevicePermissionSettings.value = Event(true)
+        } else {
+            _requestPermission.value = Event(true)
+        }
     }
 
     private fun onScreenChanged(screen: Screen) {
@@ -155,7 +164,7 @@ class BloggingRemindersViewModel @Inject constructor(
         }
     }
 
-    fun selectDay(day: DayOfWeek) {
+    private fun selectDay(day: DayOfWeek) {
         val currentState = _bloggingRemindersModel.value!!
         val enabledDays = currentState.enabledDays.toMutableSet()
         if (enabledDays.contains(day)) {
@@ -167,11 +176,11 @@ class BloggingRemindersViewModel @Inject constructor(
     }
 
     fun setPermissionState(hasNotificationsPermission: Boolean, notificationsPermissionAlwaysDenied: Boolean) {
-        _hasNotificationsPermission.value = hasNotificationsPermission
-        _notificationsPermissionAlwaysDenied.value = notificationsPermissionAlwaysDenied
+        hasNotificationsPermissionState = hasNotificationsPermission
+        notificationsPermissionAlwaysDeniedState = notificationsPermissionAlwaysDenied
     }
 
-    fun selectTime() {
+    private fun selectTime() {
         _isTimePickerShowing.value = Event(true)
     }
 
@@ -233,14 +242,12 @@ class BloggingRemindersViewModel @Inject constructor(
     }
 
     private fun checkPermission(): Boolean {
-        val hasPermission = _hasNotificationsPermission.value == true
-        val alwaysDenied = _notificationsPermissionAlwaysDenied.value == true
         return when {
-            !hasPermission && alwaysDenied -> {
+            !hasNotificationsPermissionState && notificationsPermissionAlwaysDeniedState -> {
                 _selectedScreen.value = Screen.NOTIFICATIONS_PERMISSION
                 false
             }
-            !hasPermission -> {
+            !hasNotificationsPermissionState -> {
                 _requestPermission.value = Event(true)
                 false
             }
@@ -327,18 +334,21 @@ class BloggingRemindersViewModel @Inject constructor(
     }
 
     fun onPermissionGranted() {
-        if (_hasNotificationsPermission.value == false) {
+        if (!hasNotificationsPermissionState) {
             // Permission state is changed.
-            _hasNotificationsPermission.value = true
-            _notificationsPermissionAlwaysDenied.value = false
+            hasNotificationsPermissionState = true
+            notificationsPermissionAlwaysDeniedState = false
+
             if (_selectedScreen.value == Screen.NOTIFICATIONS_PERMISSION) {
                 onSelectionButtonClick(_bloggingRemindersModel.value)
             }
         }
     }
 
-    fun onPermissionDenied() {
-        _hasNotificationsPermission.value = false
+    fun onPermissionDenied(isAlwaysDenied: Boolean) {
+        hasNotificationsPermissionState = false
+        notificationsPermissionAlwaysDeniedState = isAlwaysDenied
+
         _selectedScreen.value = Screen.NOTIFICATIONS_PERMISSION
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt
index e41079f3d228..e008d9447cd7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/NotificationsPermissionBuilder.kt
@@ -14,7 +14,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringRes
 import javax.inject.Inject
 
 class NotificationsPermissionBuilder @Inject constructor() {
-    fun buildUiItems(appName: String): List<BloggingRemindersItem> {
+    fun buildUiItems(appName: String, showAppSettingsGuide: Boolean): List<BloggingRemindersItem> {
         val title = UiStringRes(string.blogging_reminders_notifications_permission_title)
 
         val body = UiString.UiStringResWithParams(
@@ -22,12 +22,15 @@ class NotificationsPermissionBuilder @Inject constructor() {
             UiString.UiStringText(appName)
         )
 
-        return listOf(
+        val uiItems = mutableListOf(
             Illustration(drawable.img_illustration_bell_yellow_96dp),
             Title(title),
-            Caption(UiStringRes(string.blogging_reminders_notifications_permission_caption)),
-            HighEmphasisText(EmphasizedText(body, false))
+            Caption(UiStringRes(string.blogging_reminders_notifications_permission_caption))
         )
+        if (showAppSettingsGuide) {
+            uiItems.add(HighEmphasisText(EmphasizedText(body, false)))
+        }
+        return uiItems
     }
 
     fun buildPrimaryButton(onDone: () -> Unit): PrimaryButton {

From 6ee77da96b346ea0569b234c9d1f21c96168c19d Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Fri, 7 Apr 2023 00:09:35 +0300
Subject: [PATCH 10/14] Use standard ' for blogging reminders strings

---
 WordPress/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index fe45c0eb3d7b..2845e1ff7842 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -1502,7 +1502,7 @@
     <string name="notifications_permission_dismiss_content_description">Dismiss notification permission warning.</string>
     <string name="notifications_permission_off_desc">Push notifications are turned off.</string>
     <string name="notifications_permission_bottom_sheet_title">Push notifications are turned off</string>
-    <string name="notifications_permission_bottom_sheet_description_1">You’ll need to open the app to see notifications.</string>
+    <string name="notifications_permission_bottom_sheet_description_1">You\'ll need to open the app to see notifications.</string>
     <string name="notifications_permission_bottom_sheet_description_2">Go to Settings → Notifications → App Settings, and turn %1$s on to be notified immediately.</string>
     <string name="notifications_permission_bottom_sheet_button">Turn on notifications</string>
 
@@ -4068,7 +4068,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="blogging_reminders_update">Update</string>
     <string name="blogging_reminders_done">Done</string>
     <string name="blogging_reminders_notifications_permission_title">Turn on push notifications</string>
-    <string name="blogging_reminders_notifications_permission_caption">To use blogging reminders, you’ll need to turn on push notifications.</string>
+    <string name="blogging_reminders_notifications_permission_caption">To use blogging reminders, you\'ll need to turn on push notifications.</string>
     <string name="blogging_reminders_notifications_permission_description">@string/notifications_permission_bottom_sheet_description_2</string>
     <string name="blogging_reminders_notifications_permission_primary_button">@string/notifications_permission_bottom_sheet_button</string>
     <string name="blogging_reminders_epilogue_title">All set!</string>

From 2c83434d8624e0328660e0c528b0f7ffa5c1389b Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Fri, 7 Apr 2023 00:13:48 +0300
Subject: [PATCH 11/14] Update RELEASE-NOTES

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4be2eef3bf60..b5d2c37ca69e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+22.2
+-----
+* [*] Adds runtime notifications permission [https://github.com/wordpress-mobile/WordPress-Android/pull/18239]
+
 22.1
 -----
 * [**] [WordPress-only] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. [https://github.com/wordpress-mobile/WordPress-Android/pull/18199]

From 9f870dd91ae765e4f11649a73327b6653db4398b Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Fri, 7 Apr 2023 00:44:56 +0300
Subject: [PATCH 12/14] Update WordPress-Utils version to trunk

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a3ff7cdd8191..b00d3f3982f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ ext {
     wordPressFluxCVersion = '2.22.0'
     wordPressLoginVersion = '116-9e75c5927871287fccb0617f15f69bb066656570'
     wordPressPersistentEditTextVersion = '1.0.2'
-    wordPressUtilsVersion = '127-c06360491ae9a0645b8d2adf0df64ca0acba4162'
+    wordPressUtilsVersion = 'trunk-3c3d298621fda50b5cbf6b981b78920b80fa82b4'
 
     // debug
     stethoVersion = '1.6.0'

From 3545e9c7f2f12aa3b431e64bb6b4c9231059fecb Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Fri, 7 Apr 2023 00:50:30 +0300
Subject: [PATCH 13/14] Resolve "translatable="false" warnings on strings

---
 WordPress/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 2845e1ff7842..82dc3bb0e608 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -4069,8 +4069,8 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="blogging_reminders_done">Done</string>
     <string name="blogging_reminders_notifications_permission_title">Turn on push notifications</string>
     <string name="blogging_reminders_notifications_permission_caption">To use blogging reminders, you\'ll need to turn on push notifications.</string>
-    <string name="blogging_reminders_notifications_permission_description">@string/notifications_permission_bottom_sheet_description_2</string>
-    <string name="blogging_reminders_notifications_permission_primary_button">@string/notifications_permission_bottom_sheet_button</string>
+    <string name="blogging_reminders_notifications_permission_description" translatable="false">@string/notifications_permission_bottom_sheet_description_2</string>
+    <string name="blogging_reminders_notifications_permission_primary_button" translatable="false">@string/notifications_permission_bottom_sheet_button</string>
     <string name="blogging_reminders_epilogue_title">All set!</string>
     <string name="blogging_reminders_epilogue_not_set_title">Reminders removed!</string>
     <string name="blogging_reminders_epilogue_body_days_with_time">You\'ll get reminders to blog %1$s a week on %2$s at %3$s.</string>

From d26cfbbc81a5a9238fc774bcfc31176ba61144aa Mon Sep 17 00:00:00 2001
From: Irfan Omur <irfan.omur@automattic.com>
Date: Fri, 7 Apr 2023 19:19:41 +0300
Subject: [PATCH 14/14] Remove duplicated item in RELEASE-NOTES

---
 RELEASE-NOTES.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 7e6113b1c4e5..22a20551a3e3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -4,7 +4,6 @@
 -----
 * [*] Adds runtime notifications permission [https://github.com/wordpress-mobile/WordPress-Android/pull/18239]
 * [**] [internal] Adds media permissions support for Android 13 [https://github.com/wordpress-mobile/WordPress-Android/pull/18183]
-[***] [internal] Adds media permissions support for Android 13 [https://github.com/wordpress-mobile/WordPress-Android/pull/18183]
 -----
 
 22.1