From c3d1c5d217eb732224a9adf703e658ba307bcf9e Mon Sep 17 00:00:00 2001
From: Allan Lang <lang.allan@gmail.com>
Date: Wed, 6 Dec 2023 22:59:55 +0000
Subject: [PATCH] Append .jpg file extension for upload

---
 Tree Tracker/Info.plist                                      | 2 +-
 .../Services/ProtectEarth/ProtectEarthTreeService.swift      | 5 +++--
 Unit Tests/Info.plist                                        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Tree Tracker/Info.plist b/Tree Tracker/Info.plist
index 93060b2..07c0793 100644
--- a/Tree Tracker/Info.plist	
+++ b/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>
diff --git a/Tree Tracker/Services/ProtectEarth/ProtectEarthTreeService.swift b/Tree Tracker/Services/ProtectEarth/ProtectEarthTreeService.swift
index 7a3876c..99316e7 100644
--- a/Tree Tracker/Services/ProtectEarth/ProtectEarthTreeService.swift	
+++ b/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,7 +99,7 @@ class ProtectEarthTreeService: TreeService {
             
             transferUtility.uploadData(data,
                                        bucket: Secrets.awsBucketName,
-                                       key: "\(Secrets.awsBucketPrefix)/\(tree.treeId)",
+                                       key: uploadKey,
                                        contentType: "image/jpeg",
                                        expression: expression,
                                        completionHandler: completionHolder.completionHandler
@@ -106,7 +107,7 @@ class ProtectEarthTreeService: TreeService {
             .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,
diff --git a/Unit Tests/Info.plist b/Unit Tests/Info.plist
index c2e3689..b599ca8 100644
--- a/Unit Tests/Info.plist	
+++ b/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>