From 32ced979da8ecc5a9383e012bea81806cf94dbc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:39:54 +0000 Subject: [PATCH] NTP-7562 | Bump androidx.activity:activity from 1.8.0 to 1.9.3 in /android (#13450) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shivam Goyal --- .../ui/DeeplinkManagementActivity.kt | 14 ++++++-------- .../home/compose/activity/HomePageActivity.kt | 2 +- .../ap/common/ui/ApplicationPlatformActivity.kt | 4 ++-- android/gradle/libs.versions.toml | 2 +- .../navi/amc/fundbuy/activities/FundBuyActivity.kt | 10 +++++----- .../navi/chat/ui/activities/NaviChatActivity.kt | 5 ++--- .../java/com/navi/coin/ui/activity/CoinActivity.kt | 4 ++-- .../com/navi/common/ui/activity/BaseActivity.kt | 2 +- .../com/navi/gold/ui/DigitalGoldHomeActivity.kt | 6 +++--- .../insurance/claim/activity/NewClaimActivity.kt | 2 +- .../claim/document/ui/DocumentUploadActivity.kt | 5 ++--- .../claim/document/ui/DocumentsActivity.kt | 4 ++-- .../com/navi/insurance/common/GiBaseActivity.kt | 4 ++-- .../endorsement/activity/EndorsementActivity.kt | 2 +- .../insurance/health/activity/DashboardActivity.kt | 2 +- .../insurance/notifications/DeepLinkActivity.kt | 2 +- .../navi/insurance/quoteredesign/QuoteActivity.kt | 2 +- .../kotlin/com/navi/pay/entry/NaviPayActivity.kt | 2 +- .../viewmodel/base/PaymentManager.kt | 2 +- 19 files changed, 36 insertions(+), 40 deletions(-) diff --git a/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt b/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt index 782fa758e5..41a081d9d6 100644 --- a/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt +++ b/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt @@ -153,17 +153,15 @@ class DeeplinkManagementActivity : BaseLauncherActivity() { * This use-case should not be possible as the activity is launched with singleTask launch mode * and finished afterwards but still keeping this method for safety. */ - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) this.intent = intent // Branch needs a re-init with new intent onNewIntent - intent?.let { - deeplinkManagementViewModel.handleBranchDeeplink( - intent = it, - activity = this, - isReInit = true - ) - } + deeplinkManagementViewModel.handleBranchDeeplink( + intent = intent, + activity = this, + isReInit = true + ) } private fun processDeeplink(deeplinkData: DeeplinkData?) { diff --git a/android/app/src/main/java/com/naviapp/home/compose/activity/HomePageActivity.kt b/android/app/src/main/java/com/naviapp/home/compose/activity/HomePageActivity.kt index e6095b80a8..ca3fbe171a 100644 --- a/android/app/src/main/java/com/naviapp/home/compose/activity/HomePageActivity.kt +++ b/android/app/src/main/java/com/naviapp/home/compose/activity/HomePageActivity.kt @@ -964,7 +964,7 @@ class HomePageActivity : inAppUpdateVM.init() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) redirectToTab() diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/ui/ApplicationPlatformActivity.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/ui/ApplicationPlatformActivity.kt index f7b1912c0e..553d7ee4fd 100644 --- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/ui/ApplicationPlatformActivity.kt +++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/ui/ApplicationPlatformActivity.kt @@ -79,10 +79,10 @@ open class ApplicationPlatformActivity : SdkHandlingActivity() { if (loaderState.value) Box(modifier = Modifier.fillMaxSize().clickable(enabled = false) {}) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) when { - intent?.data != null && + intent.data != null && intent.data?.getQueryParameter(FINORAMIC_USER_ID).orEmpty() != EMPTY -> { intent.data?.let { sdkHandler.finoramicHandler.handleFinoramicRedirection( diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 16ab8a5006..8bcc9c13cc 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanist-pager = "0.28.0" accompanist-permissions = "0.32.0" accompanist-systemuicontroller = "0.17.0" -activity = "1.8.0" +activity = "1.9.3" android-flexbox = "3.0.0" android-gms-playServicesAds = "23.5.0" android-gms-playServicesAuth = "18.0.0" diff --git a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt index 075c34f36e..6378272c95 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/activities/FundBuyActivity.kt @@ -504,12 +504,12 @@ class FundBuyActivity : } } - override fun onNewIntent(newerIntent: Intent?) { - super.onNewIntent(newerIntent) - intent = newerIntent - checkPaymentStatus(newerIntent?.extras) + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + checkPaymentStatus(intent?.extras) popTopScreenIfRequired() - newerIntent?.extras?.run { + intent.extras?.run { val screenTag = getString(Constants.SECOND_IDENTIFIER).orEmpty() navigateToNextScreen(screenTag, this) } diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt index 3cd3cbc1b2..65e7ba4b42 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt @@ -101,11 +101,10 @@ class NaviChatActivity : isChatActivityVisible = true } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) val newProductConfigId = - intent - ?.extras + intent.extras ?.getParcelable(NAVI_CHAT_SYSTEM_LOCAL_DATA) ?.source if (newProductConfigId != null && newProductConfigId != productConfigId) { diff --git a/android/navi-coin/src/main/java/com/navi/coin/ui/activity/CoinActivity.kt b/android/navi-coin/src/main/java/com/navi/coin/ui/activity/CoinActivity.kt index 9c3c1b7c75..369bd3175d 100644 --- a/android/navi-coin/src/main/java/com/navi/coin/ui/activity/CoinActivity.kt +++ b/android/navi-coin/src/main/java/com/navi/coin/ui/activity/CoinActivity.kt @@ -47,10 +47,10 @@ class CoinActivity : CoinBaseActivity() { } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) - intent?.let { handleNewIntent(intent) } + handleNewIntent(intent) } private fun handleNewIntent(intent: Intent?) { diff --git a/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt b/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt index 7a8e2d4847..e7b8dc363e 100644 --- a/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt +++ b/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt @@ -162,7 +162,7 @@ abstract class BaseActivity : handleRedirection() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleRedirection(intent) } diff --git a/android/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldHomeActivity.kt b/android/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldHomeActivity.kt index bca4be82cb..67f8d82c74 100644 --- a/android/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldHomeActivity.kt +++ b/android/navi-gold/src/main/java/com/navi/gold/ui/DigitalGoldHomeActivity.kt @@ -437,9 +437,9 @@ class DigitalGoldHomeActivity : } } - override fun onNewIntent(newIntent: Intent?) { - super.onNewIntent(newIntent) - setIntent(newIntent) + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) } private fun initObserver() { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/activity/NewClaimActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/activity/NewClaimActivity.kt index 6bacc63bd7..c7cb959550 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/activity/NewClaimActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/activity/NewClaimActivity.kt @@ -35,7 +35,7 @@ class NewClaimActivity : GiBaseActivity(), ActionHandler.ActionOwner { override val screenName: String get() = InsuranceAnalyticsConstants.NEW_CLAIM_ACTIVITY - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleOnNewIntent(intent) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadActivity.kt index 073c54f647..3788aef427 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentUploadActivity.kt @@ -47,11 +47,10 @@ class DocumentUploadActivity : GiBaseActivity(), MakeApiCallBottomSheet.Callback return viewModel } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) val screenIdentifier = - intent?.getStringExtra(KEY_SCREEN_IDENTIFIER) - ?: intent?.getStringExtra(SECOND_IDENTIFIER) + intent.getStringExtra(KEY_SCREEN_IDENTIFIER) ?: intent.getStringExtra(SECOND_IDENTIFIER) if ( screenIdentifier == NavigationHandler.URL_DOCUMENT_UPLOAD_SUMMARY_FRAGMENT || screenIdentifier == NavigationHandler.URL_NAVI_VIEW_PAGER_FRAGMENT diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentsActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentsActivity.kt index 994f29a402..4474a1d2ac 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentsActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/claim/document/ui/DocumentsActivity.kt @@ -1,6 +1,6 @@ /* * - * * Copyright © 2022 by Navi Technologies Limited + * * Copyright © 2022-2024 by Navi Technologies Limited * * All rights reserved. Strictly confidential * */ @@ -73,7 +73,7 @@ class DocumentsActivity : GiBaseActivity(), ActionHandler.ActionOwner { override val screenName: String get() = InsuranceAnalyticsConstants.DOCUMENTS_ACTIVITY - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleOnNewIntent(intent) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseActivity.kt index 8ccd39f8ec..61d37cf39f 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/GiBaseActivity.kt @@ -78,8 +78,8 @@ abstract class GiBaseActivity : BaseActivity(), ActionHandler.ActionOwner { (getViewModel() as? GiBaseVM)?.performAction(action, this) } - protected fun handleOnNewIntent(intent: Intent?) { - val screenIdentifier = intent?.getStringExtra(KEY_SCREEN_IDENTIFIER) + protected fun handleOnNewIntent(intent: Intent) { + val screenIdentifier = intent.getStringExtra(KEY_SCREEN_IDENTIFIER) screenIdentifier ?.takeIf { it.isNotEmpty() } ?.let { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/endorsement/activity/EndorsementActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/endorsement/activity/EndorsementActivity.kt index 65e75c3072..a1ea988cd3 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/endorsement/activity/EndorsementActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/endorsement/activity/EndorsementActivity.kt @@ -35,7 +35,7 @@ class EndorsementActivity : GiBaseActivity(), ActionHandler.ActionOwner { override val screenName: String get() = InsuranceAnalyticsConstants.ENDORSEMENT_ACTIVITY - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleOnNewIntent(intent) } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt index 87322ec7ae..221476b164 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/DashboardActivity.kt @@ -94,7 +94,7 @@ class DashboardActivity : } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) postOnCreate() diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/notifications/DeepLinkActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/notifications/DeepLinkActivity.kt index b33cb08425..d486efd292 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/notifications/DeepLinkActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/notifications/DeepLinkActivity.kt @@ -69,7 +69,7 @@ class DeepLinkActivity : AppCompatActivity() { handleIntent() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) handleIntent() } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt index 72b0d2aad1..f71c21ecdc 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt @@ -320,7 +320,7 @@ class QuoteActivity : safelyShowBottomSheet(fragment, tag) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) finish() startActivity(intent) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt index 5488a11a8e..b9d360837e 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt @@ -169,7 +169,7 @@ class NaviPayActivity : BaseActivity() { naviPayActivityDataProvider.setIntentData(intent?.extras ?: Bundle()) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) initFromIntent(intent) } diff --git a/android/navi-payment/src/main/java/com/navi/paymentclients/viewmodel/base/PaymentManager.kt b/android/navi-payment/src/main/java/com/navi/paymentclients/viewmodel/base/PaymentManager.kt index f0abcc04bd..f9d16a2ea6 100644 --- a/android/navi-payment/src/main/java/com/navi/paymentclients/viewmodel/base/PaymentManager.kt +++ b/android/navi-payment/src/main/java/com/navi/paymentclients/viewmodel/base/PaymentManager.kt @@ -119,7 +119,7 @@ class PaymentManager( private var naviSdkToken: String? = null private var rpdSdkToken: String? = null private var rpdMethodId: String? = null - private var rpdUpiIntent: ActivityResultLauncher? = null + private var rpdUpiIntent: ActivityResultLauncher? = null private var clientRequestId: String? = null private var disableUpiCollectFlow: Boolean? = null private val paymentScreenAnalytics by lazy {