Merge branch 'dev' into import/export_account

Satellite-im · Dec 18, 2024 · 4820fe2 · 4820fe2
2 parents d142bb7 + 4347185
commit 4820fe2
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 7 deletions.
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -24,6 +24,8 @@
 	<true/>
 	<key>UIFileSharingEnabled</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>UISupportsDocumentBrowser</key>
 	<true/>
 	<key>NSMicrophoneUsageDescription</key>

diff --git a/ios/App/PrivacyInfo.xcprivacy b/ios/App/PrivacyInfo.xcprivacy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+      <!-- Add this dict entry to the array if the PrivacyInfo file already exists -->
+      <dict>
+        <key>NSPrivacyAccessedAPIType</key>
+        <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+        <key>NSPrivacyAccessedAPITypeReasons</key>
+        <array>
+          <string>C617.1</string>
+        </array>
+      </dict>
+    </array>
+  </dict>
+</plist>
diff --git a/src/lib/lang/en.json b/src/lib/lang/en.json
@@ -162,6 +162,7 @@
         "request_sent": "You sent a request for {amount}"
     },
     "friends": {
+        "copy": "Copy",
         "copy_did": "Copy ID",
         "block": "Block",
         "blocked": "Blocked",
@@ -170,9 +171,10 @@
         "all": "All",
         "active": "Active",
         "add": "Add",
+        "add_friend": "Add Friend",
         "add_someone": "Add Someone",
         "search_friends_placeholder": "Search friends",
-        "find_placeholder": "Enter Friend ID",
+        "find_placeholder": "Enter Friend DID",
         "incoming_requests": "Incoming Requests",
         "outgoing_requests": "Outgoing Requests",
         "noOutgoing": "No outbound requests.",
@@ -189,6 +191,7 @@
         "dragging_files": "Dragging {count} files for upload",
         "unknown": "UNKNOWN",
         "download": "Download",
+        "shareFileCanceled": "File sharing canceled",
         "rename": "Rename",
         "share": "Share",
         "share.selectChats": "Select Chats",

diff --git a/src/lib/wasm/ConstellationStore.ts b/src/lib/wasm/ConstellationStore.ts
@@ -288,7 +288,7 @@ class ConstellationStore {
         return regex.test(path)
     }
 
-    async downloadFile(fileName: string): Promise<Result<WarpError, Blob>> {
+    async downloadFile(fileName: string): Promise<Result<WarpError, Buffer>> {
         const constellation = get(this.constellationWritable)
         if (constellation) {
             try {
@@ -308,8 +308,7 @@ class ConstellationStore {
                     }
                 } finally {
                     const combinedArray = Buffer.concat(chunks)
-                    const blob = new Blob([new Uint8Array(combinedArray)], { type: "application/octet-stream" })
-                    return success(blob)
+                    return success(combinedArray)
                 }
             } catch (error) {
                 return failure(handleErrors(error))

diff --git a/src/routes/files/+page.svelte b/src/routes/files/+page.svelte
@@ -25,6 +25,10 @@
     import { Store } from "$lib/state/Store"
     import path from "path"
     import { MultipassStoreInstance } from "$lib/wasm/MultipassStore"
+    import { Share } from "@capacitor/share"
+    import { isAndroidOriOS } from "$lib/utils/Mobile"
+    import { Filesystem, Directory, Encoding } from "@capacitor/filesystem"
+    import { log } from "$lib/utils/Logger"
 
     export let browseFilesForChatMode: boolean = false
 
@@ -456,7 +460,12 @@
             err => {
                 Store.addToastNotification(new ToastMessage("", err, 2))
             },
-            blob => {
+            async combinedArray => {
+                if (isAndroidOriOS()) {
+                    await shareFile(fileName, combinedArray)
+                    return
+                }
+                const blob = new Blob([new Uint8Array(combinedArray)], { type: "application/octet-stream" })
                 const url = URL.createObjectURL(blob)
                 const a = document.createElement("a")
                 a.href = url
@@ -469,6 +478,32 @@
         )
     }
 
+    async function shareFile(fileName: string, combinedArray: Buffer) {
+        try {
+            const base64Data = combinedArray.toString("base64")
+
+            const filePath = await Filesystem.writeFile({
+                path: fileName,
+                data: base64Data!,
+                directory: Directory.Cache,
+            })
+
+            await Share.share({
+                text: fileName,
+                url: filePath.uri,
+            })
+
+            log.info(`File shared: ${fileName} successfully`)
+        } catch (error) {
+            let errorMessage = `${error}`
+            log.error("Error when to share file:", fileName, "Error:", errorMessage)
+            if (errorMessage.includes("Share canceled")) {
+                Store.addToastNotification(new ToastMessage("", $_("files.shareFileCanceled"), 2))
+                return
+            }
+        }
+    }
+
     $: chats = UIStore.state.chats
     $: activeChat = Store.state.activeChat
 

diff --git a/src/routes/friends/+page.svelte b/src/routes/friends/+page.svelte
@@ -260,7 +260,9 @@
                         bind:value={requestString}>
                         <Icon icon={Shape.Search} />
                     </Input>
-                    <Button hook="button-add-friend" disabled={!isValidFriendDid} appearance={Appearance.Alt} text={$_("friends.add")} on:click={submitRequest}>
+                </div>
+                <div class="section" data-cy="friends-section-all-buttons">
+                    <Button hook="button-add-friend" disabled={!isValidFriendDid} appearance={Appearance.Alt} text={$_("friends.add")} tooltip={$_("friends.add_friend")} on:click={submitRequest}>
                         <Icon icon={Shape.Plus} />
                     </Button>
                     <ContextMenu
@@ -281,7 +283,7 @@
                                 onClick: async () => await copy_did(false),
                             },
                         ]}>
-                        <Button hook="button-copy-id" slot="content" appearance={Appearance.Alt} icon tooltip={$_("friends.copy_did")} let:open on:contextmenu={open} on:click={async _ => await copy_did(false)}>
+                        <Button hook="button-copy-id" slot="content" appearance={Appearance.Alt} text={$_("friends.copy")} tooltip={$_("friends.copy_did")} let:open on:contextmenu={open} on:click={async _ => await copy_did(false)}>
                             <Icon icon={Shape.Clipboard} />
                         </Button>
                     </ContextMenu>