Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e4ce59d
CMM-2302: Remove the shadowed Jetpack feature-removal phases One, Two…
nbradbury Aug 13, 2026
aa6d35a
CMM-2302: Remove the shadowed Jetpack feature-removal static-posters …
nbradbury Aug 13, 2026
dafdcdd
CMM-2302: Remove the unreachable Jetpack banner on Scan, People and T…
nbradbury Aug 13, 2026
b9c4a4d
CMM-2302: Address review feedback
nbradbury Aug 13, 2026
2dfaa1f
CMM-2302: Fix detekt, checkstyle and lint violations
nbradbury Aug 13, 2026
4622227
CMM-2303: Make the Jetpack feature removal a build-flavor invariant
nbradbury Aug 13, 2026
11e524a
CMM-2302: Simplify the overlay code left behind by the phase removal
nbradbury Aug 13, 2026
412106e
CMM-2302: Address review feedback on the phase removal
nbradbury Aug 13, 2026
d72ab79
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 13, 2026
655f084
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 14, 2026
d53f389
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 14, 2026
c68f881
CMM-2302: Fix stale KDoc left by the trunk merge
nbradbury Aug 14, 2026
16bca31
CMM-2302: Rename the phase helper and drop the last single-constant enum
nbradbury Aug 14, 2026
910e7cc
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 14, 2026
a58778f
CMM-2302: Correct the deep-link tracking constant's KDoc
nbradbury Aug 14, 2026
45e529f
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 14, 2026
944db21
CMM-2302: Fix formatting left behind by the phase deletions
nbradbury Aug 14, 2026
e5e7ad5
CMM-2302: Remove the Jetpack branding and new-users overlay dead code
nbradbury Aug 14, 2026
525d9d5
CMM-2302: Clear the static analysis fallout from the branding removal
nbradbury Aug 14, 2026
77b6633
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 15, 2026
1dedf55
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 17, 2026
a84ce2f
Merge remote-tracking branch 'origin/trunk' into issue/CMM-2302-retir…
nbradbury Aug 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,13 @@ android {
buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
buildConfigField "boolean", "BETA_SITE_DESIGNS", "false"
buildConfigField "boolean", "JETPACK_POWERED", "true"
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "true"
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "true"
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "true"
buildConfigField "boolean", "JETPACK_BLOGGING_REMINDERS_SYNC", "true"
buildConfigField "boolean", "JETPACK_READER_SAVED_POSTS", "true"
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "true"
buildConfigField "boolean", "JETPACK_MIGRATION_FLOW", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_PHASE_ONE", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_PHASE_TWO", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_PHASE_THREE", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_PHASE_FOUR", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_NEW_USERS", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_STATIC_POSTERS", "false"
buildConfigField "boolean", "JETPACK_FEATURE_REMOVAL_SELF_HOSTED_USERS", "false"
buildConfigField "boolean", "PREVENT_DUPLICATE_NOTIFS_REMOTE_FIELD", "false"
buildConfigField "boolean", "OPEN_WEB_LINKS_WITH_JETPACK_FLOW", "false"
buildConfigField "boolean", "ENABLE_BLAZE_FEATURE", "false"
Expand Down
3 changes: 0 additions & 3 deletions WordPress/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
android:supportsRtl="true"
tools:replace="android:name,android:supportsRtl"
tools:ignore="MissingApplicationIcon">
<activity
android:name=".ui.debug.previews.PreviewFragmentActivity"
android:theme="@style/WordPress.NoActionBar" />
<activity
android:name=".ui.debug.preferences.DebugSharedPreferenceFlagsActivity"
android:label="@string/debug_settings_debug_flags_screen"
Expand Down
5 changes: 0 additions & 5 deletions WordPress/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1396,11 +1396,6 @@
android:label="@string/blaze_campaigns_page_title"
android:theme="@style/WordPress.NoActionBar" />

<activity android:name=".ui.jetpackoverlay.JetpackStaticPosterActivity"
android:exported="false"
android:label="@string/stats"
android:theme="@style/WordPress.NoActionBar"/>

<activity android:name=".ui.mysite.personalization.PersonalizationActivity"
android:exported="false"
android:label="@string/stats"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import org.wordpress.android.support.ZendeskHelper
import org.wordpress.android.ui.ActivityId
import org.wordpress.android.ui.debug.cookies.DebugCookieManager
import org.wordpress.android.ui.deeplinks.DeepLinkOpenWebLinksWithJetpackHelper
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalHelper
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalWidgetHelper
import org.wordpress.android.ui.mysite.SelectedSiteRepository
import org.wordpress.android.ui.notifications.SystemNotificationsTracker
Expand Down Expand Up @@ -235,7 +235,7 @@ class AppInitializer @Inject constructor(
lateinit var jetpackFeatureRemovalWidgetHelper: JetpackFeatureRemovalWidgetHelper

@Inject
lateinit var jetpackFeatureRemovalPhaseHelper: JetpackFeatureRemovalPhaseHelper
lateinit var jetpackFeatureRemovalHelper: JetpackFeatureRemovalHelper

@Inject
lateinit var perAppLocaleManager: PerAppLocaleManager
Expand Down Expand Up @@ -935,7 +935,7 @@ class AppInitializer @Inject constructor(
}

private fun updateNotificationSettings() {
if (!jetpackFeatureRemovalPhaseHelper.shouldShowNotifications()) {
if (!jetpackFeatureRemovalHelper.shouldShowNotifications()) {
NotificationsUtils.cancelAllNotifications(application)
// Only create the transient notification channel to handle upload notifications
createNotificationChannelsOnSdk26(
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.wordpress.android.fluxc.store.AccountStore;
import org.wordpress.android.fluxc.store.SiteStore;
import org.wordpress.android.support.ZendeskHelper;
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper;
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalHelper;
import org.wordpress.android.ui.notifications.SystemNotificationsTracker;
import org.wordpress.android.util.AppLog;
import org.wordpress.android.util.AppLog.T;
Expand All @@ -37,7 +37,7 @@ public class GCMMessageService extends FirebaseMessagingService {
@Inject ZendeskHelper mZendeskHelper;
@Inject SystemNotificationsTracker mSystemNotificationsTracker;
@Inject GCMMessageHandler mGCMMessageHandler;
@Inject JetpackFeatureRemovalPhaseHelper mJetpackFeatureRemovalPhaseHelper;
@Inject JetpackFeatureRemovalHelper mJetpackFeatureRemovalHelper;

@Inject GCMRegistrationScheduler mGCMRegistrationScheduler;

Expand Down Expand Up @@ -74,7 +74,7 @@ public void onMessageReceived(RemoteMessage message) {
return;
}

if (!mJetpackFeatureRemovalPhaseHelper.shouldShowNotifications()) {
if (!mJetpackFeatureRemovalHelper.shouldShowNotifications()) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
import org.wordpress.android.ui.jetpack.scan.ScanActivity;
import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsActivity;
import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryActivity;
import org.wordpress.android.ui.jetpackoverlay.JetpackStaticPosterActivity;
import org.wordpress.android.ui.jetpackplugininstall.remoteplugin.JetpackRemoteInstallActivity;
import org.wordpress.android.ui.main.ChooseSiteActivity;
import org.wordpress.android.ui.main.MeActivity;
Expand Down Expand Up @@ -1862,11 +1861,6 @@ public static void openPromoteWithBlaze(@NonNull Context context,
context.startActivity(intent);
}

public static void showJetpackStaticPoster(@NonNull Context context) {
Intent intent = new Intent(context, JetpackStaticPosterActivity.class);
context.startActivity(intent);
}

public static void openDomainManagement(@NonNull Context context) {
Intent intent = new Intent(context, DomainManagementActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import org.wordpress.android.analytics.AnalyticsTracker;
import org.wordpress.android.fluxc.model.SiteModel;
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper;
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalHelper;
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
import org.wordpress.android.util.AppLog;

Expand All @@ -20,7 +20,7 @@ public class ShortcutsNavigator {
@Inject ShortcutsNavigator() {
}

@Inject JetpackFeatureRemovalPhaseHelper mJetpackFeatureRemovalPhaseHelper;
@Inject JetpackFeatureRemovalHelper mJetpackFeatureRemovalHelper;

public void showTargetScreen(String action, Activity activity, SiteModel currentSite) {
Shortcut shortcut = Shortcut.fromActionString(action);
Expand All @@ -32,12 +32,8 @@ public void showTargetScreen(String action, Activity activity, SiteModel current
switch (shortcut) {
case OPEN_STATS:
AnalyticsTracker.track(AnalyticsTracker.Stat.SHORTCUT_STATS_CLICKED);
if (!mJetpackFeatureRemovalPhaseHelper.shouldRemoveJetpackFeatures()) {
if (mJetpackFeatureRemovalPhaseHelper.shouldShowStaticPage()) {
ActivityLauncher.showJetpackStaticPoster(activity);
} else {
ActivityLauncher.viewBlogStats(activity, currentSite, StatsLaunchedFrom.SHORTCUT);
}
if (!mJetpackFeatureRemovalHelper.shouldRemoveJetpackFeatures()) {
ActivityLauncher.viewBlogStats(activity, currentSite, StatsLaunchedFrom.SHORTCUT);
}
break;
case CREATE_NEW_POST:
Expand All @@ -53,7 +49,7 @@ public void showTargetScreen(String action, Activity activity, SiteModel current
break;
case OPEN_NOTIFICATIONS:
AnalyticsTracker.track(AnalyticsTracker.Stat.SHORTCUT_NOTIFICATIONS_CLICKED);
if (!mJetpackFeatureRemovalPhaseHelper.shouldRemoveJetpackFeatures()) {
if (!mJetpackFeatureRemovalHelper.shouldRemoveJetpackFeatures()) {
ActivityLauncher.viewNotifications(activity);
}
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import android.os.Bundle
import android.text.SpannableString
import android.text.method.LinkMovementMethod
import android.view.View
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.viewModels
Expand All @@ -15,7 +14,6 @@ import org.wordpress.android.WordPress
import org.wordpress.android.databinding.ActivityLogItemDetailBinding
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.ui.ActivityLauncher
import org.wordpress.android.ui.ActivityLauncher.BACKUP_TRACK_EVENT_PROPERTY_VALUE
import org.wordpress.android.ui.ActivityLauncher.SOURCE_TRACK_EVENT_PROPERTY_KEY
import org.wordpress.android.ui.RequestCodes
import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailNavigationEvents.ShowBackupDownload
Expand All @@ -27,10 +25,8 @@ import org.wordpress.android.ui.notifications.utils.FormattableContentClickHandl
import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
import org.wordpress.android.ui.reader.tracker.ReaderTracker
import org.wordpress.android.ui.utils.UiHelpers
import org.wordpress.android.util.JetpackBrandingUtils
import org.wordpress.android.util.extensions.getSerializableCompat
import org.wordpress.android.util.extensions.getSerializableExtraCompat
import org.wordpress.android.models.JetpackPoweredScreen
import org.wordpress.android.util.image.ImageManager
import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY
Expand Down Expand Up @@ -58,9 +54,6 @@ class ActivityLogDetailFragment : Fragment(R.layout.activity_log_item_detail) {
@Inject
lateinit var uiHelpers: UiHelpers

@Inject
lateinit var jetpackBrandingUtils: JetpackBrandingUtils

private val viewModel: ActivityLogDetailViewModel by viewModels()

private val trackingSource by lazy {
Expand Down Expand Up @@ -90,26 +83,6 @@ class ActivityLogDetailFragment : Fragment(R.layout.activity_log_item_detail) {

viewModel.start(site, activityLogId, areButtonsVisible, isRestoreHidden, isDashboardCardEntry)
}

if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
val screen = trackingSource
?.takeIf { it == BACKUP_TRACK_EVENT_PROPERTY_VALUE }
?.let { JetpackPoweredScreen.WithDynamicText.BACKUP_DETAIL }
?: JetpackPoweredScreen.WithDynamicText.ACTIVITY_LOG_DETAIL

jetpackBadge.root.isVisible = true
jetpackBadge.jetpackPoweredBadge.text = uiHelpers.getTextOfUiString(
requireContext(),
jetpackBrandingUtils.getBrandingTextForScreen(screen)
)

if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
jetpackBadge.jetpackPoweredBadge.setOnClickListener {
jetpackBrandingUtils.trackBadgeTapped(screen)
viewModel.showJetpackPoweredBottomSheet()
}
}
}
}

private fun ActivityLogItemDetailBinding.setupObservers() {
Expand Down
Loading
Loading