Merge pull request #13 from appfolio/mitmAndroidUseCustomUploadId

hojason117 · web-flow · commit 566636eb8aa8 · 2023-07-27T13:50:23.000-07:00
Use custom upload ID on Android (MITM-706)
diff --git a/android/src/main/java/com/appfolio/uploader/ModifiedHttpUploadRequest.kt b/android/src/main/java/com/appfolio/uploader/ModifiedHttpUploadRequest.kt
@@ -49,4 +49,9 @@ abstract class ModifiedHttpUploadRequest<B : HttpUploadRequest<B>>(context: Cont
 
     return uploadTaskParameters.id;
   }
+
+  fun setCustomUploadID(uploadID: String) {
+    this.uploadId = uploadID
+    setUploadID(uploadID)
+  }
 }
diff --git a/android/src/main/java/com/appfolio/uploader/UploaderModule.kt b/android/src/main/java/com/appfolio/uploader/UploaderModule.kt
@@ -268,7 +268,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
         }
       }
       if (customUploadId != null)
-        request.setUploadID(customUploadId)
+        request.setCustomUploadID(customUploadId)
 
       val uploadId = request.startUpload()
       promise.resolve(uploadId)

Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,9 @@ abstract class ModifiedHttpUploadRequest<B : HttpUploadRequest<B>>(context: Cont`
`49`	`49`
`50`	`50`	`return uploadTaskParameters.id;`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ fun setCustomUploadID(uploadID: String) {`
	`54`	`+ this.uploadId = uploadID`
	`55`	`+ setUploadID(uploadID)`
	`56`	`+ }`
`52`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`if (customUploadId != null)`
`271`		`- request.setUploadID(customUploadId)`
	`271`	`+ request.setCustomUploadID(customUploadId)`
`272`	`272`
`273`	`273`	`val uploadId = request.startUpload()`
`274`	`274`	`promise.resolve(uploadId)`