Skip to content

Remove "Open Web Links with Jetpack" feature #22588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jkmassel wants to merge 1 commit into
base: trunk
Choose a base branch
from
+40 −1,213
Draft

Remove "Open Web Links with Jetpack" feature #22588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ android {
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"
buildConfigField "boolean", "WP_INDIVIDUAL_PLUGIN_OVERLAY", "false"
buildConfigField "boolean", "SITE_EDITOR_MVP", "false"
Expand Down Expand Up @@ -174,7 +173,6 @@ android {
buildConfigField "boolean", "ENABLE_FOLLOWED_SITES_SETTINGS", "true"
buildConfigField "boolean", "ENABLE_WHATS_NEW_FEATURE", "true"
buildConfigField "boolean", "ENABLE_QRCODE_AUTH_FLOW", "true"
buildConfigField "boolean", "ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW", "true"
buildConfigField "boolean", "BLAZE_MANAGE_CAMPAIGNS", "false"
buildConfigField "boolean", "DASHBOARD_PERSONALIZATION", "false"
buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
Expand Down Expand Up @@ -207,7 +205,6 @@ android {
buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"'
buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"org.wordpress.android"'
buildConfigField "boolean", "ENABLE_QRCODE_AUTH_FLOW", "false"
buildConfigField "boolean", "ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW", "true"
buildConfigField "String", "WPCOM_REDIRECT_URI", '"wordpress://wpcom-authorize"'

manifestPlaceholders = [magicLinkScheme:"wordpress"]
Expand All @@ -229,7 +226,6 @@ android {
buildConfigField "String", "TRACKS_EVENT_PREFIX", '"jpandroid_"'
buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"com.jetpack.android"'
buildConfigField "boolean", "ENABLE_QRCODE_AUTH_FLOW", "true"
buildConfigField "boolean", "ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW", "false"
buildConfigField "String", "WPCOM_REDIRECT_URI", '"jetpack://wpcom-authorize"'

manifestPlaceholders = [magicLinkScheme:"jetpack"]
Expand Down
158 changes: 0 additions & 158 deletions WordPress/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,164 +509,6 @@
</intent-filter>
</activity-alias>

<!-- Web Links Deep Linking Activity Alias -->
<activity-alias
android:name=".WebLinksDeepLinkingIntentReceiverActivity"
android:label="@string/deep_linking_weblinks_alias_label"
android:targetActivity="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity"
android:theme="@style/WordPress.NoActionBar"
android:excludeFromRecents="true"
android:exported="true">
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="wordpress.com"
android:pathPattern="/post/..*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/post/..*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/stats/..*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/stats/..*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/pages/..*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/pages/..*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/notifications/.*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/notifications/.*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/media/..*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/media/.*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/domains/manage"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/site-monitoring/.*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/site-monitoring/.*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:path="/read"
android:scheme="https" />

<data
android:host="wordpress.com"
android:path="/read"
android:scheme="http" />

<data
android:host="wordpress.com"
android:path="/discover"
android:scheme="https" />

<data
android:host="wordpress.com"
android:path="/discover"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/read/feeds/.*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/read/feeds/.*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:pathPattern="/reader/feeds/.*"
android:scheme="https" />

<data
android:host="wordpress.com"
android:pathPattern="/reader/feeds/.*"
android:scheme="http" />

<data
android:host="wordpress.com"
android:path="/read/search"
android:scheme="https"
tools:ignore="IntentFilterUniqueDataAttributes" />

<data
android:host="wordpress.com"
android:path="/read/search"
android:scheme="http"
tools:ignore="IntentFilterUniqueDataAttributes" />

<data
android:host="wordpress.com"
android:path="/reader/search"
android:scheme="https"
tools:ignore="IntentFilterUniqueDataAttributes" />

<data
android:host="wordpress.com"
android:path="/reader/search"
android:scheme="http"
tools:ignore="IntentFilterUniqueDataAttributes" />

<data
android:host="wordpress.com"
android:pathPattern="/tag/.*"
android:scheme="https"
tools:ignore="IntentFilterUniqueDataAttributes" />

<data
android:host="wordpress.com"
android:pathPattern="/tag/.*"
android:scheme="http"
tools:ignore="IntentFilterUniqueDataAttributes" />

</intent-filter>
</activity-alias>

<!-- Reader Activities -->
<activity
android:name=".ui.reader.ReaderPostListActivity"
Expand Down
22 changes: 0 additions & 22 deletions WordPress/src/main/java/org/wordpress/android/AppInitializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ import org.wordpress.android.push.GCMRegistrationScheduler
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.JetpackFeatureRemovalWidgetHelper
import org.wordpress.android.ui.mysite.SelectedSiteRepository
Expand Down Expand Up @@ -107,7 +106,6 @@ import org.wordpress.android.util.SiteUtils
import org.wordpress.android.util.VolleyUtils
import org.wordpress.android.util.analytics.AnalyticsUtils
import org.wordpress.android.util.config.AppConfig
import org.wordpress.android.util.config.OpenWebLinksWithJetpackFlowFeatureConfig
import org.wordpress.android.util.enqueuePeriodicUploadWorkRequestForAllSites
import org.wordpress.android.util.image.ImageManager
import org.wordpress.android.widgets.AppReviewManager
Expand Down Expand Up @@ -218,13 +216,6 @@ class AppInitializer @Inject constructor(
@Inject
lateinit var oAuthAuthenticator: OAuthAuthenticator

// For jetpack focus
@Inject
lateinit var openWebLinksWithJetpackFlowFeatureConfig: OpenWebLinksWithJetpackFlowFeatureConfig

@Inject
lateinit var openWebLinksWithJetpackHelper: DeepLinkOpenWebLinksWithJetpackHelper

@Inject
lateinit var jetpackFeatureRemovalWidgetHelper: JetpackFeatureRemovalWidgetHelper

Expand Down Expand Up @@ -759,16 +750,6 @@ class AppInitializer @Inject constructor(
}
}

private fun enableDeepLinkingComponentsIfNeeded() {
if (openWebLinksWithJetpackFlowFeatureConfig.isEnabled()) {
if (!AppPrefs.getIsOpenWebLinksWithJetpack()) {
openWebLinksWithJetpackHelper.enableDeepLinks()
}
} else {
openWebLinksWithJetpackHelper.enableDeepLinks()
}
}

private fun disableWidgetReceiversIfNeeded() {
jetpackFeatureRemovalWidgetHelper.disableWidgetReceiversIfNeeded()
}
Expand Down Expand Up @@ -838,9 +819,6 @@ class AppInitializer @Inject constructor(

readerTracker.onAppGoesToBackground()

// Ensure that the deeplinking activity is are re-enabled if needed
enableDeepLinkingComponentsIfNeeded()

AnalyticsTracker.track(Stat.APPLICATION_CLOSED, properties)
AnalyticsTracker.endSession(false)
// Methods onAppComesFromBackground and onAppGoesToBackground are only workarounds to track when the app
Expand Down
4 changes: 1 addition & 3 deletions WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkEntryPoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ import org.wordpress.android.R

enum class DeepLinkEntryPoint {
DEFAULT,
URI_LINKS,
WEB_LINKS;
URI_LINKS;

companion object {
@JvmStatic
fun fromResId(resId: Int?) = when {
R.string.deep_linking_urilinks_alias_label == resId -> URI_LINKS
R.string.deep_linking_weblinks_alias_label == resId -> WEB_LINKS
else -> DEFAULT
}
}
Expand Down
4 changes: 0 additions & 4 deletions WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenE
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForSite
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInBrowser
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenJetpackForDeepLink
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenLoginPrologue
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenMySite
import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenNotifications
Expand Down Expand Up @@ -99,8 +98,6 @@ class DeepLinkNavigator
is OpenQRCodeAuthFlow -> ActivityLauncher.startQRCodeAuthFlowInNewStack(activity, navigateAction.uri)
OpenMySite -> ActivityLauncher.viewMySiteInNewStack(activity)
OpenLoginPrologue -> ActivityLauncher.showLoginPrologue(activity)
is OpenJetpackForDeepLink ->
ActivityLauncher.openJetpackForDeeplink(activity, navigateAction.action, navigateAction.uri)
is NavigateAction.OpenJetpackStaticPosterView ->
ActivityLauncher.showJetpackStaticPoster(activity)
is NavigateAction.OpenMediaForSite -> activityNavigator.openMediaInNewStack(activity, navigateAction.site)
Expand Down Expand Up @@ -152,7 +149,6 @@ class DeepLinkNavigator
data class OpenQRCodeAuthFlow(val uri: String) : NavigateAction()
object OpenMySite : NavigateAction()
object OpenLoginPrologue : NavigateAction()
data class OpenJetpackForDeepLink(val action: String?, val uri: UriWrapper) : NavigateAction()
object OpenJetpackStaticPosterView : NavigateAction()
data class OpenMediaForSite(val site: SiteModel) : NavigateAction()
object OpenMedia : NavigateAction()
Expand Down
Loading