From 46d288f7d47a26f89ac201e0521e155797e6808d Mon Sep 17 00:00:00 2001 From: WardPearce Date: Wed, 9 Oct 2024 22:13:25 +1300 Subject: [PATCH] Fix URL check --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/routes/(app)/+layout.svelte | 5 +++-- update_versions.py | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index d0cca656..97297d37 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 57 - versionName "1.6.6" + versionCode 58 + versionName "1.6.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/electron/package.json b/materialious/electron/package.json index a699198c..501fbbd2 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.6", + "version": "1.6.7", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 287f91f4..347e7db2 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.6", + "version": "1.6.7", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index 9af4f32c..9824552e 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -84,11 +84,11 @@ } }); - // Auth response handling for Mobile App.addListener('appUrlOpen', (data) => { const url = new URL(data.url); - if (data.url.includes('youtu')) { + // Handle youtube deeplinks + if (url.protocol !== 'materialious-auth:') { let videoId = url.searchParams.get('v'); if (!videoId) { videoId = url.pathname.split('/')[1]; @@ -100,6 +100,7 @@ goto(`/watch/${videoId}`); } else { + // Auth response handling for Mobile const username = url.searchParams.get('username'); const token = url.searchParams.get('token'); diff --git a/update_versions.py b/update_versions.py index 242f72f8..c2a7882d 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.6" +LATEST_VERSION = "1.6.7" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")