Merge branch 'dev' into add_friend_link

android/app/capacitor.build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
+
 }
 
 

capacitor.config.ts

@@ -9,6 +9,9 @@ const config: CapacitorConfig = {
             launchShowDuration: 5000,
             launchAutoHide: true,
         },
+        Camera: {
+            permissions: ["camera", "photos"],
+        },
     },
 }
 

ios/App/App.xcodeproj/project.pbxproj

@@ -362,7 +362,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.satellite.uplink.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -385,7 +385,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.satellite.uplink.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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>

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>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uplink",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "private": true,
     "scripts": {
         "tauri": "tauri",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uplink"
-version = "2.0.6"
+version = "2.0.7"
 description = "Privacy First, Modular, P2P Universal Messaging Client - With you at it's core"
 authors = ["Satellite.IM"]
 license = ""

src/lib/components/settings/OrderedPhrase.svelte

@@ -2,10 +2,13 @@
     import { fade } from "svelte/transition"
     import { animationDelay, animationDuration } from "$lib/globals/animations"
     import { Text, Loader } from "$lib/elements"
+    import Input from "$lib/elements/Input/Input.svelte"
+    import type { Writable } from "svelte/store"
 
     export let number: number = 0
     export let word: string = "UNKNOWN"
     export let loading: boolean = false
+    export let editable: boolean = false
 </script>
 
 <div class="ordered-phrase">
@@ -18,12 +21,16 @@
             </div>
         {/if}
     </span>
-    <span class="word">
+    <span class="word {editable ? 'editable' : ''}">
         {#if loading}
             <Loader text />
         {:else}
             <div data-cy="ordered-phrase-word-{number}" in:fade={{ duration: animationDuration, delay: number * animationDelay }}>
-                <Text>{word}</Text>
+                {#if editable}
+                    <Input bind:value={word} noCapitalize on:paste></Input>
+                {:else}
+                    <Text>{word}</Text>
+                {/if}
             </div>
         {/if}
     </span>
@@ -64,6 +71,16 @@
             display: inline-block;
             flex: 1;
             padding: var(--padding-minimal) var(--padding);
+            &.editable {
+                padding: 0;
+            }
+        }
+
+        :global(.input-group > .input-container) {
+            border: none;
+        }
+        :global(.input-group > .input-container::selection) {
+            border: none;
         }
     }
 </style>

src/lib/config.ts

@@ -52,9 +52,9 @@ export const INTEGRATIONS = {
 }
 
 export const DOWNLOAD_LINKS = {
-    Android: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.6/Uplink_v2.0.6.apk",
+    Android: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.7/Uplink_v2.0.7.apk",
     iOS: "https://apps.apple.com/us/app/satellite-im-uplink/id6737702825",
-    Windows: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.6/Uplink_v2.0.6.msi",
-    Mac: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.6/Uplink_v2.0.6.dmg",
-    Linux: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.6/Uplink_v2.0.6.deb",
+    Windows: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.7/Uplink_v2.0.7.msi",
+    Mac: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.7/Uplink_v2.0.7.dmg",
+    Linux: "https://github.com/Satellite-im/UplinkWeb/releases/download/v2.0.7/Uplink_v2.0.7.deb",
 }

src/lib/elements/Input/FileInput.svelte

@@ -3,6 +3,8 @@
 
     export let hidden: boolean = false
     export let clss: string = ""
+    export let allowed: string | undefined = undefined
+    export let multiple: boolean = true
 
     const dispatch: EventDispatcher<Record<string, File[]>> = createEventDispatcher()
 
@@ -24,4 +26,4 @@
     }
 </script>
 
-<input class={clss} style={hidden ? "display: none" : ""} multiple type="file" bind:this={refSelf} bind:files={fileInput} />
+<input class={clss} style={hidden ? "display: none" : ""} multiple={multiple} accept={allowed ? allowed : "*"} type="file" bind:this={refSelf} bind:files={fileInput} />

src/lib/elements/Input/Input.svelte

@@ -25,6 +25,7 @@
     export let rich: boolean = false
     export let autoFocus: boolean = false
     export let rules: InputRules = new InputRules()
+    export let noCapitalize: boolean = false
 
     let errorMessage: string = ""
 
@@ -179,14 +180,17 @@
             <input
                 class="input {centered ? 'centered' : ''} {disabled ? 'disabled' : ''}"
                 type="text"
+                autocapitalize={noCapitalize ? "none" : undefined}
+                autocorrect={noCapitalize ? "off" : undefined}
                 bind:this={$input}
                 on:focus={handleFocus}
                 bind:value={$writableValue}
                 placeholder={placeholder}
                 on:keydown={onKeyDown}
                 on:input={onInput}
                 on:blur={onBlur}
-                autofocus={isAndroidOriOS() ? isKeyboardOpened : autoFocus} />
+                autofocus={isAndroidOriOS() ? isKeyboardOpened : autoFocus}
+                on:paste />
         </div>
     </div>
     {#if errorMessage}

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",
@@ -273,6 +276,16 @@
                 "new": "Create New Account",
                 "import": "Import Account",
                 "profile": "Create new profile"
+            },
+            "import": {
+                "title": "Import Account",
+                "description": "Now you can import your account! Use the button below to import your account from a backup file.",
+                "passphrase": "Add passphrase",
+                "remote": "Import from remote",
+                "file": "Import from file",
+                "warning": "By continuing your old account will be overwritten!",
+                "fail": "Failed to import account",
+                "fail.null": "Failed to create identity during account import"
             }
         }
     },
@@ -368,6 +381,14 @@
                 "remove": "Your recovery phrase will not be stored anymore and will be removed. Make sure to save the phrase! This change is irreversible!",
                 "remove.yes": "I understand",
                 "remove.no": "Cancel"
+            },
+            "export": {
+                "label": "Export",
+                "description": "Export your account manually to a file.",
+                "remote": "Remote",
+                "file": "File",
+                "fail": "Failed to export account",
+                "success": "Successfully exported account to remote"
             }
         },
         "calling": {

src/lib/layouts/login/Entrypoint.svelte

@@ -63,11 +63,9 @@
             <Button text={$_("pages.auth.create.new")} hook="button-create-account" on:click={_ => (page = LoginPage.Username)} appearance={Appearance.Primary} fill>
                 <Icon icon={Shape.Plus} />
             </Button>
-            {#if get(SettingsStore.state).devmode}
-                <Button text={$_("pages.auth.create.import")} hook="button-import-account" on:click={_ => (showConfigureRelay = true)} appearance={Appearance.Alt} fill>
-                    <Icon icon={Shape.ArrowUp} />
-                </Button>
-            {/if}
+            <Button text={$_("pages.auth.create.import")} hook="button-import-account" on:click={_ => (page = LoginPage.Import)} appearance={Appearance.Alt} fill>
+                <Icon icon={Shape.ArrowUp} />
+            </Button>
         </Controls>
     </div>