Adds background to main game list. Query nearby games after first loo…

…king up the user's location.

Classes/GameListViewController.h

@@ -8,10 +8,16 @@
 
 #import <UIKit/UIKit.h>
 #import "GameCell.h"
+#import <CoreLocation/CoreLocation.h>
 
-@interface GameListViewController : UIViewController <UITableViewDelegate> {
+@interface GameListViewController : UIViewController <UITableViewDelegate, CLLocationManagerDelegate> {
 	IBOutlet GameCell *gameCell;
 	NSMutableArray *games;
+#ifdef FAKE_CORE_LOCATION
+	FTLocationSimulator *locationManager;
+#else
+	CLLocationManager *locationManager;
+#endif
 }
 
 @property (nonatomic, retain) IBOutlet UIButton *reloadBtn;
@@ -22,6 +28,6 @@
 
 - (IBAction)reloadBtnPressed;
 - (IBAction)logoutBtnPressed;
-- (void)getNearbyLayers;
+- (void)refreshNearbyLayers;
 
 @end

Classes/GameListViewController.m

@@ -21,6 +21,7 @@ - (void)dealloc {
 	[selectedIndex release];
 	[tableView release];
 	[reloadBtn release];
+	[locationManager release];
     [super dealloc];
 }
 
@@ -46,22 +47,43 @@ - (void)loadView {
 - (void)viewDidLoad {
     [super viewDidLoad];
 	games = [[NSMutableArray alloc] init];
-	[self getNearbyLayers];
+	[self refreshNearbyLayers];
 }
 
 - (IBAction)reloadBtnPressed {
-	[self getNearbyLayers];
+	[self refreshNearbyLayers];
 }
 
 - (IBAction)logoutBtnPressed {
 	[[LQClient single] logout];
 }
 
-- (void)getNearbyLayers {
-	[[LQClient single] getNearbyLayers:^(NSError *error, NSDictionary *response){
+- (void)refreshNearbyLayers {
+	if (!locationManager) {
+#ifdef FAKE_CORE_LOCATION
+		locationManager = [[FTLocationSimulator alloc] init];
+#else
+		locationManager = [[CLLocationManager alloc] init];
+#endif
+		locationManager.distanceFilter = 1.0;
+		locationManager.delegate = self;
+	}
+
+	[locationManager startUpdatingLocation];
+
+}
+
+- (void)locationManager:(CLLocationManager *)manager
+	didUpdateToLocation:(CLLocation *)newLocation
+		   fromLocation:(CLLocation *)oldLocation {
+
+	[[LQClient single] getNearbyLayers:newLocation withCallback:^(NSError *error, NSDictionary *response){
 		self.games = [response objectForKey:@"nearby"];
+		NSLog(@"Found games: %@", self.games);
 		[self.tableView reloadData];
 	}];
+
+	[locationManager stopUpdatingLocation];
 }
 
 - (NSString *)urlForGameAtIndex:(NSInteger)index {

Classes/GeoloqiReadClient.m

@@ -17,6 +17,7 @@
 #define TAG_DEVICE_ID_SENT 1
 #define TAG_MESSAGE_RECEIVED 2
 
+#define VERBOSE 0
 
 @implementation GeoloqiReadClient
 
@@ -66,17 +67,29 @@ - (void)reconnect
 // After the client finishes writing the UUID, start listening for new data
 - (void)onSocket:(AsyncSocket *)sock didWriteDataWithTag:(long)tag
 {
-	DLog(@"[Read] Did write data with tag %d", tag);
+	if(VERBOSE)
+		DLog(@"[Read] Did write data with tag %d", tag);
 	[asyncSocket readDataToData:[AsyncSocket CRLFData] withTimeout:-1 tag:TAG_MESSAGE_RECEIVED];
 }
 
 
 - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag
 {
-	DLog(@"[Read] Did read data with tag %d: %@", tag, data);
+	if(VERBOSE)
+		DLog(@"[Read] Did read data with tag %d: %@", tag, data);
+
+	if([data isEqualToData:[@"ok\r\n" dataUsingEncoding:NSUTF8StringEncoding]]) {
+		if(VERBOSE)
+			DLog(@"[Read] Got 'ok' response");
+		[asyncSocket readDataToData:[AsyncSocket CRLFData] withTimeout:-1 tag:TAG_MESSAGE_RECEIVED];
+		return;
+	}
+
 	NSError **err;
 	NSDictionary *dict;
 
+	// DLog(@"[Read] String: %@", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
+
 	dict = [[CJSONDeserializer deserializer] deserialize:data error:err];
 	DLog(@"[Read] Message: %@", dict);
 

Classes/GeoloqiSocketClient.h

@@ -32,8 +32,6 @@
 - (NSData *)dataFromLocation:(CLLocation *)location;
 - (void)startMonitoringLocation;
 - (void)stopMonitoringLocation;
-
-// TODO: Make a delegate protocol.
-// TODO: Send CLLocation to server.
+- (BOOL)locationUpdateState;
 
 @end

Classes/GeoloqiSocketClient.m

@@ -14,6 +14,8 @@
 #define TIMEOUT_SEC 6.0
 #define TAG_DEVICE_ID_SENT 1
 
+#define VERBOSE 0
+
 #if LITTLE_ENDIAN
 
 #pragma pack(push)  /* push current alignment to stack */
@@ -47,7 +49,7 @@ - (id) init
     {
 		// Change to use UDP
         asyncSocket = [[AsyncUdpSocket alloc] initWithDelegate:self];
-        distanceFilterDistance = 1.0;
+        distanceFilterDistance = 0.5;
 		trackingFrequency = 1;
 		sendingFrequency = 1;
 		uuid = [[MapAttackAppDelegate UUID] retain];
@@ -66,16 +68,15 @@ - (void) dealloc
 	[super dealloc];
 }
 
-
 - (void) normalConnect
 {
 	NSError *error = nil;
 
 	NSString *host = LQ_WRITE_SOCKET_HOST;
     UInt16 port = LQ_WRITE_SOCKET_PORT;
+
+	DLog(@"[Write] Connecting to %@:%i", host, port);
 
-    DLog(@"[Write] Connecting to %@:%i", host, port);
-
 	// Change to use UDP
 	if (![asyncSocket connectToHost:LQ_WRITE_SOCKET_HOST onPort:LQ_WRITE_SOCKET_PORT error:&error])
 	{
@@ -85,7 +86,9 @@ - (void) normalConnect
 
 #pragma mark  -
 
-
+- (BOOL)locationUpdateState {
+	return locationUpdatesOn;
+}
 
 - (void)startMonitoringLocation {
 	if (!locationManager) {
@@ -153,39 +156,46 @@ - (void)locationManager:(CLLocationManager *)manager
 //			 object:self];
 
 			NSData *data = [self dataFromLocation:newLocation];
-			DLog(@"[Write] Sending location data: %@", data);
+			if(VERBOSE)
+				DLog(@"[Write] Sending location data: %@", data);
 			[asyncSocket sendData:data toHost:LQ_WRITE_SOCKET_HOST port:LQ_WRITE_SOCKET_PORT withTimeout:10.0 tag:TAG_DEVICE_ID_SENT];
 			//Look for ack back
 			[asyncSocket receiveWithTimeout:30.0 tag:TAG_DEVICE_ID_SENT];
 
 		} else {
 #if LQ_LOCMAN_DEBUG
-			DLog(@"[Write] Location update (to %@; from %@) rejected", newLocation, oldLocation);
+			if(VERBOSE)
+				DLog(@"[Write] Location update (to %@; from %@) rejected", newLocation, oldLocation);
 #endif
 		}
 }
 
 - (void)onUdpSocket:(AsyncUdpSocket *)sock didSendDataWithTag:(long)tag;
 {
-	DLog(@"[Write] did send");
+	if(VERBOSE)
+		DLog(@"[Write] did send");
 }
 
 - (void)onUdpSocket:(AsyncUdpSocket *)sock didNotSendDataWithTag:(long)tag dueToError:(NSError *)error;
 {
-	DLog(@"[Write] did not get ack back");
+	if(VERBOSE)
+		DLog(@"[Write] did not get ack back");
 }
 
 - (BOOL)onUdpSocket:(AsyncUdpSocket *)sock didReceiveData:(NSData *)data withTag:(long)tag fromHost:(NSString *)host port:(UInt16)port;
 {
 	//TODO: determine if this is a valid packet
-	DLog(@"[Write] Recieved packet back from server: %@", data);
+	if(VERBOSE)
+		DLog(@"[Write] Recieved packet back from server: %@", data);
 
 	if (data.length == sizeof(uint32_t)) {
 		uint32_t time = OSSwapBigToHostInt32(*(uint32_t *)data.bytes);
-		DLog(@"[Write] Accepted packet with timestamp: %u", time);
+		if(VERBOSE)
+			DLog(@"[Write] Accepted packet with timestamp: %u", time);
 		return YES;
 	} else {
-		DLog(@"[Write] packet invalid size: %d", data.length);
+		if(VERBOSE)
+			DLog(@"[Write] packet invalid size: %d", data.length);
 		return NO;
 	}
 }
@@ -224,7 +234,8 @@ - (NSData *)dataFromLocation:(CLLocation *)location {
 //	DLog(@"Offset of command: %lu", offsetof(LQUpdatePacket, f.command));
 //	DLog(@"Offset of date: %lu", offsetof(LQUpdatePacket, f.date));
 
-	DLog(@"[Write] Sending timestamp: %d", update.f.date);
+	// if(VERBOSE)
+		DLog(@"[Write] Sending location update %@", [NSData dataWithBytes:update.bytes length:sizeof(update.bytes)]);
 
 	//Swap endianness of each 16 bit int
 	update.f.date           = OSSwapHostToBigInt32(update.f.date);

Classes/LQClient.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
 #import "ASIHTTPRequest.h"
 #import "ASIFormDataRequest.h"
 
@@ -21,7 +22,7 @@ typedef void (^LQHTTPRequestCallback)(NSError *error, NSDictionary *response);
 
 @interface LQClient : NSObject {
 //	NSMutableArray *queue;
-	ASIHTTPRequest *authenticationRequest;
+//	ASIHTTPRequest *authenticationRequest;
 }
 
 @property (nonatomic, copy) NSString *accessToken;
@@ -34,7 +35,7 @@ typedef void (^LQHTTPRequestCallback)(NSError *error, NSDictionary *response);
 - (BOOL)isLoggedIn;
 // - (NSString *)refreshToken;
 - (void)sendPushToken:(NSString *)token withCallback:(LQHTTPRequestCallback)callback;
-- (void)getNearbyLayers:(LQHTTPRequestCallback)callback;
+- (void)getNearbyLayers:(CLLocation *)location withCallback:(LQHTTPRequestCallback)callback;
 - (void)createNewAccountWithEmail:(NSString *)email initials:(NSString *)initials callback:(LQHTTPRequestCallback)callback;
 - (void)joinGame:(NSString *)layer_id withToken:(NSString *)group_token;
 - (void)logout;

Classes/LQClient.m

@@ -38,7 +38,6 @@ - (id) init
 }
 
 - (void)dealloc {
-	// [queue release];
 	[super dealloc];
 }
 
@@ -260,8 +259,10 @@ - (void)sendPushToken:(NSString *)token withCallback:(LQHTTPRequestCallback)call
 	[self runRequest:request callback:callback];
 }
 
-- (void)getNearbyLayers:(LQHTTPRequestCallback)callback {
-	NSURL *url = [self urlWithPath:[NSString stringWithFormat:@"layer/nearby?latitude=45.5246&longitude=-122.6843&application_id=%@", MapAttackAppID]];
+- (void)getNearbyLayers:(CLLocation *)location withCallback:(LQHTTPRequestCallback)callback {
+	NSURL *url = [self urlWithPath:[NSString stringWithFormat:@"layer/nearby?latitude=%f&longitude=%f&application_id=%@", 
+									//45.5246, -122.6843, MapAttackAppID]];
+									location.coordinate.latitude, location.coordinate.longitude, MapAttackAppID]];
 	__block ASIHTTPRequest *request;
 	if([self isLoggedIn]) {
 		request = [self userRequestWithURL:url];

Classes/LQPushHandler.h

@@ -0,0 +1,29 @@
+//
+//  LQPushHandler.h
+//  Geoloqi
+//
+//  Created by Aaron Parecki on 12/23/10.
+//  Copyright 2010 Geoloqi.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+enum {
+	kLQPushAlertGeonote = 0,
+	kLQPushAlertShutdown,
+	kLQPushAlertStart
+};
+
+@interface LQPushHandler : NSObject <UIAlertViewDelegate> {
+	NSString *lastAlertURL;
+}
+
+@property (nonatomic, retain) NSString *lastAlertURL;
+
+- (id)myInit;
+- (void)handlePush:(UIApplication *)application notification:(NSDictionary *)userInfo;
+- (void)handleLocalNotificationFromApp:(UIApplication *)app notif:(UILocalNotification *)notif;
+- (void)handleLaunch:(NSDictionary *)launchOptions;
+
+@end