Merge final release/18.2 into develop

.circleci/config.yml

@@ -96,12 +96,13 @@ jobs:
       - run:
           name: Init messages
           command: |
-            echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for << parameters.app >> Android failed!'" >> $BASH_ENV
+            SLACKMSG_APP_NAME=$(echo "<< parameters.app >>" | sed s/wordpress/WordPress/i | sed s/jetpack/Jetpack/i)
+            echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for ${SLACKMSG_APP_NAME} Android failed!'" >> $BASH_ENV
       - git/shallow-checkout:
           init-submodules: true
       - checkout-submodules
       - bundle-install/bundle-install:
-          cache_key_prefix: release-build-v2
+          cache_key_prefix: &release-build-cache-key release-build-v2
       - run:
           name: Copy Secrets
           command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane run configure_apply
@@ -111,9 +112,11 @@ jobs:
           name: Prepare build
           command: |
             APP_VERSION=$(./gradlew -q printVersionName | tail -1)
+            SLACKMSG_APP_NAME=$(echo "<< parameters.app >>" | sed s/wordpress/WordPress/i | sed s/jetpack/Jetpack/i)
+            SLACKMSG_APP_VERSION=<<# parameters.alpha >>$(./gradlew -q printVersionName -Palpha | tail -1)<</ parameters.alpha >><<^ parameters.alpha >>$APP_VERSION<</ parameters.alpha >>
             echo "export APP_VERSION=${APP_VERSION}" >> $BASH_ENV
-            echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for << parameters.app >> Android $APP_VERSION failed!'" >> $BASH_ENV
-            echo "export SLACK_SUCCESS_MESSAGE=':tada: << parameters.app >> Android $APP_VERSION has been deployed!'" >> $BASH_ENV
+            echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for ${SLACKMSG_APP_NAME} Android ${SLACKMSG_APP_VERSION} failed!'" >> $BASH_ENV
+            echo "export SLACK_SUCCESS_MESSAGE=':tada: ${SLACKMSG_APP_NAME} Android ${SLACKMSG_APP_VERSION} has been deployed!'" >> $BASH_ENV
             # Prevent fastlane from checking for updates, also removing the verbose fastlane changelog at the end of each invocation.
             echo "export FASTLANE_SKIP_UPDATE_CHECK=1" >> $BASH_ENV
             bundle check
@@ -124,7 +127,10 @@ jobs:
                 name: Build << parameters.app >> Zalpha
                 command: |
                   if [[ ${APP_VERSION} == *"-rc-"* ]]; then
-                    bundle exec fastlane build_alpha app:<< parameters.app >> skip_confirm:true skip_prechecks:true create_release:true upload_to_play_store:true
+                    bundle exec fastlane build_alpha app:<< parameters.app >> skip_confirm:true skip_prechecks:true upload_to_play_store:true
+                  else
+                    echo "Skipping and halting this job because we only build Zalpha variants for rc versions, but current version is ${APP_VERSION}"
+                    circleci-agent step halt
                   fi
                 no_output_timeout: 15m
       - unless:
@@ -134,22 +140,41 @@ jobs:
                 name: Build << parameters.app >> Vanilla
                 command: |
                   if [[ ${APP_VERSION} == *"-rc-"* ]]; then
-                    bundle exec fastlane build_beta app:<< parameters.app >> skip_confirm:true skip_prechecks:true create_release:true upload_to_play_store:true
+                    bundle exec fastlane build_beta app:<< parameters.app >> skip_confirm:true skip_prechecks:true upload_to_play_store:true
                   else
-                    bundle exec fastlane build_and_upload_release app:<< parameters.app >> skip_confirm:true skip_prechecks:true create_release:true upload_to_play_store:true
+                    bundle exec fastlane build_and_upload_release app:<< parameters.app >> skip_confirm:true skip_prechecks:true upload_to_play_store:true
                   fi
                 no_output_timeout: 15m
       - android/save-gradle-cache
       - store_artifacts:
           path: build
           destination: Artifacts
+      - persist_to_workspace:
+          root: build
+          paths: ['*.aab'] # So they are made available for the "Create GitHub Release" job
       - slack/status:
           include_job_number_field: false
           include_project_field: false
           include_visit_job_action: false
           webhook: '${SLACK_BUILD_WEBHOOK}'
           failure_message: '${SLACK_FAILURE_MESSAGE}'
           success_message: '${SLACK_SUCCESS_MESSAGE}'
