From c57949fb4cbef61a34e92930b00f09f351142215 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sun, 22 Sep 2024 19:44:35 +1200
Subject: [PATCH] Fix sharing on Android

---
 materialious/android/app/build.gradle               |  4 ++--
 materialious/android/app/capacitor.build.gradle     |  1 +
 materialious/android/capacitor.settings.gradle      |  3 +++
 materialious/electron/package.json                  |  3 ++-
 materialious/package-lock.json                      | 13 +++++++++++--
 materialious/package.json                           |  3 ++-
 materialious/src/lib/Settings.svelte                |  3 ++-
 materialious/src/lib/ShareVideo.svelte              |  7 ++++---
 materialious/src/lib/SyncParty.svelte               |  3 ++-
 .../src/routes/(app)/channel/[slug]/+page.svelte    |  9 +++++----
 .../src/routes/(app)/playlist/[slug]/+page.svelte   |  9 +++++----
 update_versions.py                                  |  2 +-
 12 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index 09a5e8c6..74d8a202 100644
--- a/materialious/android/app/build.gradle
+++ b/materialious/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 47
-        versionName "1.5.6"
+        versionCode 48
+        versionName "1.5.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/materialious/android/app/capacitor.build.gradle b/materialious/android/app/capacitor.build.gradle
index e874b5b5..8a82c063 100644
--- a/materialious/android/app/capacitor.build.gradle
+++ b/materialious/android/app/capacitor.build.gradle
@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
+    implementation project(':capacitor-clipboard')
     implementation project(':capgo-inappbrowser')
     implementation project(':mediagrid-capacitor-native-audio')
     implementation project(':capacitor-nodejs')
diff --git a/materialious/android/capacitor.settings.gradle b/materialious/android/capacitor.settings.gradle
index 83049c36..ef657a94 100644
--- a/materialious/android/capacitor.settings.gradle
+++ b/materialious/android/capacitor.settings.gradle
@@ -8,6 +8,9 @@ project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/
 include ':capacitor-browser'
 project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')
 
+include ':capacitor-clipboard'
+project(':capacitor-clipboard').projectDir = new File('../node_modules/@capacitor/clipboard/android')
+
 include ':capgo-inappbrowser'
 project(':capgo-inappbrowser').projectDir = new File('../node_modules/@capgo/inappbrowser/android')
 
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index a4c6a192..dfbbf856 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
@@ -21,6 +21,7 @@
 	},
 	"dependencies": {
 		"@capacitor-community/electron": "^5.0.0",
+		"capacitor-nodejs": "https://github.com/EdenwareApps/Capacitor-NodeJS/releases/download/v1.0.0-beta.7/capacitor6-nodejs.tgz",
 		"chokidar": "~3.6.0",
 		"electron-is-dev": "~2.0.0",
 		"electron-serve": "~1.1.0",
diff --git a/materialious/package-lock.json b/materialious/package-lock.json
index ceb30743..5be1b64c 100644
--- a/materialious/package-lock.json
+++ b/materialious/package-lock.json
@@ -1,18 +1,19 @@
 {
 	"name": "materialious",
-	"version": "1.5.4",
+	"version": "1.5.6",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "materialious",
-			"version": "1.5.4",
+			"version": "1.5.6",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.1",
 				"@capacitor/android": "6.1.2",
 				"@capacitor/app": "^6.0.1",
 				"@capacitor/browser": "^6.0.2",
 				"@capacitor/cli": "6.1.2",
+				"@capacitor/clipboard": "^6.0.1",
 				"@capacitor/core": "^6.1.2",
 				"@capgo/inappbrowser": "^6.6.8",
 				"@ffmpeg/ffmpeg": "^0.12.10",
@@ -2166,6 +2167,14 @@
 				"node": "^12.20.0 || >=14"
 			}
 		},
+		"node_modules/@capacitor/clipboard": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/@capacitor/clipboard/-/clipboard-6.0.1.tgz",
+			"integrity": "sha512-aN6QsZD79Z605sK9YA8JtJLuD5vI/WrPzT/RCWUWBWPdFzhnRdT45dbsnQVvL2kzzm5aTsCAPepkdRqpvWwCGA==",
+			"peerDependencies": {
+				"@capacitor/core": "^6.0.0"
+			}
+		},
 		"node_modules/@capacitor/core": {
 			"version": "6.1.2",
 			"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-6.1.2.tgz",
diff --git a/materialious/package.json b/materialious/package.json
index 458ce13f..d90e6c7c 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -49,6 +49,7 @@
 		"@capacitor/app": "^6.0.1",
 		"@capacitor/browser": "^6.0.2",
 		"@capacitor/cli": "6.1.2",
+		"@capacitor/clipboard": "^6.0.1",
 		"@capacitor/core": "^6.1.2",
 		"@capgo/inappbrowser": "^6.6.8",
 		"@ffmpeg/ffmpeg": "^0.12.10",
diff --git a/materialious/src/lib/Settings.svelte b/materialious/src/lib/Settings.svelte
index 07995851..b378830e 100644
--- a/materialious/src/lib/Settings.svelte
+++ b/materialious/src/lib/Settings.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { bookmarkletSaveToUrl } from '$lib/externalSettings';
+	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import ui from 'beercss';
 	import { iso31661 } from 'iso-3166';
@@ -673,7 +674,7 @@
 			<h6>{$_('layout.bookmarklet')}</h6>
 			<button
 				class="no-margin"
-				on:click={async () => await navigator.clipboard.writeText(bookmarkletSaveToUrl())}
+				on:click={async () => await Clipboard.write({ string: bookmarkletSaveToUrl() })}
 				>{$_('copyUrl')}</button
 			>
 		</div>
diff --git a/materialious/src/lib/ShareVideo.svelte b/materialious/src/lib/ShareVideo.svelte
index fc8a4d37..5f071ca4 100644
--- a/materialious/src/lib/ShareVideo.svelte
+++ b/materialious/src/lib/ShareVideo.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import { _ } from 'svelte-i18n';
 	import type { Notification, PlaylistPageVideo, Video, VideoBase } from './Api/model';
@@ -11,7 +12,7 @@
 		class="row"
 		href="#copy"
 		on:click={async () =>
-			await navigator.clipboard.writeText(`${location.origin}/watch/${video.videoId}`)}
+			await Clipboard.write({ string: `${location.origin}/watch/${video.videoId}` })}
 	>
 		<div class="min">{$_('player.share.materialiousLink')}</div></a
 	>
