From b0cb873cd47f6526cf7169f90d1a88dbb26d8dec Mon Sep 17 00:00:00 2001 From: Manoj Date: Wed, 11 Jan 2023 11:43:14 +0530 Subject: [PATCH] changed depricated --- .../providerfactory/FDModelProviderFactory.kt | 1 + .../bajajfd/util/EncryptionDecryption.kt | 14 +- .../nivesh/production/bajajfd/util/Utility.kt | 216 +++++++++--------- 3 files changed, 116 insertions(+), 115 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt index 3f68938..bea2600 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/providerfactory/FDModelProviderFactory.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.viewModel.BajajFDViewModel +@Suppress("UNCHECKED_CAST") class FDModelProviderFactory(private val mainRepository: MainRepository) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/EncryptionDecryption.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/EncryptionDecryption.kt index db69d69..66045ac 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/EncryptionDecryption.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/EncryptionDecryption.kt @@ -49,13 +49,13 @@ class EncryptionDecryption { ivParameterSpec = IvParameterSpec(rawSecretKey) } - fun encryptAsBase64(dataToEncrypt: String): String? { - var dataToEncrypt = dataToEncrypt - val dateFormat = SimpleDateFormat("SSS", Locale.US) - dataToEncrypt = dataToEncrypt + dateFormat.format(Date()) - val encryptedData = encrypt(dataToEncrypt.toByteArray()) - return Base64.encodeToString(encryptedData, Base64.DEFAULT) - } +// fun encryptAsBase64(dataToEncrypt: String): String? { +// var dataToEncrypt = dataToEncrypt +// val dateFormat = SimpleDateFormat("SSS", Locale.US) +// dataToEncrypt = dataToEncrypt + dateFormat.format(Date()) +// val encryptedData = encrypt(dataToEncrypt.toByteArray()) +// return Base64.encodeToString(encryptedData, Base64.DEFAULT) +// } // public String decrypt(String textToDecrypt) throws Exception { // diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Utility.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Utility.kt index e8597de..fe4fd44 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Utility.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Utility.kt @@ -57,113 +57,113 @@ class Utility { } } - @SuppressLint("HardwareIds") - fun getDeviceInfo(mContext: Context): DeviceInfo { - val deviceInfo = DeviceInfo() - var device_id: String? = "" - try { - val telephonyManager = - mContext.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager - deviceInfo.app_version = ( - SharedPrefrenceDataMethods.getVersionCode( - Constants.KEY_VERSION_CODE, - mContext - ) - ) - - deviceInfo.device_model = (if (TextUtils.isEmpty(Build.DEVICE)) "" else Build.DEVICE) - deviceInfo.device_os_version = (if (TextUtils.isEmpty(Build.VERSION.RELEASE)) "" else Build.VERSION.RELEASE) - deviceInfo.device_name = (if (TextUtils.isEmpty(Build.PRODUCT)) "" else Build.PRODUCT) - deviceInfo.device_token = ( - if (TextUtils.isEmpty( - SharedPrefrenceDataMethods.getGcmAppId( - Constants.KEY_GCM_APP_ID, - mContext - ) - ) - ) "" else SharedPrefrenceDataMethods.getGcmAppId( - Constants.KEY_GCM_APP_ID, - mContext - ) - ) - deviceInfo.device_type = ("Android") - - // Hemant Code Added start 28-10-2020 - if (ActivityCompat.checkSelfPermission( - mContext, - Manifest.permission.READ_PHONE_STATE - ) != PackageManager.PERMISSION_GRANTED - ) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - device_id = telephonyManager.imei - if (device_id == null) { - device_id = - if (TextUtils.isEmpty(Build.getSerial())) "" else Build.getSerial() - } - } else { - device_id = telephonyManager.deviceId - if (device_id == null) { - device_id = - if (TextUtils.isEmpty(Build.SERIAL)) "" else Build.SERIAL - } - } - } else { - device_id = telephonyManager.deviceId - if (device_id == null) { - device_id = if (TextUtils.isEmpty(Build.SERIAL)) "" else Build.SERIAL - } - } - if (device_id == null || device_id.isEmpty() || device_id.equals( - "unknown", - ignoreCase = true - ) - ) { - device_id = if (TextUtils.isEmpty( - Settings.Secure.getString( - mContext.contentResolver, - Settings.Secure.ANDROID_ID - ) - ) - ) "" else Settings.Secure.getString( - mContext.contentResolver, - Settings.Secure.ANDROID_ID - ) - } - Log.e("device_id", "-> $device_id") - // Hemant changes 07-11-2019 start commented and Added 12-12-2019 -// deviceInfo.device_id = (device_id + "#" + com.nivesh.production.util.Utility.getFlavor()) - // Hemant changes 07-11-2019 end commented and Added 12-12-2019 - - - // Hemant changes 07-11-2019 start added and commented 12-12-2019 - deviceInfo.device_id_for_UMSId = (device_id) - // deviceInfo.setDeviceId(device_id); - // Hemant changes 07-11-2019 end added and commented 12-12-2019 - } catch (e: java.lang.Exception) { - e.printStackTrace() - // Hemant changes 07-11-2019 start Added 28-10-2020 - if (device_id == null || device_id.isEmpty() || device_id.equals( - "unknown", - ignoreCase = true - ) - ) { - device_id = if (TextUtils.isEmpty( - Settings.Secure.getString( - mContext.contentResolver, - Settings.Secure.ANDROID_ID - ) - ) - ) "" else Settings.Secure.getString( - mContext.contentResolver, - Settings.Secure.ANDROID_ID - ) - } - Log.e("device_id", "-> $device_id") -// deviceInfo.setDeviceId(device_id + "#" + com.nivesh.production.util.Utility.getFlavor()) - deviceInfo.device_id_for_UMSId = (device_id) - // Hemant changes 07-11-2019 end Added 28-10-2020 - } - return deviceInfo - } +// @SuppressLint("HardwareIds") +// fun getDeviceInfo(mContext: Context): DeviceInfo { +// val deviceInfo = DeviceInfo() +// var device_id: String? = "" +// try { +// val telephonyManager = +// mContext.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager +// deviceInfo.app_version = ( +// SharedPrefrenceDataMethods.getVersionCode( +// Constants.KEY_VERSION_CODE, +// mContext +// ) +// ) +// +// deviceInfo.device_model = (if (TextUtils.isEmpty(Build.DEVICE)) "" else Build.DEVICE) +// deviceInfo.device_os_version = (if (TextUtils.isEmpty(Build.VERSION.RELEASE)) "" else Build.VERSION.RELEASE) +// deviceInfo.device_name = (if (TextUtils.isEmpty(Build.PRODUCT)) "" else Build.PRODUCT) +// deviceInfo.device_token = ( +// if (TextUtils.isEmpty( +// SharedPrefrenceDataMethods.getGcmAppId( +// Constants.KEY_GCM_APP_ID, +// mContext +// ) +// ) +// ) "" else SharedPrefrenceDataMethods.getGcmAppId( +// Constants.KEY_GCM_APP_ID, +// mContext +// ) +// ) +// deviceInfo.device_type = ("Android") +// +// // Hemant Code Added start 28-10-2020 +// if (ActivityCompat.checkSelfPermission( +// mContext, +// Manifest.permission.READ_PHONE_STATE +// ) != PackageManager.PERMISSION_GRANTED +// ) { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { +// device_id = telephonyManager.imei +// if (device_id == null) { +// device_id = +// if (TextUtils.isEmpty(Build.getSerial())) "" else Build.getSerial() +// } +// } else { +// device_id = telephonyManager.deviceId +// if (device_id == null) { +// device_id = +// if (TextUtils.isEmpty(Build.SERIAL)) "" else Build.SERIAL +// } +// } +// } else { +// device_id = telephonyManager.deviceId +// if (device_id == null) { +// device_id = if (TextUtils.isEmpty(Build.SERIAL)) "" else Build.SERIAL +// } +// } +// if (device_id == null || device_id.isEmpty() || device_id.equals( +// "unknown", +// ignoreCase = true +// ) +// ) { +// device_id = if (TextUtils.isEmpty( +// Settings.Secure.getString( +// mContext.contentResolver, +// Settings.Secure.ANDROID_ID +// ) +// ) +// ) "" else Settings.Secure.getString( +// mContext.contentResolver, +// Settings.Secure.ANDROID_ID +// ) +// } +// Log.e("device_id", "-> $device_id") +// // Hemant changes 07-11-2019 start commented and Added 12-12-2019 +//// deviceInfo.device_id = (device_id + "#" + com.nivesh.production.util.Utility.getFlavor()) +// // Hemant changes 07-11-2019 end commented and Added 12-12-2019 +// +// +// // Hemant changes 07-11-2019 start added and commented 12-12-2019 +// deviceInfo.device_id_for_UMSId = (device_id) +// // deviceInfo.setDeviceId(device_id); +// // Hemant changes 07-11-2019 end added and commented 12-12-2019 +// } catch (e: java.lang.Exception) { +// e.printStackTrace() +// // Hemant changes 07-11-2019 start Added 28-10-2020 +// if (device_id == null || device_id.isEmpty() || device_id.equals( +// "unknown", +// ignoreCase = true +// ) +// ) { +// device_id = if (TextUtils.isEmpty( +// Settings.Secure.getString( +// mContext.contentResolver, +// Settings.Secure.ANDROID_ID +// ) +// ) +// ) "" else Settings.Secure.getString( +// mContext.contentResolver, +// Settings.Secure.ANDROID_ID +// ) +// } +// Log.e("device_id", "-> $device_id") +//// deviceInfo.setDeviceId(device_id + "#" + com.nivesh.production.util.Utility.getFlavor()) +// deviceInfo.device_id_for_UMSId = (device_id) +// // Hemant changes 07-11-2019 end Added 28-10-2020 +// } +// return deviceInfo +// } } } \ No newline at end of file