+  Create GitHub Release:
+    executor:
+      name: android/default
+      api-version: "29"
+    steps:
+      - git/shallow-checkout:
+          init-submodules: false
+      - bundle-install/bundle-install:
+          cache_key_prefix: *release-build-cache-key
+      - attach_workspace:
+          at: build # Restore *.aab files built from "Release Build" jobs so we can attach them to the GitHub release
+      - run:
+          name: Create GitHub Release
+          command: |
+            bundle exec fastlane create_gh_release
+
 
   Connected Tests:
     parameters:
@@ -404,4 +429,6 @@ workflows:
       - Release Build:
           name: "Release: JP Beta"
           app: jetpack
-          alpha: false
+          alpha: false
+      - Create GitHub Release:
+          requires: ["Release: WP Alpha", "Release: WP Beta", "Release: JP Beta"]

WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
+import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.NavigationAction.DebugCookies
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem.Button
@@ -18,23 +19,31 @@ import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem.Type.BUTTON
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem.Type.FEATURE
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem.Type.HEADER
 import org.wordpress.android.ui.debug.DebugSettingsViewModel.UiItem.Type.ROW
+import org.wordpress.android.ui.notifications.NotificationManagerWrapper
 import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.util.DebugUtils
 import org.wordpress.android.util.config.FeaturesInDevelopment
 import org.wordpress.android.util.config.ManualFeatureConfig
 import org.wordpress.android.util.config.RemoteConfig
 import org.wordpress.android.util.config.RemoteConfigDefaults
+import org.wordpress.android.viewmodel.ContextProvider
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
+import org.wordpress.android.workers.weeklyroundup.WeeklyRoundupNotifier
 import javax.inject.Inject
 import javax.inject.Named
 
 class DebugSettingsViewModel
 @Inject constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     private val manualFeatureConfig: ManualFeatureConfig,
     private val remoteConfig: RemoteConfig,
-    private val debugUtils: DebugUtils
+    private val debugUtils: DebugUtils,
+    private val weeklyRoundupNotifier: WeeklyRoundupNotifier,
+    private val notificationManager: NotificationManagerWrapper,
+    private val contextProvider: ContextProvider
 ) : ScopedViewModel(mainDispatcher) {
     private val _uiState = MutableLiveData<UiState>()
     val uiState: LiveData<UiState> = _uiState
@@ -65,14 +74,21 @@ class DebugSettingsViewModel
             uiItems.add(Button(R.string.debug_settings_restart_app, debugUtils::restartApp))
         }
         uiItems.add(Header(R.string.debug_settings_tools))
-        uiItems.add(Row(R.string.debug_cookies_title, ListItemInteraction.create(this::onDebugCookiesClick)))
+        uiItems.add(Row(R.string.debug_cookies_title, create(this::onDebugCookiesClick)))
+        uiItems.add(Row(R.string.debug_settings_force_show_weekly_roundup, create(this::onForceShowWeeklyRoundupClick)))
         _uiState.value = UiState(uiItems)
     }
 
     private fun onDebugCookiesClick() {
         _onNavigation.value = Event(DebugCookies)
     }
 
