diff options
Diffstat (limited to 'iphone/FixMyStreet/Classes')
| -rw-r--r-- | iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h | 4 | ||||
| -rw-r--r-- | iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m | 6 | ||||
| -rw-r--r-- | iphone/FixMyStreet/Classes/InputTableViewController.m | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h index 35dbb0837..048587695 100644 --- a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h +++ b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h @@ -16,7 +16,7 @@ UINavigationController *navigationController; // The report currently being entered. - UIImage* image; + NSData* image; NSString* latitude; NSString* longitude; @@ -34,7 +34,7 @@ @property (nonatomic, retain) UINavigationController *navigationController; //@property (nonatomic, retain) IBOutlet UIViewController *viewController; -@property (nonatomic, retain) UIImage* image; +@property (nonatomic, retain) NSData* image; @property (nonatomic, retain) NSString* latitude; @property (nonatomic, retain) NSString* longitude; @property (nonatomic, retain) NSString* subject; diff --git a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m index a58ba893b..8ad133ac8 100644 --- a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m +++ b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m @@ -32,6 +32,7 @@ phone = [[NSUserDefaults standardUserDefaults] stringForKey:@"Phone"]; subject = [[NSUserDefaults standardUserDefaults] stringForKey:@"Subject"]; + image = [[NSUserDefaults standardUserDefaults] objectForKey:@"Image"]; // NSData *imageData = [[[NSUserDefaults standardUserDefaults] objectForKey:@"Image"] mutableCopy]; // if (imageData != nil) // image = (UIImage *)[NSKeyedUnarchiver unarchiveObjectWithData:imageData]; @@ -89,6 +90,7 @@ // NSData *imageData = [NSKeyedArchiver archivedDataWithRootObject:image]; // [[NSUserDefaults standardUserDefaults] setObject:imageData forKey:@"Image"]; // [imageData release]; + [[NSUserDefaults standardUserDefaults] setObject:image forKey:@"Image"]; [[NSUserDefaults standardUserDefaults] setObject:latitude forKey:@"Latitude"]; [[NSUserDefaults standardUserDefaults] setObject:longitude forKey:@"Longitude"]; @@ -167,12 +169,12 @@ } if (image) { - NSData *imageData = UIImageJPEGRepresentation(image, 0.8); +// NSData *imageData = UIImageJPEGRepresentation(image, 0.8); [postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]]; [postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"photo\"; filename=\"from_phone.jpeg\"\r\n"] dataUsingEncoding:NSASCIIStringEncoding]]; [postBody appendData:[[NSString stringWithString:@"Content-Type: image/jpeg\r\n"] dataUsingEncoding:NSASCIIStringEncoding]]; [postBody appendData:[[NSString stringWithString:@"Content-Transfer-Encoding: binary\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]]; - [postBody appendData:imageData]; + [postBody appendData:image]; } [postBody appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]]; diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.m b/iphone/FixMyStreet/Classes/InputTableViewController.m index 91c7ec5e9..7cd8f5d02 100644 --- a/iphone/FixMyStreet/Classes/InputTableViewController.m +++ b/iphone/FixMyStreet/Classes/InputTableViewController.m @@ -56,7 +56,9 @@ FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate]; if (delegate.image) { - imageView.image = delegate.image; + UIImage *newImage = [[UIImage alloc] initWithData:delegate.image]; + imageView.image = newImage; + [newImage release]; } } @@ -255,7 +257,8 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingImage:(UIImage *)newImage editingInfo:(NSDictionary *)editingInfo { FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate]; - delegate.image = newImage; + NSData *imageData = UIImageJPEGRepresentation(newImage, 0.8); + delegate.image = imageData; imageView.image = newImage; |