From b0906185d493b350a378ec183ca4786b44cede4a Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Wed, 20 Nov 2024 17:43:10 +0530 Subject: [PATCH] NTP-13954 | Remove Redundant WifiReceiver (#13703) --- .../activities/PermissionActivity.kt | 5 +- .../activities/PermissionV2Activity.kt | 4 +- .../activities/PlMandatePermissionActivity.kt | 4 +- .../pushnotification/NotificationHandler.kt | 6 -- .../java/com/naviapp/receiver/WifiListener.kt | 12 ---- .../java/com/naviapp/receiver/WifiReceiver.kt | 45 ------------ .../receiver/WifiTrackerBaseActivity.kt | 69 ------------------- .../main/java/com/naviapp/utils/Constants.kt | 1 - .../com/navi/common/model/DeviceDetail.kt | 6 -- .../java/com/navi/common/utils/Constants.kt | 1 - .../java/com/navi/common/utils/Utility.kt | 6 -- 11 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 android/app/src/main/java/com/naviapp/receiver/WifiListener.kt delete mode 100644 android/app/src/main/java/com/naviapp/receiver/WifiReceiver.kt delete mode 100644 android/app/src/main/java/com/naviapp/receiver/WifiTrackerBaseActivity.kt diff --git a/android/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt b/android/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt index c2688b47f7..fa8fa5620e 100644 --- a/android/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt +++ b/android/app/src/main/java/com/naviapp/permission/activities/PermissionActivity.kt @@ -27,6 +27,7 @@ import com.navi.common.firebasedb.* import com.navi.common.managers.NaviLocationManager import com.navi.common.managers.PermissionsManager import com.navi.common.model.ModuleNameV2 +import com.navi.common.ui.activity.BaseActivity import com.navi.common.utils.* import com.navi.common.utils.Constants.OFFER_IMPROVEMENT_CHANNEL_TYPE import com.navi.design.R as DesignR @@ -45,14 +46,12 @@ import com.naviapp.permission.adapters.PermissionAdapter import com.naviapp.permission.utils.getAlternatePermissionTiles import com.naviapp.permission.utils.hasPermissions import com.naviapp.permission.viewmodel.PermissionViewModel -import com.naviapp.receiver.WifiTrackerBaseActivity import com.naviapp.registration.viewmodel.RegistrationVM import com.naviapp.utils.* import com.naviapp.utils.Constants import com.naviapp.utils.Constants.REDIRECT_PAGE_STATUS -class PermissionActivity : - WifiTrackerBaseActivity(), FooterInteractionListener, View.OnClickListener { +class PermissionActivity : BaseActivity(), FooterInteractionListener, View.OnClickListener { private lateinit var binding: ActivityPermissionBinding private val permissionAdapter by lazy { PermissionAdapter() } private val permissionsManager by lazy { PermissionsManager(this) } diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PermissionV2Activity.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PermissionV2Activity.kt index 65d98f92f4..b270912982 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PermissionV2Activity.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PermissionV2Activity.kt @@ -39,6 +39,7 @@ import com.navi.common.managers.NaviLocationManager import com.navi.common.managers.PermissionsManager import com.navi.common.model.ModuleNameV2 import com.navi.common.model.RequestConfig +import com.navi.common.ui.activity.BaseActivity import com.navi.common.utils.ApiPollScheduler import com.navi.common.utils.EMPTY import com.navi.common.utils.TemporaryStorageHelper @@ -64,7 +65,6 @@ import com.naviapp.permission.utils.getAlternatePermissionTilesV2 import com.naviapp.permission.utils.hasPermissions import com.naviapp.permission.viewmodel.PermissionViewModel import com.naviapp.personalloanrevamp.useridentificationv2.adapter.PermissionV2Adapter -import com.naviapp.receiver.WifiTrackerBaseActivity import com.naviapp.registration.helper.isReadSmsPermissionGranted import com.naviapp.utils.Constants import com.naviapp.utils.Constants.CRM_HELP_SCREEN_NAME @@ -75,7 +75,7 @@ import com.naviapp.utils.Constants.SOURCE import com.naviapp.utils.IntentConstants class PermissionV2Activity : - WifiTrackerBaseActivity(), View.OnClickListener, NaviHeaderView.InteractionListener { + BaseActivity(), View.OnClickListener, NaviHeaderView.InteractionListener { private lateinit var binding: ActivityPermissionV2Binding private val permissionAdapter by lazy { PermissionV2Adapter() } private val permissionsManager by lazy { PermissionsManager(this) } diff --git a/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt b/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt index e834ea78b5..17c0bb0eba 100644 --- a/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt +++ b/android/app/src/main/java/com/naviapp/personalloanrevamp/useridentificationv2/activities/PlMandatePermissionActivity.kt @@ -30,6 +30,7 @@ import com.navi.common.managers.NaviLocationManager import com.navi.common.managers.PermissionsManager import com.navi.common.model.ModuleNameV2 import com.navi.common.model.permission.PermissionTile +import com.navi.common.ui.activity.BaseActivity import com.navi.common.utils.EMPTY import com.navi.common.utils.TemporaryStorageHelper import com.navi.common.utils.observeNullable @@ -49,7 +50,6 @@ import com.naviapp.models.RedirectPageStatus import com.naviapp.network.ApiErrorTagType import com.naviapp.permission.viewmodel.PermissionViewModel import com.naviapp.personalloanrevamp.useridentificationv2.adapter.MandatePermissionAdapter -import com.naviapp.receiver.WifiTrackerBaseActivity import com.naviapp.registration.helper.isReadSmsPermissionGranted import com.naviapp.utils.Constants import com.naviapp.utils.Constants.REDIRECT_PAGE_STATUS @@ -59,7 +59,7 @@ import com.naviapp.utils.setCornerRadius import com.naviapp.utils.setVisibilityState class PlMandatePermissionActivity : - WifiTrackerBaseActivity(), View.OnClickListener, NaviHeaderView.InteractionListener { + BaseActivity(), View.OnClickListener, NaviHeaderView.InteractionListener { private lateinit var binding: ActivityMandatePermissionBinding private val permissionAdapter by lazy { MandatePermissionAdapter() } private val permissionsManager by lazy { PermissionsManager(this) } diff --git a/android/app/src/main/java/com/naviapp/pushnotification/NotificationHandler.kt b/android/app/src/main/java/com/naviapp/pushnotification/NotificationHandler.kt index e059c99034..a9b31e26c9 100644 --- a/android/app/src/main/java/com/naviapp/pushnotification/NotificationHandler.kt +++ b/android/app/src/main/java/com/naviapp/pushnotification/NotificationHandler.kt @@ -26,7 +26,6 @@ import com.navi.base.utils.NaviNetworkConnectivityImpl import com.navi.base.utils.orZero import com.navi.common.model.CommunicationAppLaunchData import com.navi.common.model.DeviceDetail -import com.navi.common.model.WifiDetails import com.navi.common.utils.CommonFraudUtil import com.navi.common.utils.CommonRootDeviceUtil import com.navi.common.utils.deviceId @@ -121,11 +120,6 @@ object NotificationHandler { PreferenceManager.getStringPreference( CommonPrefConstants.FIREBASE_APP_INSTANCE ), - wifiDetails = - PreferenceManager.getObjectPrefrences( - Constants.WIFI_DETAILS, - WifiDetails::class.java - ), hardwareDetail = getHardwareDetails(context, screenRefreshRate), isInstalledOnProfiles = isInstalledInProfile(context), localStorageLocation = getLocalStorageLocation(context), diff --git a/android/app/src/main/java/com/naviapp/receiver/WifiListener.kt b/android/app/src/main/java/com/naviapp/receiver/WifiListener.kt deleted file mode 100644 index 384d9201db..0000000000 --- a/android/app/src/main/java/com/naviapp/receiver/WifiListener.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * - * * Copyright © 2020-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.naviapp.receiver - -interface WifiListener { - fun onWifiReceive(wifi: List) -} diff --git a/android/app/src/main/java/com/naviapp/receiver/WifiReceiver.kt b/android/app/src/main/java/com/naviapp/receiver/WifiReceiver.kt deleted file mode 100644 index e2b47099fc..0000000000 --- a/android/app/src/main/java/com/naviapp/receiver/WifiReceiver.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * - * * Copyright © 2019-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.naviapp.receiver - -import android.Manifest -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.pm.PackageManager -import android.net.wifi.WifiManager -import androidx.core.content.ContextCompat - -class WifiReceiver(var wifiManager: WifiManager) : BroadcastReceiver() { - var wifiListener: WifiListener? = null - - override fun onReceive(context: Context, intent: Intent) { - if ( - ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == - PackageManager.PERMISSION_GRANTED || - ContextCompat.checkSelfPermission( - context, - Manifest.permission.ACCESS_COARSE_LOCATION - ) == PackageManager.PERMISSION_GRANTED - ) { - val action = intent.action - if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION == action) { - val list = ArrayList() - val wifiList = wifiManager.scanResults - for (scanResult in wifiList) { - list.add(scanResult.SSID?.replace("\"", "").orEmpty()) - } - wifiListener?.onWifiReceive(list) - } - } - } - - fun setListener(listener: WifiListener) { - wifiListener = listener - } -} diff --git a/android/app/src/main/java/com/naviapp/receiver/WifiTrackerBaseActivity.kt b/android/app/src/main/java/com/naviapp/receiver/WifiTrackerBaseActivity.kt deleted file mode 100644 index 8583d38c50..0000000000 --- a/android/app/src/main/java/com/naviapp/receiver/WifiTrackerBaseActivity.kt +++ /dev/null @@ -1,69 +0,0 @@ -/* - * - * * Copyright © 2022-2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - -package com.naviapp.receiver - -import android.Manifest -import android.content.Context -import android.content.IntentFilter -import android.net.wifi.WifiManager -import android.os.Bundle -import com.navi.base.sharedpref.PreferenceManager -import com.navi.common.managers.PermissionsManager -import com.navi.common.model.WifiDetails -import com.navi.common.ui.activity.BaseActivity -import com.navi.common.utils.registerReceiverWithVersionCheck -import com.naviapp.utils.Constants.WIFI_DETAILS - -abstract class WifiTrackerBaseActivity : BaseActivity() { - private var wifiManager: WifiManager? = null - private val permissionsManager by lazy { PermissionsManager(this) } - var receiverWifi: WifiReceiver? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wifiManager = applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager - } - - override fun onStart() { - super.onStart() - wifiManager?.let { - receiverWifi = WifiReceiver(it) - receiverWifi?.setListener(listener) - val intentFilter = IntentFilter() - intentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION) - registerReceiverWithVersionCheck(this, receiverWifi, intentFilter, true) - getWifi() - } - } - - private val listener = - object : WifiListener { - override fun onWifiReceive(wifi: List) { - PreferenceManager.setObjectPreference( - WIFI_DETAILS, - WifiDetails(System.currentTimeMillis(), wifi) - ) - } - } - - private fun getWifi() { - if ( - permissionsManager.hasPermissions(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)) || - permissionsManager.hasPermissions( - arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION) - ) - ) { - wifiManager?.startScan() - } - } - - override fun onStop() { - super.onStop() - unregisterReceiver(receiverWifi) - } -} diff --git a/android/app/src/main/java/com/naviapp/utils/Constants.kt b/android/app/src/main/java/com/naviapp/utils/Constants.kt index 919e27c73d..6c313f2719 100644 --- a/android/app/src/main/java/com/naviapp/utils/Constants.kt +++ b/android/app/src/main/java/com/naviapp/utils/Constants.kt @@ -71,7 +71,6 @@ object Constants { const val MILLISECONDS_PER_MINUTE = (60 * 1000).toLong() const val APP_NAME_PROD = "Navi" const val APP_NAME_DEBUG = "NaviDebug" - const val WIFI_DETAILS = "wifi_details" const val PRODUCTION = "production" const val SANDBOX = "sandbox" const val ZERO = "0" diff --git a/android/navi-common/src/main/java/com/navi/common/model/DeviceDetail.kt b/android/navi-common/src/main/java/com/navi/common/model/DeviceDetail.kt index 26d7bf320d..a0740da72d 100644 --- a/android/navi-common/src/main/java/com/navi/common/model/DeviceDetail.kt +++ b/android/navi-common/src/main/java/com/navi/common/model/DeviceDetail.kt @@ -37,7 +37,6 @@ data class DeviceDetail( @SerializedName("allowMockLocations") private val allowMockLocations: Boolean? = null, @SerializedName("clonedDetails") private val clonedDetails: ClonedDetails? = null, @SerializedName("appInstanceId") private val appInstanceId: String? = null, - @SerializedName("wifiDetails") private val wifiDetails: WifiDetails? = null, @SerializedName("hardwareDetail") private val hardwareDetail: HardwareDetail? = null, @SerializedName("appVersionCode") private val appVersionCode: Int? = null, @SerializedName("appVersion") private val appVersion: String? = null, @@ -48,11 +47,6 @@ data class DeviceDetail( @SerializedName("ipAddress") private val ipAddress: String? ) -data class WifiDetails( - @SerializedName("lastUpdatedTs") val lastUpdatedTs: Long? = null, - @SerializedName("wifiList") val wifiList: List? = null -) - data class HardwareDetail( @SerializedName("totalRamMemory") private val totalRamMemory: String? = null, @SerializedName("availableRamMemory") private val availableRamMemory: String? = null, diff --git a/android/navi-common/src/main/java/com/navi/common/utils/Constants.kt b/android/navi-common/src/main/java/com/navi/common/utils/Constants.kt index 3ccc4a113f..431bf48f49 100644 --- a/android/navi-common/src/main/java/com/navi/common/utils/Constants.kt +++ b/android/navi-common/src/main/java/com/navi/common/utils/Constants.kt @@ -92,7 +92,6 @@ object Constants { const val FCM_TOKEN = "FCM_TOKEN" const val FCM_TOKEN_STORED = "fcm_token_stored" const val HL_FCM_TOKEN_LAST_UPDATED_TIME = "FCM_TOKEN_LAST_UPDATED_TIME" - const val WIFI_DETAILS = "wifi_details" const val GOOGLE_ADVERTISING_ID = "GOOGLE_ADVERTISING_ID" const val PACKAGE_NAME = "com.naviapp" const val DEFAULT_USER_AGENT = "Mozilla/5.0 (Android; Tablet; rv:20.0) Gecko/20.0 Firefox/20.0" diff --git a/android/navi-common/src/main/java/com/navi/common/utils/Utility.kt b/android/navi-common/src/main/java/com/navi/common/utils/Utility.kt index 4fc5e0ce40..d58f8877d2 100644 --- a/android/navi-common/src/main/java/com/navi/common/utils/Utility.kt +++ b/android/navi-common/src/main/java/com/navi/common/utils/Utility.kt @@ -48,7 +48,6 @@ import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.FC_DISABLE import com.navi.common.model.DeviceDetail import com.navi.common.model.NaviProviderConfig -import com.navi.common.model.WifiDetails import com.navi.common.network.ApiConstants import com.navi.common.uitron.deserializer.CommonUiTronDataDeserializer import com.navi.common.uitron.deserializer.CommonUiTronPropertyDeserializer @@ -306,11 +305,6 @@ fun getDeviceDetails(verticalScanRate: String?): DeviceDetail { clonedDetails = CommonFraudUtil.getCloneDetails(context), appInstanceId = PreferenceManager.getStringPreference(CommonPrefConstants.FIREBASE_APP_INSTANCE), - wifiDetails = - PreferenceManager.getObjectPrefrences( - Constants.WIFI_DETAILS, - WifiDetails::class.java - ), hardwareDetail = getHardwareDetails(context, verticalScanRate), isInstalledOnProfiles = isInstalledInProfile(context), localStorageLocation = getLocalStorageLocation(context),