+    private fun onForceShowWeeklyRoundupClick() = launch(bgDispatcher) {
+        weeklyRoundupNotifier.buildNotifications().forEach {
+            notificationManager.notify(it.id, it.asNotificationCompatBuilder(contextProvider.getContext()).build())
+        }
+    }
+
     private fun buildDevelopedFeatures(): List<Feature> {
         return FeaturesInDevelopment.featuresInDevelopment.map { name ->
             val value = if (manualFeatureConfig.hasManualSetup(name)) {

WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationManagerWrapper.kt

@@ -1,10 +1,12 @@
 package org.wordpress.android.ui.notifications
 
+import android.app.Notification
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import javax.inject.Inject
 
 class NotificationManagerWrapper
 @Inject constructor(private val context: Context) {
     fun areNotificationsEnabled() = NotificationManagerCompat.from(context).areNotificationsEnabled()
+    fun notify(id: Int, notification: Notification) = NotificationManagerCompat.from(context).notify(id, notification)
 }

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

@@ -166,7 +166,8 @@ public enum DeletablePrefKey implements PrefKey {
         REMOVED_QUICK_START_CARD_TYPE,
         PINNED_DYNAMIC_CARD,
         BLOGGING_REMINDERS_SHOWN,
-        SHOULD_SCHEDULE_CREATE_SITE_NOTIFICATION
+        SHOULD_SCHEDULE_CREATE_SITE_NOTIFICATION,
+        SHOULD_SHOW_WEEKLY_ROUNDUP_NOTIFICATION
     }
 
     /**
@@ -1300,6 +1301,18 @@ public static boolean shouldScheduleCreateSiteNotification() {
         return getBoolean(DeletablePrefKey.SHOULD_SCHEDULE_CREATE_SITE_NOTIFICATION, true);
     }
 
+    public static void setShouldShowWeeklyRoundupNotification(long remoteSiteId, boolean shouldShow) {
+        prefs().edit().putBoolean(getShouldShowWeeklyRoundupNotification(remoteSiteId), shouldShow).apply();
+    }
+
+    public static boolean shouldShowWeeklyRoundupNotification(long remoteSiteId) {
+        return prefs().getBoolean(getShouldShowWeeklyRoundupNotification(remoteSiteId), true);
+    }
+
+    @NonNull private static String getShouldShowWeeklyRoundupNotification(long siteId) {
+        return DeletablePrefKey.SHOULD_SHOW_WEEKLY_ROUNDUP_NOTIFICATION.name() + siteId;
+    }
+
     /*
      * adds a local site ID to the top of list of recently chosen sites
      */

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt

@@ -186,6 +186,14 @@ class AppPrefsWrapper @Inject constructor() {
         return AppPrefs.isBloggingRemindersShown(siteId)
     }
 
+    fun setShouldShowWeeklyRoundupNotification(siteId: Long, shouldShow: Boolean) {
+        AppPrefs.setShouldShowWeeklyRoundupNotification(siteId, shouldShow)
+    }
+
+    fun shouldShowWeeklyRoundupNotification(siteId: Long): Boolean {
+        return AppPrefs.shouldShowWeeklyRoundupNotification(siteId)
+    }
+
     fun setSiteJetpackCapabilities(remoteSiteId: Long, capabilities: List<JetpackCapability>) =
             AppPrefs.setSiteJetpackCapabilities(remoteSiteId, capabilities)
 

WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsDialogPreference.java

@@ -5,6 +5,7 @@
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.DialogPreference;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +17,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
 
@@ -25,6 +27,7 @@
 import org.wordpress.android.models.NotificationsSettings;
 import org.wordpress.android.models.NotificationsSettings.Channel;
 import org.wordpress.android.models.NotificationsSettings.Type;
+import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView.MainSwitchToolbarListener;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -182,48 +185,68 @@ private View configureLayoutForView(LinearLayout view) {
                     continue;
                 }
 
-                View commentsSetting = View.inflate(getContext(), R.layout.notifications_settings_switch, null);
-                TextView title = commentsSetting.findViewById(R.id.notifications_switch_title);
-                title.setText(settingName);
-
                 // Add special summary text for the WPCOM section
+                String settingSummary = null;
                 if (mChannel == Channel.WPCOM && i < summaryArray.length) {
-                    String summaryText = summaryArray[i];
-                    TextView summary = commentsSetting.findViewById(R.id.notifications_switch_summary);
-                    summary.setVisibility(View.VISIBLE);
-                    summary.setText(summaryText);
+                    settingSummary = summaryArray[i];
                 }
 
-                final SwitchCompat toggleSwitch = commentsSetting.findViewById(R.id.notifications_switch);
-                toggleSwitch.setChecked(JSONUtils.queryJSON(settingsJson, settingValue, true));
-                toggleSwitch.setTag(settingValue);
-                toggleSwitch.setOnCheckedChangeListener(mOnCheckedChangedListener);
+                boolean isSettingChecked = JSONUtils.queryJSON(settingsJson, settingValue, true);
 
-                View rowContainer = commentsSetting.findViewById(R.id.row_container);
-                rowContainer.setOnClickListener(new View.OnClickListener() {
-                    @Override public void onClick(View v) {
-                        toggleSwitch.setChecked(!toggleSwitch.isChecked());
-                    }
-                });
-
-                if (mShouldDisplayMainSwitch && i == mSettingsArray.length - 1) {
-                    View divider = commentsSetting.findViewById(R.id.notifications_list_divider);
-                    if (divider != null) {
-                        MarginLayoutParams mlp = (MarginLayoutParams) divider.getLayoutParams();
-                        mlp.leftMargin = 0;
-                        mlp.rightMargin = 0;
-                        divider.setLayoutParams(mlp);
-                    }
-                }
+                boolean isSettingLast = i == mSettingsArray.length - 1;
 
-                view.addView(commentsSetting);
+                view.addView(setupSettingView(settingName, settingValue, settingSummary, isSettingChecked,
+                        isSettingLast, mOnCheckedChangedListener));
             }
         }
 
+        // Add Weekly Roundup setting
+        if (mChannel == Channel.BLOGS && mType == Type.DEVICE) {
+            String settingName = getContext().getString(R.string.weekly_roundup);
+            boolean isSettingChecked = AppPrefs.shouldShowWeeklyRoundupNotification(mBlogId);
+            View settingView = setupSettingView(settingName, null, null, isSettingChecked, true,
+                    (compoundButton, isChecked) -> AppPrefs.setShouldShowWeeklyRoundupNotification(mBlogId, isChecked));
+            view.addView(settingView);
+        }
+
         return view;
     }
 
