Skip to content

Make android and IOS interface consistent #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make android and IOS interface consistent #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions android/src/main/java/com/eddieowens/RNBoundaryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
public class RNBoundaryModule extends ReactContextBaseJavaModule implements LifecycleEventListener {

public static final String TAG = "RNBoundary";
public static final String ON_ENTER = "onEnter";
public static final String ON_EXIT = "onExit";
public static final String GEOFENCE_DATA_TO_EMIT = "com.eddieowens.GEOFENCE_DATA_TO_EMIT";

private GeofencingClient mGeofencingClient;
private PendingIntent mBoundaryPendingIntent;
Expand Down
20 changes: 6 additions & 14 deletions android/src/main/java/com/eddieowens/services/BoundaryEventJobIntentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,24 @@ protected void onHandleWork(@NonNull Intent intent) {
}
switch (geofencingEvent.getGeofenceTransition()) {
case Geofence.GEOFENCE_TRANSITION_ENTER:
Log.i(TAG, "Enter geofence event detected. Sending event.");
final ArrayList<String> enteredGeofences = new ArrayList<>();
for (Geofence geofence : geofencingEvent.getTriggeringGeofences()) {
enteredGeofences.add(geofence.getRequestId());
Log.i(TAG, "Enter geofence event detected. Sending event.");
sendEvent(this.getApplicationContext(), ON_ENTER, geofence.getRequestId());
}
sendEvent(this.getApplicationContext(), ON_ENTER, enteredGeofences);
break;
case Geofence.GEOFENCE_TRANSITION_EXIT:
Log.i(TAG, "Exit geofence event detected. Sending event.");
final ArrayList<String> exitingGeofences = new ArrayList<>();
for (Geofence geofence : geofencingEvent.getTriggeringGeofences()) {
exitingGeofences.add(geofence.getRequestId());
Log.i(TAG, "Exit geofence event detected. Sending event.");
sendEvent(this.getApplicationContext(), ON_EXIT, geofence.getRequestId());
}
sendEvent(this.getApplicationContext(), ON_EXIT, exitingGeofences);
break;
}
}

private void sendEvent(Context context, String event, ArrayList<String> params) {
final Intent intent = new Intent(RNBoundaryModule.GEOFENCE_DATA_TO_EMIT);
intent.putExtra("event", event);
intent.putExtra("params", params);

private void sendEvent(Context context, String event, String id) {
Bundle bundle = new Bundle();
bundle.putString("event", event);
bundle.putStringArrayList("ids", intent.getStringArrayListExtra("params"));
bundle.putString("id", id);

Intent headlessBoundaryIntent = new Intent(context, BoundaryEventHeadlessTaskService.class);
headlessBoundaryIntent.putExtras(bundle);
Expand Down
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ export {
Events
}

const HeadlessBoundaryEventTask = async ({event, ids}) => {
console.log(event, ids);
boundaryEventEmitter.emit(event, ids)
const HeadlessBoundaryEventTask = async ({event, id}) => {
console.log(event, id);
boundaryEventEmitter.emit(event, id)
};

AppRegistry.registerHeadlessTask('OnBoundaryEvent', () => HeadlessBoundaryEventTask);
Expand Down