diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0486cfe..14d193b 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -6,13 +6,13 @@
-
-
+
+
-
+
diff --git a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java
index 0a8732a..1356cbb 100644
--- a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java
+++ b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java
@@ -169,7 +169,7 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
SocketHelper.getInstance().removeLocationUpdateListener(careGiverData.patientId + "");
}
- SocketHelper.getInstance().closeConnection();
+// SocketHelper.getInstance().closeConnection();
}
private void establishSocketConnection() {
diff --git a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
index ae0149b..e753d0c 100644
--- a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
+++ b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
@@ -29,6 +29,8 @@ public class LocationService extends Service implements LocationClient.DefaultLo
public static final int LOCATION_INTERVAL_BASE_TIME = 25 * 1000;
+ private static final int LOCATION_UPDATES_NOTIFICATION_ID = 112;
+
private DefaultLocationClient locationClient;
@Override
@@ -83,8 +85,8 @@ public class LocationService extends Service implements LocationClient.DefaultLo
// do nothing
}
- startForeground(1, notification);
- notificationManager.notify(1, notification);
+ startForeground(LOCATION_UPDATES_NOTIFICATION_ID, notification);
+ notificationManager.notify(LOCATION_UPDATES_NOTIFICATION_ID, notification);
}
@Override
diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java
index 9480966..3221cc2 100644
--- a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java
+++ b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java
@@ -114,12 +114,6 @@ public class DashBoardActivity extends AppCompatActivity implements CgHomeContra
super.attachBaseContext(newBase);
}
- @Override
- protected void onDestroy() {
- super.onDestroy();
- SocketHelper.getInstance().closeConnection();
- }
-
private void setGeofenceAndLocationUpdates() {
// retrieving geofence
viewModel.getGeoFenceDetails(AppUtil.getPatientUid(this) + "",