-    private CompoundButton.OnCheckedChangeListener mOnCheckedChangedListener =
+    private View setupSettingView(String settingName, @Nullable String settingValue, @Nullable String settingSummary,
+                                  boolean isSettingChecked, boolean isSettingLast,
+                                  CompoundButton.OnCheckedChangeListener onCheckedChangeListener) {
+        View setting = View.inflate(getContext(), R.layout.notifications_settings_switch, null);
+        TextView title = setting.findViewById(R.id.notifications_switch_title);
+        title.setText(settingName);
+
+        if (!TextUtils.isEmpty(settingSummary)) {
+            TextView summary = setting.findViewById(R.id.notifications_switch_summary);
+            summary.setVisibility(View.VISIBLE);
+            summary.setText(settingSummary);
+        }
+
+        final SwitchCompat toggleSwitch = setting.findViewById(R.id.notifications_switch);
+        toggleSwitch.setChecked(isSettingChecked);
+        toggleSwitch.setTag(settingValue);
+        toggleSwitch.setOnCheckedChangeListener(onCheckedChangeListener);
+
+        View rowContainer = setting.findViewById(R.id.row_container);
+        rowContainer.setOnClickListener(v -> toggleSwitch.setChecked(!toggleSwitch.isChecked()));
+
+        if (mShouldDisplayMainSwitch && isSettingLast) {
+            View divider = setting.findViewById(R.id.notifications_list_divider);
+            if (divider != null) {
+                MarginLayoutParams mlp = (MarginLayoutParams) divider.getLayoutParams();
+                mlp.leftMargin = 0;
+                mlp.rightMargin = 0;
+                divider.setLayoutParams(mlp);
+            }
+        }
+
+        return setting;
+    }
+
+    private final CompoundButton.OnCheckedChangeListener mOnCheckedChangedListener =
             new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
@@ -325,7 +348,7 @@ private void hideDisabledView(boolean isMainChecked) {
      * Updates Notifications current settings switches state based on the main switch state
      *
      * @param isMainChecked TRUE to switch on the settings switches.
-     *                        FALSE to switch off the settings switches.
+     *                      FALSE to switch off the settings switches.
      */
     private void setSettingsSwitchesChecked(boolean isMainChecked) {
         for (String settingValue : mSettingsValues) {

WordPress/src/main/java/org/wordpress/android/workers/weeklyroundup/WeeklyRoundupNotifier.kt

@@ -12,6 +12,7 @@ import org.wordpress.android.push.NotificationPushIds.WEEKLY_ROUNDUP_NOTIFICATIO
 import org.wordpress.android.push.NotificationType.WEEKLY_ROUNDUP
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.stats.StatsTimeframe.WEEK
 import org.wordpress.android.util.SiteUtilsWrapper
 import org.wordpress.android.viewmodel.ContextProvider
@@ -26,7 +27,8 @@ class WeeklyRoundupNotifier @Inject constructor(
     private val weeklyRoundupScheduler: WeeklyRoundupScheduler,
     private val notificationsTracker: SystemNotificationsTracker,
     private val siteUtils: SiteUtilsWrapper,
-    private val weeklyRoundupRepository: WeeklyRoundupRepository
+    private val weeklyRoundupRepository: WeeklyRoundupRepository,
+    private val appPrefs: AppPrefsWrapper
 ) {
     fun shouldShowNotifications() = accountStore.hasAccessToken() && siteStore.hasSitesAccessedViaWPComRest()
 
@@ -36,6 +38,7 @@ class WeeklyRoundupNotifier @Inject constructor(
                 .awaitAll()
                 .asSequence()
                 .filterNotNull()
+                .filter { appPrefs.shouldShowWeeklyRoundupNotification(it.site.siteId) }
                 .sortedByDescending { it.score }
                 .take(TOP_FIVE_SITES)
                 .filter { it.views >= MIN_SITE_VIEWS }