Changed id to String

radshag · Feb 18, 2013 · a62c11a · a62c11a
1 parent c087d24
commit a62c11a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 94 deletions.
diff --git a/android/Sample/GeofencingAndroidSample/assets/www/index.html~ b/android/Sample/GeofencingAndroidSample/assets/www/index.html~
diff --git a/android/Sample/GeofencingAndroidSample/bin/Geofencing.apk b/android/Sample/GeofencingAndroidSample/bin/Geofencing.apk
diff --git a/android/Sample/GeofencingAndroidSample/bin/classes.dex b/android/Sample/GeofencingAndroidSample/bin/classes.dex
diff --git a/...le/GeofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencing$3.class b/...le/GeofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencing$3.class
diff --git a/...mple/GeofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencing.class b/...mple/GeofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencing.class
diff --git a/...ofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencingService.class b/...ofencingAndroidSample/bin/classes/org/apache/cordova/plugin/geo/DGGeofencingService.class
diff --git a/android/Sample/GeofencingAndroidSample/bin/resources.ap_ b/android/Sample/GeofencingAndroidSample/bin/resources.ap_
diff --git a/android/Sample/GeofencingAndroidSample/src/org/apache/cordova/plugin/geo/DGGeofencing.java b/android/Sample/GeofencingAndroidSample/src/org/apache/cordova/plugin/geo/DGGeofencing.java
@@ -53,7 +53,7 @@ public boolean execute(String action, JSONArray data, CallbackContext callbackCo
         try {
             if ("addRegion".equals(action)) {
                 JSONObject params = parseParameters(data);
-                int id = params.getInt("fid");
+                String id = params.getString("fid");
                 service.addRegion(id, params.getDouble("latitude"), params.getDouble("longitude"),
                         (float) params.getInt("radius"));
                 registerListener(id);
@@ -67,7 +67,7 @@ public boolean execute(String action, JSONArray data, CallbackContext callbackCo
                 return true;
             }
             if ("getWatchedRegionIds".equals(action)) {
-                Set<Integer> watchedRegionIds = service.getWatchedRegionIds();
+                Set<String> watchedRegionIds = service.getWatchedRegionIds();
                 callbackContext.success(new JSONArray(watchedRegionIds));
             }
 
@@ -126,7 +126,7 @@ private void addLocation(Location location, JSONObject object, String prefix) th
         object.put(prefix + "_longitude", location.getLongitude());
     }
 
-    private void registerListener(int id) {
+    private void registerListener(String id) {
         IntentFilter filter = new IntentFilter(DGGeofencingService.PROXIMITY_ALERT_INTENT + id);
         cordova.getActivity().registerReceiver(new BroadcastReceiver() {
 
@@ -141,12 +141,12 @@ private void fireRegionChangedEvent(Intent intent) {
         Log.d("DGGeofencingService", "received proximity alert");
 
         String status = intent.getBooleanExtra(KEY_PROXIMITY_ENTERING, false) ? "enter" : "left";
-        Integer id = (Integer) intent.getExtras().get("id");
+        String id = intent.getExtras().get("id").toString();
 
         webView.loadUrl("javascript:DGGeofencing.regionMonitorUpdate(" + createRegionEvent(id, status) + ")");
     }
 
-    private String createRegionEvent(Integer id, String status) {
+    private String createRegionEvent(String id, String status) {
         return "{fid:" + id + ",status:\"" + status + "\"}";
     }
 

diff --git a/...Sample/GeofencingAndroidSample/src/org/apache/cordova/plugin/geo/DGGeofencingService.java b/...Sample/GeofencingAndroidSample/src/org/apache/cordova/plugin/geo/DGGeofencingService.java
@@ -26,15 +26,15 @@ public class DGGeofencingService extends Service implements LocationListener {
 
     static final String PROXIMITY_ALERT_INTENT = "geoFencingProximityAlert";
 
-    private Map<Integer, PendingIntent> regionIdIntentMapping = new HashMap<Integer, PendingIntent>();
+    private Map<String, PendingIntent> regionIdIntentMapping = new HashMap<String, PendingIntent>();
     private LocationManager locationManager;
     private Set<LocationChangedListener> listeners = new HashSet<LocationChangedListener>();
 
     public boolean isGpsEnabled() {
         return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
     }
 
-    public void addRegion(int id, double latitude, double longitude, float radius) {
+    public void addRegion(String id, double latitude, double longitude, float radius) {
         Intent intent = new Intent(PROXIMITY_ALERT_INTENT + id);
         intent.putExtra("id", id);
         PendingIntent proximityIntent = PendingIntent.getBroadcast(this, 0, intent, FLAG_ACTIVITY_NEW_TASK);
@@ -93,7 +93,7 @@ public IBinder onBind(Intent intent) {
         return binder;
     }
 
-    public Set<Integer> getWatchedRegionIds() {
+    public Set<String> getWatchedRegionIds() {
         return regionIdIntentMapping.keySet();
     }