@@ -20,14 +21,14 @@
 	href="#copy"
 	class="row"
 	on:click={async () =>
-		await navigator.clipboard.writeText(`https://redirect.invidious.io/watch?v=${video.videoId}`)}
+		await Clipboard.write({ string: `https://redirect.invidious.io/watch?v=${video.videoId}` })}
 >
 	<div class="min">{$_('player.share.invidiousRedirect')}</div></a
 ><a
 	class="row"
 	href="#copy"
 	on:click={async () =>
-		await navigator.clipboard.writeText(`https://www.youtube.com/watch?v=${video.videoId}`)}
+		await Clipboard.write({ string: `https://www.youtube.com/watch?v=${video.videoId}` })}
 >
 	<div class="min">{$_('player.share.youtubeLink')}</div></a
 >
diff --git a/materialious/src/lib/SyncParty.svelte b/materialious/src/lib/SyncParty.svelte
index 2ebe244f..9e4d27b6 100644
--- a/materialious/src/lib/SyncParty.svelte
+++ b/materialious/src/lib/SyncParty.svelte
@@ -3,6 +3,7 @@
 	import { page } from '$app/stores';
 	import { peerJs, removeWindowQueryFlag, setWindowQueryFlag } from '$lib/misc';
 	import type { PlayerEvents } from '$lib/player';
+	import { Clipboard } from '@capacitor/clipboard';
 	import ui from 'beercss';
 	import type { DataConnection } from 'peerjs';
 	import { onDestroy, onMount } from 'svelte';
@@ -130,7 +131,7 @@
 			</div>
 			<button
 				on:click={async () => {
-					await navigator.clipboard.writeText(`${location.origin}?sync=${$syncPartyPeerStore?.id}`);
+					await Clipboard.write({ string: `${location.origin}?sync=${$syncPartyPeerStore?.id}` });
 				}}
 				class="square round"
 			>
diff --git a/materialious/src/routes/(app)/channel/[slug]/+page.svelte b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
index 7744cef7..17cf5471 100644
--- a/materialious/src/routes/(app)/channel/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
@@ -6,6 +6,7 @@
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { cleanNumber, getBestThumbnail, proxyGoogleImage } from '$lib/misc';
 	import { activePageStore, authStore } from '$lib/store';
+	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
@@ -132,16 +133,16 @@
 							<a
 								href="#share"
 								on:click={async () => {
-									await navigator.clipboard.writeText(location.href);
+									await Clipboard.write({ string: location.href });
 								}}>{$_('player.share.materialiousLink')}</a
 							>
 						{/if}
 						<a
 							href="#share"
 							on:click={async () => {
-								await navigator.clipboard.writeText(
-									`https://www.youtube.com/channel/${data.channel.authorId}`
-								);
+								await Clipboard.write({
+									string: `https://www.youtube.com/channel/${data.channel.authorId}`
+								});
 							}}>{$_('player.share.youtubeLink')}</a
 						>
 					</menu>
diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
index e41257ac..6c6c9dd6 100644
--- a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
@@ -4,6 +4,7 @@
 	import VideoList from '$lib/VideoList.svelte';
 	import { cleanNumber, unsafeRandomItem } from '$lib/misc.js';
 	import { activePageStore, playlistSettingsStore } from '$lib/store';
+	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
@@ -90,16 +91,16 @@
 				<a
 					href="#share"
 					on:click={async () => {
-						await navigator.clipboard.writeText(location.href);
+						await Clipboard.write({ string: location.href });
 					}}>{$_('player.share.materialiousLink')}</a
 				>
 			{/if}
 			<a
 				href="#share"
 				on:click={async () => {
-					await navigator.clipboard.writeText(
-						`https://www.youtube.com/playlist?list=${data.playlist.playlistId}`
-					);
+					await Clipboard.write({
+						string: `https://www.youtube.com/playlist?list=${data.playlist.playlistId}`
+					});
 				}}>{$_('player.share.youtubeLink')}</a
 			>
 		</menu>
diff --git a/update_versions.py b/update_versions.py
index b2b9d40d..8e0c9e09 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.5.6"
+LATEST_VERSION = "1.5.7"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")