fix: MLIBZ-2766: Android SDK v3.1.7 returns "_uploadURL" included in …

…file meta-data from GCS after successfully uploading a file to Kinvey File Store (#257) * feat: MLIBZ-3073, Implement File upload, converted classes and refactored code * feat: MLIBZ-3073, Implement File upload, some fixes in transferring `varargs`. * refactor: MLIBZ-3074, Implement resumable file upload, some Kotlin code refactoring? added tests to check resume uploading * refactor: MLIBZ-3074, Implement resumable file upload, added tests to check resume uploading, some improvements * refactor: MLIBZ-3074, Implement resumable file upload, some test fixes * refactor: MLIBZ-3074, Implement resumable file upload, fix for MediaHttpUploaderTest * feat: MLIBZ-2766, Android SDK v3.1.7 returns "_uploadURL" included in file meta-data from GCS after successfully uploading a file to Kinvey File Store. - removing _uploadUrl link after successfully file upload.
Kinvey · Aug 16, 2019 · 7f56f85 · 7f56f85
1 parent c46f813
commit 7f56f85
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/android-lib/src/androidTest/java/com/kinvey/androidTest/store/file/FileStoreTest.java b/android-lib/src/androidTest/java/com/kinvey/androidTest/store/file/FileStoreTest.java
@@ -1555,6 +1555,36 @@ public void run() {
         assertNotNull(listener.error);
     }
 
+    @Test
+    public void testUploadFileCheckUploadUrlCache() throws InterruptedException, IOException {
+        testUploadPubliclyReadableFile(StoreType.NETWORK);
+    }
+
+    @Test
+    public void testUploadFileCheckUploadUrlAuto() throws InterruptedException, IOException {
+        testUploadFileCheckUploadUrl(StoreType.AUTO);
+    }
+
+    @Test
+    public void testUploadFileCheckUploadUrlSync() throws InterruptedException, IOException {
+        testUploadFileCheckUploadUrl(StoreType.SYNC);
+    }
+
+    private void testUploadFileCheckUploadUrl(StoreType storeType) throws IOException, InterruptedException {
+        FileMetaData fileMetaData = testMetadata();
+        fileMetaData.setPublic(true);
+        File file = createFile(DEFAULT_FILE_SIZE_MB);
+        DefaultUploadProgressListener listener = uploadFileWithMetadata(storeType, file, fileMetaData);
+        file.delete();
+        assertNotNull(listener.fileMetaDataResult);
+        assertNull(listener.fileMetaDataResult.getUploadUrl());
+        DefaultDownloadProgressListener downloadListener = downloadFile(storeType, listener.fileMetaDataResult);
+        assertNull(downloadListener.error);
+        assertNotNull(downloadListener.fileMetaDataResult);
+        assertTrue(downloadListener.fileMetaDataResult.isPublic());
+        assertNull(listener.fileMetaDataResult.getUploadUrl());
+        removeFile(storeType, listener.fileMetaDataResult);
+    }
 
     @After
     public void tearDown() {

diff --git a/java-api-core/src/com/kinvey/java/core/MediaHttpUploader.kt b/java-api-core/src/com/kinvey/java/core/MediaHttpUploader.kt
@@ -513,6 +513,7 @@ constructor (mediaContent: AbstractInputStreamContent,
                     if (mediaContent.closeInputStream) {
                         contentInputStream?.close()
                     }
+                    meta?.uploadUrl = null
                     updateStateAndNotifyListener(UploadState.UPLOAD_COMPLETE)
                     return meta
                 }

diff --git a/java-api-core/src/com/kinvey/java/network/NetworkFileManager.kt b/java-api-core/src/com/kinvey/java/network/NetworkFileManager.kt
@@ -609,7 +609,6 @@ open class NetworkFileManager
             if (networkFileManager.customRequestProperties?.isEmpty() == false) {
                 this.getRequestHeaders()["X-Kinvey-Custom-Request-Properties"] = Gson().toJson(networkFileManager.customRequestProperties)
             }
-
             networkFileManager.setUploadHeader(meta, this)
             uploader?.fileMetaDataForUploading = meta
         }