fix(android): always return asset from S3 in order to ensure correct metadata

Author: javamonn

packages/android/app/src/main/java/io/literal/model/StorageObject.java

@@ -55,6 +55,7 @@ public enum Status {
     private static final Pattern ARCHIVES_PATH_PATTERN = Pattern.compile(".+/archives/(.+)");
     private static final Pattern SHARED_PUBLIC_READ_PATTERN = Pattern.compile("shared-public-read/onboarding/(.+)");
     private static final Pattern SCREENSHOT_PATH_PATTERN = Pattern.compile(".+/screenshots/(.+)");
+
     private Type type;
     private String id;
     private Status status;
@@ -295,31 +296,14 @@ public TransferObserver upload(Context context, User user, Callback<Exception, A
         );
     }
 
-    public InputStream downloadAsInputStream(Context context, User user) throws FileNotFoundException {
-        if (status.equals(Status.SYNCHRONIZED) || status.equals(Status.UPLOAD_REQUIRED)) {
-            return new FileInputStream(getFile(context));
-        } else if (status.equals(Status.DOWNLOAD_REQUIRED)) {
-            S3Object s3Object = StorageRepository.getS3Object(context, getAmazonS3URI(context, user));
-            File file = getFile(context);
-            S3ObjectInputStream inputStream = null;
-            try {
-                inputStream = s3Object.getObjectContent();
-                Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            } catch (IOException e) {
-                ErrorRepository.captureException(e);
-            } finally {
-                if (inputStream != null) {
-                    try {
-                        inputStream.close();
-                    } catch (IOException e1) {
-                        ErrorRepository.captureException(e1);
-                    }
-                }
-            }
+    public ObjectMetadata download(Context context, User user) {
+        ObjectMetadata objectMetadata = null;
+        try {
+            objectMetadata = StorageRepository.getObject(context, getAmazonS3URI(context, user), getFile(context));
             status = Status.SYNCHRONIZED;
-            return new FileInputStream(file);
-        } else {
-            throw new FileNotFoundException("Unable to resolve StorageObject.");
+        } catch (Exception e) {
+            ErrorRepository.captureException(e);
         }
+        return objectMetadata;
     }
 }

packages/android/app/src/main/java/io/literal/repository/StorageRepository.java

@@ -9,6 +9,7 @@
 import com.amazonaws.mobileconnectors.s3.transferutility.TransferState;
 import com.amazonaws.mobileconnectors.s3.transferutility.TransferUtility;
 import com.amazonaws.services.s3.AmazonS3URI;
+import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
 
@@ -64,8 +65,8 @@ public static boolean isStorageUrl(Context context, URL url) {
         return url.getHost().equals(storageHost);
     }
 
-    public static S3Object getS3Object(Context context, AmazonS3URI uri) {
-        return AmazonS3ClientFactory.getInstance(context).getObject(uri.getBucket(), uri.getKey());
+    public static ObjectMetadata getObject(Context context, AmazonS3URI uri, File destinationFile) {
+        return AmazonS3ClientFactory.getInstance(context).getObject(new GetObjectRequest(uri.getBucket(), uri.getKey()), destinationFile);
     }
 
     public static TransferObserver upload(

packages/android/app/src/main/java/io/literal/ui/view/SourceWebViewClient.java

@@ -10,9 +10,12 @@
 
 import androidx.annotation.Nullable;
 
+import com.amazonaws.services.s3.model.ObjectMetadata;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import java.io.FileInputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -59,13 +62,17 @@ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceReque
                 .flatMap((storageObject) -> {
                     storageObject.ensureDownloadRequired(context);
                     try {
+                        ObjectMetadata metadata = storageObject.download(context, authenticationViewModel.getUser().getValue());
                         WebResourceResponse response = new WebResourceResponse(
-                                storageObject.getContentType(context).toMimeType(),
+                                metadata.getContentType(),
                                 null,
-                                storageObject.downloadAsInputStream(context, authenticationViewModel.getUser().getValue())
+                                new FileInputStream(storageObject.getFile(context))
                         );
                         Map<String, String> responseHeaders = new HashMap<>();
-                        responseHeaders.put("Cache-Control", StorageObject.CACHE_CONTROL);
+                        responseHeaders.put("Cache-Control", metadata.getCacheControl());
+                        responseHeaders.put("ETag", metadata.getETag());
+                        responseHeaders.put("Content-Language", metadata.getContentLanguage());
+                        responseHeaders.put("Last-Modified", metadata.getLastModified().toString());
                         response.setResponseHeaders(responseHeaders);
                         return Optional.of(response);
                     } catch (Exception e) {