Merge pull request #116 from protect-earth/al/115

Append .jpg file extension for upload

Author: allanlang

Tree Tracker/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.4</string>
+	<string>0.11.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

Tree Tracker/Services/ProtectEarth/ProtectEarthTreeService.swift

@@ -72,6 +72,7 @@ class ProtectEarthTreeService: TreeService {
 
             var latitude = "0"
             var longitude = "0"
+            var uploadKey = "\(Secrets.awsBucketPrefix)/\(tree.treeId).jpg"
 
             if (coordinates.count == 2) {
                 latitude = coordinates[0]
@@ -98,15 +99,15 @@ class ProtectEarthTreeService: TreeService {
 
             transferUtility.uploadData(data,
                                        bucket: Secrets.awsBucketName,
-                                       key: "\(Secrets.awsBucketPrefix)/\(tree.treeId)",
+                                       key: uploadKey,
                                        contentType: "image/jpeg",
                                        expression: expression,
                                        completionHandler: completionHolder.completionHandler
             )
             .continueWith { (task) -> AnyObject? in
                 // stuff we want to do once the task is *STARTED*
                 Rollbar.infoMessage("S3 upload started", data: [
-                    "bucket-path": "\(Secrets.awsBucketPrefix)/\(tree.treeId)",
+                    "bucket-path": uploadKey,
                     "x-amz-meta-datetaken": tree.createDate?.ISO8601Format(),
                     "x-amz-meta-supervisor": tree.supervisor,
                     "x-amz-meta-latitude": latitude,

Unit Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.4</string>
+	<string>0.11.5</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>