From 47e448f57a2bdb7e6ba24ad2216b144e1871eb89 Mon Sep 17 00:00:00 2001 From: davinci9196 Date: Wed, 31 Jul 2024 15:02:18 +0800 Subject: [PATCH] Remove unnecessary parameters --- .../manager/PasswordManagerActivity.kt | 38 +------------------ .../credential/CredentialManagerService.kt | 13 +------ 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/play-services-core/src/main/kotlin/com/google/android/gms/credential/manager/PasswordManagerActivity.kt b/play-services-core/src/main/kotlin/com/google/android/gms/credential/manager/PasswordManagerActivity.kt index aadc806394..89a1ae2504 100644 --- a/play-services-core/src/main/kotlin/com/google/android/gms/credential/manager/PasswordManagerActivity.kt +++ b/play-services-core/src/main/kotlin/com/google/android/gms/credential/manager/PasswordManagerActivity.kt @@ -14,10 +14,6 @@ import org.microg.gms.auth.AuthConstants const val PASSWORD_MANAGER_CLASS_NAME = "com.google.android.gms.credential.manager.PasswordManagerActivity" const val EXTRA_KEY_ACCOUNT_NAME = "pwm.DataFieldNames.accountName" -const val EXTRA_KEY_UTM_SOURCE = "utm_source" -const val EXTRA_KEY_UTM_MEDIUM = "utm_medium" -const val EXTRA_KEY_UTM_CAMPAIGN = "utm_campaign" -const val EXTRA_KEY_UTM_CONTENT = "utm_content" private const val TAG = "PasswordManagerActivity" @@ -29,14 +25,6 @@ class PasswordManagerActivity : AppCompatActivity() { private val accountName: String? get() = runCatching { intent?.getStringExtra(EXTRA_KEY_ACCOUNT_NAME) }.getOrNull() - private val utmSource: String? - get() = runCatching { intent?.getStringExtra(EXTRA_KEY_UTM_SOURCE) }.getOrNull() - private val utmMedium: String? - get() = runCatching { intent?.getStringExtra(EXTRA_KEY_UTM_MEDIUM) }.getOrNull() - private val utmCampaign: String? - get() = runCatching { intent?.getStringExtra(EXTRA_KEY_UTM_CAMPAIGN) }.getOrNull() - private val utmContent: String? - get() = runCatching { intent?.getStringExtra(EXTRA_KEY_UTM_CONTENT) }.getOrNull() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -61,31 +49,7 @@ class PasswordManagerActivity : AppCompatActivity() { } layout.addView(webView) setContentView(layout) - WebViewHelper(this, webView).openWebView(constructPswPath(), realAccountName) - } - - private fun constructPswPath(): String { - val psmPath = StringBuilder().apply { - if (!utmSource.isNullOrEmpty()) { - if (isEmpty()) append("?") else append("&") - append("$EXTRA_KEY_UTM_SOURCE=$utmSource") - } - if (!utmMedium.isNullOrEmpty()) { - if (isEmpty()) append("?") else append("&") - append("$EXTRA_KEY_UTM_MEDIUM=$utmMedium") - } - if (!utmCampaign.isNullOrEmpty()) { - if (isEmpty()) append("?") else append("&") - append("$EXTRA_KEY_UTM_CAMPAIGN=$utmCampaign") - } - if (!utmContent.isNullOrEmpty()) { - if (isEmpty()) append("?") else append("&") - append("$EXTRA_KEY_UTM_CONTENT=$utmContent") - } - insert(0, PSW_MANAGER_PATH) - }.toString() - Log.d(TAG, "constructPswPath: $psmPath") - return psmPath + WebViewHelper(this, webView).openWebView(PSW_MANAGER_PATH, realAccountName) } override fun onBackPressed() { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/credential/CredentialManagerService.kt b/play-services-core/src/main/kotlin/org/microg/gms/credential/CredentialManagerService.kt index 8357088467..2d42d47663 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/credential/CredentialManagerService.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/credential/CredentialManagerService.kt @@ -22,10 +22,6 @@ import com.google.android.gms.common.internal.ConnectionInfo import com.google.android.gms.common.internal.GetServiceRequest import com.google.android.gms.common.internal.IGmsCallbacks import com.google.android.gms.credential.manager.EXTRA_KEY_ACCOUNT_NAME -import com.google.android.gms.credential.manager.EXTRA_KEY_UTM_CAMPAIGN -import com.google.android.gms.credential.manager.EXTRA_KEY_UTM_CONTENT -import com.google.android.gms.credential.manager.EXTRA_KEY_UTM_MEDIUM -import com.google.android.gms.credential.manager.EXTRA_KEY_UTM_SOURCE import com.google.android.gms.credential.manager.PASSWORD_MANAGER_CLASS_NAME import com.google.android.gms.credential.manager.common.IPendingIntentCallback import com.google.android.gms.credential.manager.common.ISettingsCallback @@ -69,15 +65,8 @@ private class CredentialManagerServiceImpl(private val context: Context, overrid setClassName(Constants.GMS_PACKAGE_NAME, PASSWORD_MANAGER_CLASS_NAME) putExtra(EXTRA_KEY_ACCOUNT_NAME, params.account.name) addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - if (params.caller != null) { - putExtra(EXTRA_KEY_UTM_SOURCE, params.caller.source) - putExtra(EXTRA_KEY_UTM_MEDIUM, params.caller.medium) - putExtra(EXTRA_KEY_UTM_CAMPAIGN, params.caller.campaign) - putExtra(EXTRA_KEY_UTM_CONTENT, params.caller.content) - } } - val flags = PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_UPDATE_CURRENT - val pendingIntent = PendingIntent.getActivity(context, 0, intent, flags) + val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) callback?.onPendingIntent(Status.SUCCESS, pendingIntent) }.onFailure { Log.d(TAG, "getCredentialManagerIntent error", it)