Fixing location bugs and null pointer exception for tablet

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java

@@ -329,7 +329,9 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
             row.removeAllViews();
         }
 
-        menuTitle.setText(getResources().getStringArray(R.array.tr_preset_types)[mode]);
+        if (menuTitle != null) {
+            menuTitle.setText(getResources().getStringArray(R.array.tr_preset_types)[mode]);
+        }
         int[] presetValues = getPresetValues(mode);
         TypedArray keys = getResources().obtainTypedArray(R.array.tr_default_set_key);
         JSONObject parameters = defaultValuesToJSON(keys, presetValues);
@@ -341,8 +343,8 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
                 if(row.getParent() == null)
                     taskControls.addView(row);
                 else {
-//                    View separator = getLayoutInflater().inflate(R.layout.tea_separator, row);
+                    //                    View separator = getLayoutInflater().inflate(R.layout.tea_separator, row);
-//                    separator.setLayoutParams(new LayoutParams(1, LayoutParams.FILL_PARENT));
+                    //                    separator.setLayoutParams(new LayoutParams(1, LayoutParams.FILL_PARENT));
 
                 }
                 LinearLayout displayRow = (LinearLayout)((TaskEditControlSet)set).getDisplayView();
@@ -467,9 +469,11 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
         String[] keys = getResources().getStringArray(R.array.tr_default_set_key);
 
 
-        String descriptionKey = getString(R.string.tr_set_key_description);
+        if (menuTitle != null) {
-        String category = String.format("Category: %s\n", menuTitle.getText().toString());  //$NON-NLS-1$
+            String descriptionKey = getString(R.string.tr_set_key_description);
-        parameters.put(descriptionKey, category);
+            String category = String.format("Category: %s\n", menuTitle.getText().toString());  //$NON-NLS-1$
+            parameters.put(descriptionKey, category);
+        }
         for (int i = 0; i < controls.size(); i++) {
             if (presetValues[i] == -1) continue;
             TaskRabbitSetListener set = controls.get(i);
@@ -530,8 +534,8 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
 
 
             if(progressDialog == null)
-            progressDialog = DialogUtilities.progressDialog(this,
+                progressDialog = DialogUtilities.progressDialog(this,
-                    getString(R.string.DLG_please_wait));
+                        getString(R.string.DLG_please_wait));
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -590,11 +594,11 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
             switch (msg.what) {
             case -1:
 
-                    AlertDialog.Builder adb = new AlertDialog.Builder(TaskRabbitActivity.this);
+                AlertDialog.Builder adb = new AlertDialog.Builder(TaskRabbitActivity.this);
-                    adb.setTitle(getString(R.string.tr_alert_title_fail));
+                adb.setTitle(getString(R.string.tr_alert_title_fail));
-                    adb.setMessage(getString(R.string.tr_alert_message_fail));
+                adb.setMessage(getString(R.string.tr_alert_message_fail));
-                    adb.setPositiveButton(getString(R.string.tr_alert_button_fail),null);
+                adb.setPositiveButton(getString(R.string.tr_alert_button_fail),null);
-                    adb.show();
+                adb.show();
                 break;
             case 0: break;
             case 1:
@@ -630,11 +634,13 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
                 !locationManager.isProviderEnabled( LocationManager.NETWORK_PROVIDER )) {
             buildAlertMessageNoGps();
         }
+        else {
 
         currentLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
 
         locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
         updateControlSetLocation(currentLocation);
+        }
     }
 
 

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitLocationManager.java

@@ -0,0 +1,103 @@
+package com.todoroo.astrid.taskrabbit;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+
+public class TaskRabbitLocationManager {
+    Timer timer1;
+    LocationManager lm;
+    LocationResult locationResult;
+    boolean gps_enabled=false;
+    boolean network_enabled=false;
+
+    public boolean getLocation(Context context, LocationResult result)
+    {
+        //I use LocationResult callback class to pass location value from MyLocation to user code.
+        locationResult=result;
+        if(lm==null)
+            lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+
+        //exceptions will be thrown if provider is not permitted.
+        try{gps_enabled=lm.isProviderEnabled(LocationManager.GPS_PROVIDER);}catch(Exception ex){}
+        try{network_enabled=lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER);}catch(Exception ex){}
+
+        //don't start listeners if no provider is enabled
+        if(!gps_enabled && !network_enabled)
+            return false;
+
+        if(gps_enabled)
+            lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListenerGps);
+        if(network_enabled)
+            lm.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListenerNetwork);
+        timer1=new Timer();
+        timer1.schedule(new GetLastLocation(), 20000);
+        return true;
+    }
+
+    LocationListener locationListenerGps = new LocationListener() {
+        public void onLocationChanged(Location location) {
+            timer1.cancel();
+            locationResult.gotLocation(location);
+            lm.removeUpdates(this);
+            lm.removeUpdates(locationListenerNetwork);
+        }
+        public void onProviderDisabled(String provider) {}
+        public void onProviderEnabled(String provider) {}
+        public void onStatusChanged(String provider, int status, Bundle extras) {}
+    };
+
+    LocationListener locationListenerNetwork = new LocationListener() {
+        public void onLocationChanged(Location location) {
+            timer1.cancel();
+            locationResult.gotLocation(location);
+            lm.removeUpdates(this);
+            lm.removeUpdates(locationListenerGps);
+        }
+        public void onProviderDisabled(String provider) {}
+        public void onProviderEnabled(String provider) {}
+        public void onStatusChanged(String provider, int status, Bundle extras) {}
+    };
+
+    class GetLastLocation extends TimerTask {
+        @Override
+        public void run() {
+             lm.removeUpdates(locationListenerGps);
+             lm.removeUpdates(locationListenerNetwork);
+
+             Location net_loc=null, gps_loc=null;
+             if(gps_enabled)
+                 gps_loc=lm.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+             if(network_enabled)
+                 net_loc=lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+
+             //if there are both values use the latest one
+             if(gps_loc!=null && net_loc!=null){
+                 if(gps_loc.getTime()>net_loc.getTime())
+                     locationResult.gotLocation(gps_loc);
+                 else
+                     locationResult.gotLocation(net_loc);
+                 return;
+             }
+
+             if(gps_loc!=null){
+                 locationResult.gotLocation(gps_loc);
+                 return;
+             }
+             if(net_loc!=null){
+                 locationResult.gotLocation(net_loc);
+                 return;
+             }
+             locationResult.gotLocation(null);
+        }
+    }
+
+    public static abstract class LocationResult{
+        public abstract void gotLocation(Location location);
+    }
+}