fix: apply correct mimeType in iOS #1023

acezard · 2023-11-21T08:46:17Z

This PR will fix:

Incorrect video/picture names on iOS
Crash on mespapiers on iOS
Incorrect encoded names (%20 instead of spaces) on iOS
Empty iOS uploads
Wrong file type on Drive upload (iOS)

Crash-- · 2023-11-21T08:51:25Z

src/app/domain/osReceive/services/OsReceiveData.ts

    },
    status: OsReceiveFileStatus.toUpload,
-    type: file.mimeType
+    type: 'application/pdf'


what about jpg/mov or else? 🤔

good catch wasn't supposed to be there at all. I guess the unit test failed at detecting it, I'm going to update it too

Did we check the iOS code to see why we can't rely on the mimeType? It sounds weird 🤔

well in iOS the mimetype is just ".pdf" for pdf for instance. The stack does not recognize it and the file has no icon. (not really breaking in itself). On Android the mimeType has the expected web format

zatteo · 2023-11-21T08:52:01Z

src/app/domain/osReceive/services/OsReceiveData.ts

    },
    status: OsReceiveFileStatus.toUpload,
-    type: file.mimeType
+    type: 'application/pdf'


'application/pdf' here ?

forgot to remove it when I switched from the mac to the PC 🤦

zatteo · 2023-11-21T08:54:23Z

src/app/domain/osReceive/services/OsReceiveData.ts

@@ -12,6 +13,8 @@ import {
  ReceivedFile,
  OS_RECEIVE_PROTOCOL_NAME
 } from '/app/domain/osReceive/models/ReceivedFile'
+import { Media } from '/app/domain/backup/models'
+import { getMimeType } from '/app/domain/backup/services/getMedias'


Just to write it down because I did not think about it before, but we should move getMimeType from backup service to upload service one day.

Directly in file creation so no need to update it later. Also ensure file name and file path are decoded URI to avoid encoded spaces (%20) or other encoded characters by the import lib

Name was an UUID for images & videos, now using real name Also removing file:// prefix in filepaths as it made RNFS unable to retrieve the file, and silently creating empty files

Still keeping our app as safeguard precaution for now. If the mimetype is correct it adds no overhead since it will pass it through

acezard · 2023-11-21T15:29:22Z

ios/CozyShare/ShareViewController.swift

-         .containerURL(forSecurityApplicationGroupIdentifier: "group.\(this.hostAppBundleIdentifier)")!
-         .appendingPathComponent("\(newName).\(fileExtension)")
+          .containerURL(forSecurityApplicationGroupIdentifier: "group.\(this.hostAppBundleIdentifier)")!
+          .appendingPathComponent(originalFileName) // Use the original file name


this is incorrect, fixing it (fixed)

Ldoppea · 2023-11-21T15:31:35Z

src/app/domain/osReceive/services/OsReceiveData.ts

+
+const createOsReceiveFile = (file: ReceivedFile): OsReceiveFile => {
+  const decodedFileName = decodeFileName(file.fileName)
+  const mimeType = determineMimeType(file.fileName, file.mimeType)


I remember there was a diff on checking mimeType for Android received files and for iOS received files, did you check that on both platform?

I remember there was a diff on checking mimeType for Android received files and for iOS received files, did you check that on both platform?

yes, on Android I just use mimeType directly since it's correct. Only on iOS I try to guess it

Ok and so there is no diff on the name part?

Only on iOS I try to guess it

Don't you fixed that here? https://github.com/cozy/cozy-flagship-app/pull/1023/files#diff-e5fbd9f4b85d62986896fb1d8408ad2d8d5a0f2267b5e0b22a9caef7c97255bb

Only on iOS I try to guess it

Don't you fixed that here? https://github.com/cozy/cozy-flagship-app/pull/1023/files#diff-e5fbd9f4b85d62986896fb1d8408ad2d8d5a0f2267b5e0b22a9caef7c97255bb

that's true, the Platform checking is then redundant

--exclude build

Will use mimeType for both ios and android since the share lib is patched Still include failsafe

This patch wasn't needed. It competes with the other patch we implemented in clearReceivedFiles We have to let it be so the event handlers respond correctly to file sharing

acezard requested review from Ldoppea and zatteo as code owners November 21, 2023 08:46

Crash-- reviewed Nov 21, 2023

View reviewed changes

zatteo reviewed Nov 21, 2023

View reviewed changes

acezard force-pushed the fix--iOS-upload-issues branch from d942558 to 456c9b4 Compare November 21, 2023 09:08

acezard requested review from Crash-- and zatteo November 21, 2023 09:08

fix: apply correct mimeType in iOS

9f6c286

Directly in file creation so no need to update it later. Also ensure file name and file path are decoded URI to avoid encoded spaces (%20) or other encoded characters by the import lib

acezard force-pushed the fix--iOS-upload-issues branch from 456c9b4 to 9f6c286 Compare November 21, 2023 09:41

fix: handle name and filepath issues

54328e9

Name was an UUID for images & videos, now using real name Also removing file:// prefix in filepaths as it made RNFS unable to retrieve the file, and silently creating empty files

acezard force-pushed the fix--iOS-upload-issues branch from 7c122d4 to 54328e9 Compare November 21, 2023 15:19

fix: patch lib to get correct mimetype

99aca6c

Still keeping our app as safeguard precaution for now. If the mimetype is correct it adds no overhead since it will pass it through

acezard commented Nov 21, 2023

View reviewed changes

fix: append correct newname when cloning

d62109f

Ldoppea reviewed Nov 21, 2023

View reviewed changes

acezard requested a review from Ldoppea November 21, 2023 15:36

fix: trim patch package for sharing intent

bb337a6

--exclude build

acezard force-pushed the fix--iOS-upload-issues branch 2 times, most recently from abb6232 to 5d2c98f Compare November 21, 2023 16:30

fix: remove redundaant platform check

7a4133b

Will use mimeType for both ios and android since the share lib is patched Still include failsafe

acezard force-pushed the fix--iOS-upload-issues branch from 5d2c98f to 7a4133b Compare November 21, 2023 16:40

fix: revert sharing lib patch

2cc4396

This patch wasn't needed. It competes with the other patch we implemented in clearReceivedFiles We have to let it be so the event handlers respond correctly to file sharing

Ldoppea approved these changes Nov 21, 2023

View reviewed changes

acezard merged commit bdc22d9 into master Nov 21, 2023
1 check passed

acezard deleted the fix--iOS-upload-issues branch November 21, 2023 17:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: apply correct mimeType in iOS #1023

fix: apply correct mimeType in iOS #1023

acezard commented Nov 21, 2023 •

edited

Loading

Crash-- Nov 21, 2023

acezard Nov 21, 2023

Crash-- Nov 21, 2023

acezard Nov 21, 2023

zatteo Nov 21, 2023

acezard Nov 21, 2023

zatteo Nov 21, 2023 •

edited

Loading

acezard Nov 21, 2023 •

edited

Loading

Ldoppea Nov 21, 2023

acezard Nov 21, 2023

Ldoppea Nov 21, 2023

Crash-- Nov 21, 2023

acezard Nov 21, 2023

fix: apply correct mimeType in iOS #1023

fix: apply correct mimeType in iOS #1023

Conversation

acezard commented Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zatteo Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

acezard Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

acezard commented Nov 21, 2023 •

edited

Loading

zatteo Nov 21, 2023 •

edited

Loading

acezard Nov 21, 2023 •

edited

Loading