From 6f4bd5c3441d3b1eb22e2d16735ac786bc0a10cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Vieira?= <josevieira.dev@gmail.com>
Date: Fri, 16 Jun 2017 09:33:02 -0300
Subject: [PATCH] fix #4 crash GoogleApiClient

---
 .../locationlistenerhelper/core/LocationService.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/location-tracker-background/src/main/java/br/com/safety/locationlistenerhelper/core/LocationService.java b/location-tracker-background/src/main/java/br/com/safety/locationlistenerhelper/core/LocationService.java
index a121041..e341103 100644
--- a/location-tracker-background/src/main/java/br/com/safety/locationlistenerhelper/core/LocationService.java
+++ b/location-tracker-background/src/main/java/br/com/safety/locationlistenerhelper/core/LocationService.java
@@ -98,7 +98,9 @@ protected void createLocationRequest() {
 
     protected void startLocationUpdates() {
         try {
-            LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
+            if (mGoogleApiClient.isConnected()) {
+                LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
+            }
         } catch (SecurityException ex) {
         }
     }
@@ -119,7 +121,9 @@ private void sendLocationBroadcast(Location sbLocationData) {
     }
 
     protected void stopLocationUpdates() {
-        LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+        if (mGoogleApiClient.isConnected()) {
+            LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+        }
     }
 
     @Override