Commit 975f77d6 authored by Chris Scott's avatar Chris Scott

oops, messed up in conflict-resolution

parent 64a54878
...@@ -83,14 +83,15 @@ ...@@ -83,14 +83,15 @@
// Params. // Params.
// 0 1 2 3 4 5 6 7 8 8 9 // 0 1 2 3 4 5 6 7 8 8 9
//[params, headers, url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug, notificationTitle, notificationText, activityType] //[params, headers, url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug, notificationTitle, notificationText, activityType]
params = [command.arguments objectAtIndex: 0];
headers = [command.arguments objectAtIndex: 1];
url = [command.arguments objectAtIndex: 2];
// UNUSED ANDROID VARS
//params = [command.arguments objectAtIndex: 0];
//headers = [command.arguments objectAtIndex: 1];
//url = [command.arguments object
stationaryRadius = [[command.arguments objectAtIndex: 3] intValue]; stationaryRadius = [[command.arguments objectAtIndex: 3] intValue];
distanceFilter = [[command.arguments objectAtIndex: 4] intValue]; distanceFilter = [[command.arguments objectAtIndex: 4] intValue];
locationTimeout = [[command.arguments objectAtIndex: 5] intValue]; locationTimeout = [[command.arguments objectAtIndex: 5] intValue];
desiredAccuracy = [self translateDesiredAccuracy:[[command.arguments objectAtIndex: 6] intValue]]; desiredAccuracy = [self decodeDesiredAccuracy:[[command.arguments objectAtIndex: 6] intValue]];
isDebugging = [[command.arguments objectAtIndex: 7] boolValue]; isDebugging = [[command.arguments objectAtIndex: 7] boolValue];
activityType = [self decodeActivityType:[command.arguments objectAtIndex:9]]; activityType = [self decodeActivityType:[command.arguments objectAtIndex:9]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment