Merge pull request #2628 from medici/master

Master

app/build.gradle

@@ -22,7 +22,7 @@ kapt {
     correctErrorTypes true
 }
 
-def VERSION_NAME = "2.4.2"
+def VERSION_NAME = "2.4.3"
 
 android {
     compileSdkVersion 30
@@ -44,7 +44,7 @@ android {
         applicationId "com.naviapp"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 217
+        versionCode 218
         versionName VERSION_NAME
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/naviapp/utils/ContactsUtil.kt

@@ -32,7 +32,9 @@ object ContactsUtil {
                 val contacts = mutableListOf<UserContact>()
                 analyticsTrackerContactUpload.contactReadStartTime(pageNumber)
                 do {
+                    analyticsTrackerContactUpload.contactReadStartTime(pageNumber)
                     readContact(contacts)
+                    analyticsTrackerContactUpload.contactReadEndTime(pageNumber)
                     if (contacts.size == Constants.USER_DATA_PAYLOAD_SIZE) {
                         analyticsTrackerContactUpload.contactReadEndTime(pageNumber)
                         postContactsAndClearList(contacts, getTotalPages(), pageNumber)

app/src/main/java/com/naviapp/utils/Ext.kt

@@ -334,10 +334,16 @@ fun TextView.underlinePartOfText(
                 content.setSpan(
                     object : ClickableSpan() {
                         override fun onClick(widget: View) {
-                            val intent = Intent(Intent.ACTION_VIEW).apply {
-                                data = Uri.parse("mailto:$boldText")
+                            try {
+                                val selectorIntent = Intent(Intent.ACTION_SENDTO)
+                                selectorIntent.data = Uri.parse("mailto:")
+                                val intent = Intent(Intent.ACTION_SEND)
+                                intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(boldText))
+                                intent.selector = selectorIntent
+                                context.startActivity(Intent.createChooser(intent, "Send E-mail"))
+                            }catch (e: Exception) {
+                                e.log()
                             }
-                            context.startActivity(intent)
                         }
                     },
                     startIndex,

app/src/main/java/com/naviapp/utils/SmsUtil.kt

@@ -30,7 +30,9 @@ object SmsUtil {
                 val smsList = mutableListOf<UserSms>()
                 analyticsTrackerSmsUpload.smsReadStartTime(pageNumber)
                 do {
+                    analyticsTrackerSmsUpload.smsReadStartTime(pageNumber)
                     readSms(smsList)
+                    analyticsTrackerSmsUpload.smsReadEndTime(pageNumber)
                     if (smsList.size == Constants.USER_DATA_PAYLOAD_SIZE) {
                         analyticsTrackerSmsUpload.smsReadEndTime(pageNumber)
                         postSmsAndClearList(smsList, getTotalPages(), pageNumber)

navi-analytics/src/main/java/com/navi/analytics/moengage/MoengageUtil.kt

@@ -40,7 +40,6 @@ object MoengageUtil {
                 .configureFcm(FcmConfig(isRegistrationEnabled = true))
                 .configureInApps(InAppConfig(true, inAppOptOutScreens))
                 .configureMiPush(MiPushConfig(moengageData.xiaomiPushAppId, moengageData.xiaomiPushAppKey, true))
-                .optOutTokenRegistration()
                 .build()
             MoEngage.initialise(moEngage)
         } catch (e: Exception) {

navi-insurance/src/main/java/com/navi/insurance/claim/IconUtil.kt

@@ -13,7 +13,7 @@ object IconUtil {
             "CALL_ICON_BLUE" -> R.drawable.call_icon
             "CIRCULAR_FILLED_CALL_ICON" -> R.drawable.ic_call_blue
             "GRADIENT_TICK" -> R.drawable.ic_gradient_tick
-            "COLLAPSED_ICON" -> R.drawable.ic_add_blue
+            "COLLAPSED_ICON" -> R.drawable.ic_plus_blue
             "EXPANDED_ICON" -> R.drawable.ic_expanded
             "SEARCH_ICON" -> R.drawable.search
             "HOSPITAL_ICON" -> R.drawable.ic_hospital_1

navi-insurance/src/main/java/com/navi/insurance/health/viewmodel/QuoteVM.kt

@@ -142,6 +142,9 @@ class QuoteVM @Inject constructor(private val repository: QuoteRepository) :
             if (it.widgetId == "ratingsWidget" && it.widgetNameForBaseAdapter == WidgetTypes.RATINGS_AND_REVIEW_WIDGET.value && !shouldShowQuoteTestimonials) {
                 shouldKeep = false
             }
+            if (it.widgetId == "customerFirstTitleWidget" && it.widgetNameForBaseAdapter == WidgetTypes.TITLE_WIDGET.value && !shouldShowQuoteTestimonials) {
+                shouldKeep = false
+            }
             shouldKeep
         }
         return serverResponse