cleaning up code

Author: Paul Ruiz

GeoFencing/geofencing/src/main/java/com/ptrprograms/geofencing/Activity/MainActivity.java

@@ -2,13 +2,9 @@
 
 import android.app.Activity;
 import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
 import android.widget.CompoundButton;
 import android.widget.ToggleButton;
 
@@ -23,21 +19,19 @@
 
 import java.util.ArrayList;
 
-
 public class MainActivity extends Activity implements GooglePlayServicesClient.ConnectionCallbacks,
 		GooglePlayServicesClient.OnConnectionFailedListener,
 		LocationClient.OnAddGeofencesResultListener,
 		LocationClient.OnRemoveGeofencesResultListener {
 
-	private static String FENCE_ID = "com.ptrprograms.geofence";
+	private final static String FENCE_ID = "com.ptrprograms.geofence";
+	private final int RADIUS = 100;
 
 	private ToggleButton mToggleButton;
 	private Geofence mGeofence;
 	private LocationClient mLocationClient;
 	private Intent mIntent;
 	private PendingIntent mPendingIntent;
-	private GeofenceSampleReceiver mBroadcastReceiver;
-	IntentFilter mIntentFilter = new IntentFilter();
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -50,12 +44,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		mIntent = new Intent( this, GeofencingService.class );
 		mPendingIntent = PendingIntent.getService( this, 0, mIntent, PendingIntent.FLAG_UPDATE_CURRENT );
 
-		mBroadcastReceiver = new GeofenceSampleReceiver();
-
 		mToggleButton = (ToggleButton) findViewById( R.id.geofencing_button );
 		mToggleButton.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
 			@Override
-			public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+			public void onCheckedChanged( CompoundButton compoundButton, boolean b ) {
 				if( b ) {
 					startGeofence();
 				} else {
@@ -81,18 +73,12 @@ private void verifyPlayServices() {
 
 	private void startGeofence() {
 		Location location = mLocationClient.getLastLocation();
-		int radius = 100;
 
 		Geofence.Builder builder = new Geofence.Builder();
-		mGeofence = builder
-				.setRequestId(FENCE_ID)
-				.setCircularRegion(
-						location.getLatitude(),
-						location.getLongitude(),
-						radius)
-				.setTransitionTypes(Geofence.GEOFENCE_TRANSITION_ENTER
-						| Geofence.GEOFENCE_TRANSITION_EXIT)
-				.setExpirationDuration(Geofence.NEVER_EXPIRE)
+		mGeofence = builder.setRequestId( FENCE_ID )
+				.setCircularRegion( location.getLatitude(), location.getLongitude(), RADIUS )
+				.setTransitionTypes( Geofence.GEOFENCE_TRANSITION_ENTER | Geofence.GEOFENCE_TRANSITION_EXIT )
+				.setExpirationDuration( Geofence.NEVER_EXPIRE )
 				.build();
 
 		ArrayList<Geofence> geofences = new ArrayList<Geofence>();
@@ -110,7 +96,6 @@ protected void onResume() {
 		if ( !mLocationClient.isConnected() && !mLocationClient.isConnecting() ) {
 			mLocationClient.connect();
 		}
-		LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, mIntentFilter);
 	}
 
 	@Override
@@ -119,13 +104,6 @@ protected void onPause() {
 		mLocationClient.disconnect();
 	}
 
-	public class GeofenceSampleReceiver extends BroadcastReceiver {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			startService( mIntent );
-		}
-	}
-
 	@Override
 	public void onConnected(Bundle bundle) {
 
@@ -140,7 +118,6 @@ public void onDisconnected() {
 	public void onAddGeofencesResult(int status, String[] geofenceIds ) {
 		if( status == LocationStatusCodes.SUCCESS ) {
 			Intent intent = new Intent( mIntent );
-			intent.setAction(GeofencingService.ACTION_INIT);
 			startService( intent );
 		}
 	}
@@ -153,9 +130,8 @@ public void onConnectionFailed(ConnectionResult connectionResult) {
 	@Override
 	public void onRemoveGeofencesByRequestIdsResult(int status, String[] strings) {
 		if( status == LocationStatusCodes.SUCCESS ) {
+			stopService( mIntent );
 		}
-
-		stopService( mIntent );
 	}
 
 	@Override
@@ -164,4 +140,5 @@ public void onRemoveGeofencesByPendingIntentResult(int status, PendingIntent pen
 			stopService( mIntent );
 		}
 	}
+
 }

GeoFencing/geofencing/src/main/java/com/ptrprograms/geofencing/Service/GeofencingService.java

@@ -16,8 +16,6 @@
  */
 public class GeofencingService extends IntentService {
 
-	public static String ACTION_INIT = "com.ptrprograms.geofencing.init";
-
 	private NotificationManager mNotificationManager;
 
 	public GeofencingService(String name) {
@@ -29,15 +27,15 @@ public GeofencingService() {
 	}
 
 	@Override
-	public IBinder onBind(Intent intent) {
+	public IBinder onBind( Intent intent ) {
 		return null;
 	}
 
 	@Override
-	protected void onHandleIntent(Intent intent) {
+	protected void onHandleIntent( Intent intent ) {
 		NotificationCompat.Builder builder = new NotificationCompat.Builder( this );
 		builder.setSmallIcon( R.drawable.ic_launcher );
-		builder.setDefaults(Notification.DEFAULT_ALL );
+		builder.setDefaults( Notification.DEFAULT_ALL );
 		builder.setOngoing( true );
 
 		int transitionType = LocationClient.getGeofenceTransition( intent );