From 264cbb90a330351c69cc3907dd240a9d600d3dcd Mon Sep 17 00:00:00 2001
From: yashmantri <mantri.ramkishor@navi.com>
Date: Fri, 9 Aug 2024 23:17:48 +0530
Subject: [PATCH] TP-75788 | Alfred Version Bump

---
 android/app/build.gradle                                 | 6 ++++--
 android/app/src/main/AndroidManifest.xml                 | 1 +
 android/app/src/main/java/com/avapp/MainActivity.java    | 9 ++++-----
 android/app/src/main/java/com/avapp/MainApplication.java | 7 ++++---
 android/build.gradle                                     | 2 +-
 src/screens/allCases/CasesList.tsx                       | 2 ++
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1916e2be..63d631e1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
 
     defaultConfig {
         applicationId "com.avapp"
-        minSdkVersion rootProject.ext.minSdkVersion
+        minSdkVersion 23
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSION_CODE
         versionName VERSION_NAME
@@ -317,7 +317,9 @@ dependencies {
     implementation "com.github.anrwatchdog:anrwatchdog:1.4.0"
     implementation 'com.google.android.gms:play-services-location:21.3.0'
 
-    implementation 'com.navi.android:alfred:1.1.1'
+    implementation 'com.navi.android:alfred:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation(platform("com.google.firebase:firebase-bom:32.2.3"))
     implementation("com.google.firebase:firebase-config-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6d0d0dee..2a753da0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -48,6 +48,7 @@
       android:allowBackup="false"
       android:largeHeap="true"
       android:requestLegacyExternalStorage="true"
+      android:extractNativeLibs="true"
       android:theme="@style/AppTheme">
   <meta-data
     android:name="com.supersami.foregroundservice.notification_channel_name"
diff --git a/android/app/src/main/java/com/avapp/MainActivity.java b/android/app/src/main/java/com/avapp/MainActivity.java
index 1ca94f05..03e6435d 100644
--- a/android/app/src/main/java/com/avapp/MainActivity.java
+++ b/android/app/src/main/java/com/avapp/MainActivity.java
@@ -121,12 +121,11 @@ public class MainActivity extends ReactActivity implements AlfredFirebaseHelper
     public void startAlfredRecording() {
         if (AlfredManager.INSTANCE.isAlfredRecordingEnabled() && !hasAlfredRecordingStarted) {
             try {
-                AlfredManager.INSTANCE.startRecording(
+                AlfredManager.INSTANCE.onActivityResumed(
+                        BuildConfig.APP_NAME,
+                        BuildConfig.APP_NAME,
                         this,
-                        this.getWindow().getDecorView().getRootView(),
-                        BuildConfig.APP_NAME,
-                        BuildConfig.APP_NAME,
-                        this
+                        this.getApplicationContext()
                 );
                 hasAlfredRecordingStarted = true;
             } catch (Exception e) {
diff --git a/android/app/src/main/java/com/avapp/MainApplication.java b/android/app/src/main/java/com/avapp/MainApplication.java
index c9ee03ee..2d6974e6 100644
--- a/android/app/src/main/java/com/avapp/MainApplication.java
+++ b/android/app/src/main/java/com/avapp/MainApplication.java
@@ -93,7 +93,8 @@ public class MainApplication extends Application implements ReactApplication {
 
         AlfredConfig alfredConfig = new AlfredConfig(BuildConfig.APP_NAME, String.valueOf(BuildConfig.VERSION_CODE),
                 BuildConfig.VERSION_NAME, BuildConfig.BUILD_FLAVOR, BuildConfig.API_KEY);
-        AlfredManager.INSTANCE.init(alfredConfig, this);
+        alfredConfig.enablePixelCopy(false);
+        AlfredManager.INSTANCE.init(alfredConfig, this, 27, "Critical Journey is active");
         setupAlfredANRWatchDog(alfredConfig);
         setupAlfredCrashReporting(alfredConfig);
 
@@ -153,7 +154,7 @@ public class MainApplication extends Application implements ReactApplication {
             anrEventProperties.put(APP_IN_FOREGROUND, MainActivity.isAppInForeground().toString());
 
             if (isAlfredEnabledFromFirebase && AlfredManager.INSTANCE.isAlfredRecordingEnabled()
-                    && alfredConfig.getAnrEnableStatus()) {
+                    && alfredConfig.getAnrEnableStatus() && MainActivity.isAppInForeground()) {
                 anrEventProperties.put(STACK_TRACE, error.getCause().getStackTrace()[0].toString());
                 AlfredManager.INSTANCE.handleAnrEvent(anrEventProperties);
             }
@@ -177,7 +178,7 @@ public class MainApplication extends Application implements ReactApplication {
                 crashEventProperties.put(APP_IN_FOREGROUND, MainActivity.isAppInForeground().toString());
 
                 if (isAlfredEnabledFromFirebase && AlfredManager.INSTANCE.isAlfredRecordingEnabled()
-                        && alfredConfig.getCrashEnableStatus()) {
+                        && alfredConfig.getCrashEnableStatus() && MainActivity.isAppInForeground()) {
                     StackTraceElement stackTraceElement = exception.getStackTrace()[0];
                     if (stackTraceElement != null) {
                         crashEventProperties.put(STACK_TRACE, stackTraceElement.toString());
diff --git a/android/build.gradle b/android/build.gradle
index 002ed0c5..a18d8f3f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext {
         kotlinVersion = '1.6.21'
         buildToolsVersion = "31.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 23
         compileSdkVersion = 33
         targetSdkVersion = 33
         googlePlayServicesAuthVersion = "19.2.0"
diff --git a/src/screens/allCases/CasesList.tsx b/src/screens/allCases/CasesList.tsx
index 01d82535..21f8504c 100644
--- a/src/screens/allCases/CasesList.tsx
+++ b/src/screens/allCases/CasesList.tsx
@@ -66,6 +66,7 @@ import GoogleFormModal from './GoogleFormModal';
 import { setAllCasesViewSearchQuery, setVisitPlanSearchQuery } from '@reducers/allCasesSlice';
 import { setDashboardSearchQuery } from '@reducers/agentPerformanceSlice';
 import { setSortTabSelected } from '@reducers/nearbyCasesSlice';
+import { clearBottomSheet } from '@components/utlis/DeviceUtils';
 
 export const getItem = (item: ICaseItem[], index: number) => item[index];
 export const ESTIMATED_ITEM_SIZE = 250; // Average height of List item
@@ -463,6 +464,7 @@ const CasesList: React.FC<ICasesList> = ({
           closeFilterModal={() => {
             setShowFilterModal((prev) => !prev);
             firePageLoadEvent();
+            clearBottomSheet();
           }}
           isVisitPlan={isVisitPlan}
           isAgentDashboard={isAgentDashboard}