NTP-13954 | Remove Redundant WifiReceiver (#13703)
This commit is contained in:
@@ -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) }
|
||||
|
||||
@@ -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) }
|
||||
|
||||
@@ -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) }
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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<String>)
|
||||
}
|
||||
@@ -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<String>()
|
||||
val wifiList = wifiManager.scanResults
|
||||
for (scanResult in wifiList) {
|
||||
list.add(scanResult.SSID?.replace("\"", "").orEmpty())
|
||||
}
|
||||
wifiListener?.onWifiReceive(list)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun setListener(listener: WifiListener) {
|
||||
wifiListener = listener
|
||||
}
|
||||
}
|
||||
@@ -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<String>) {
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user