From 31cd093772e34ab1d883ebb3ae89cd4b60e66cef Mon Sep 17 00:00:00 2001
From: Aditya_WDI <adityagaikwad@wdimails.com>
Date: Mon, 4 Sep 2023 21:25:44 +0530
Subject: [PATCH] .

---
 .idea/deploymentTargetDropDown.xml                | 12 ++++++------
 .../activities/CaregiverDashActivity.java         | 15 ++++++++++-----
 .../fragments/CgDashBoardFragment.java            |  2 ++
 .../fragments/register/SplashFragment.java        |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index c3352ea..4eaa23e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
+    <runningDeviceTargetSelectedWithDropDown>
       <Target>
-        <type value="QUICK_BOOT_TARGET" />
+        <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\adity\.android\avd\Samsung_Z3_flip_API_34.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="RZCW41EJRPN" />
           </Key>
         </deviceKey>
       </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-08-31T15:38:52.039533500Z" />
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-09-04T15:44:47.230401400Z" />
     <runningDeviceTargetsSelectedWithDialog>
       <Target>
         <type value="RUNNING_DEVICE_TARGET" />
diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
index ec70fd6..96154f7 100644
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
@@ -3,7 +3,6 @@ package com.ssb.simplitend.caregiverdashboard.activities;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -51,6 +50,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
 
         clickEvents();
 
+        CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
+            this.careGiverData = careGiverData;
+
+            watchSubscription();
+        }, true);
+
     }
 
     @Override
@@ -59,7 +64,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
         CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
             this.careGiverData = careGiverData;
 
-            watchSubscription();
             setLayoutDetails();
         }, true);
     }
@@ -98,9 +102,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                 .inject();
 
         binding.bottomNav.setItemSelectListener(this);
-
-        // initializing dashboard fragment
-        replaceFragment(new CgDashBoardFragment(), "dashboard");
         
     }
 
@@ -156,8 +157,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                 intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 startActivity(intent);
                 finish();
+                return;
             }
         }
+
+        // initializing dashboard fragment
+        replaceFragment(new CgDashBoardFragment(), "dashboard");
     }
 
     private void setLayoutDetails() {
diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
index 8f871e0..aab449f 100644
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
@@ -7,6 +7,7 @@ import static com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity.GEOFENCE_DET
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -86,6 +87,7 @@ public class CgDashBoardFragment extends Fragment implements
     @Override
     public void onResume() {
         super.onResume();
+        Log.d("aditya", "onResume: ");
         CaregiverDataCache.getCaregiverData(requireActivity(), (careGiverData1 -> {
             this.careGiverData = careGiverData1;
 
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
index b499928..a92c335 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
@@ -222,7 +222,7 @@ public class SplashFragment extends Fragment
         binding.retry.setVisibility(View.GONE);
         binding.loadAnim.setVisibility(View.GONE);
 
-        if (patientData.isCareGiverConnectedWithPatient == 1){
+        if (patientData.isCareGiverConnectedWithPatient == 1 && patientData.isCaregiverTakeSubscription == 1){
             // go to dashboard
             gotoPatientDashBoard();
         }else if (patientData.isCareGiverLink == 1){