Improvements to self cert on android
This commit is contained in:
+2
-2
@@ -4,10 +4,10 @@
|
|||||||
<selectionStates>
|
<selectionStates>
|
||||||
<SelectionState runConfigName="app">
|
<SelectionState runConfigName="app">
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
<option name="selectionMode" value="DROPDOWN" />
|
||||||
<DropdownSelection timestamp="2026-03-02T08:05:49.685303023Z">
|
<DropdownSelection timestamp="2026-04-29T13:30:29.789814037Z">
|
||||||
<Target type="DEFAULT_BOOT">
|
<Target type="DEFAULT_BOOT">
|
||||||
<handle>
|
<handle>
|
||||||
<DeviceId pluginId="LocalEmulator" identifier="path=/home/wpearce/.android/avd/Television_4K.avd" />
|
<DeviceId pluginId="LocalEmulator" identifier="path=/home/wpearce/.android/avd/Pixel_9.avd" />
|
||||||
</handle>
|
</handle>
|
||||||
</Target>
|
</Target>
|
||||||
</DropdownSelection>
|
</DropdownSelection>
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ android {
|
|||||||
applicationId "us.materialio.app"
|
applicationId "us.materialio.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 242
|
versionCode 243
|
||||||
versionName "1.16.25"
|
versionName "1.16.26"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
@@ -84,7 +84,11 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<release version="1.16.25" date="2026-4-23">
|
|
||||||
|
<release version="1.16.26" date="2026-4-30">
|
||||||
|
<url>https://github.com/Materialious/Materialious/releases/tag/1.16.26</url>
|
||||||
|
</release>
|
||||||
|
<release version="1.16.25" date="2026-4-23">
|
||||||
<url>https://github.com/Materialious/Materialious/releases/tag/1.16.25</url>
|
<url>https://github.com/Materialious/Materialious/releases/tag/1.16.25</url>
|
||||||
</release>
|
</release>
|
||||||
<release version="1.16.24" date="2026-4-07">
|
<release version="1.16.24" date="2026-4-07">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Materialious",
|
"name": "Materialious",
|
||||||
"version": "1.16.25",
|
"version": "1.16.26",
|
||||||
"description": "Modern material design for YouTube and Invidious.",
|
"description": "Modern material design for YouTube and Invidious.",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Ward Pearce",
|
"name": "Ward Pearce",
|
||||||
@@ -45,4 +45,4 @@
|
|||||||
"capacitor",
|
"capacitor",
|
||||||
"electron"
|
"electron"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "materialious",
|
"name": "materialious",
|
||||||
"version": "1.16.25",
|
"version": "1.16.26",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run patch:github && vite dev",
|
"dev": "npm run patch:github && vite dev",
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
} from '../../store';
|
} from '../../store';
|
||||||
import { isOwnBackend } from '$lib/shared';
|
import { isOwnBackend } from '$lib/shared';
|
||||||
import ComboBox from '../ComboBox.svelte';
|
import ComboBox from '../ComboBox.svelte';
|
||||||
|
import { corsProxyUrl } from '$lib/fetchProxy';
|
||||||
|
|
||||||
let invidiousInstance = $state(get(invidiousInstanceStore));
|
let invidiousInstance = $state(get(invidiousInstanceStore));
|
||||||
|
|
||||||
@@ -59,9 +60,9 @@
|
|||||||
interfaceAllowInsecureRequests.subscribe(async (isAllowed) => {
|
interfaceAllowInsecureRequests.subscribe(async (isAllowed) => {
|
||||||
if (Capacitor.getPlatform() === 'android') {
|
if (Capacitor.getPlatform() === 'android') {
|
||||||
if (isAllowed) {
|
if (isAllowed) {
|
||||||
await fetch('http://materialious__allow-insecure-requests');
|
await fetch(corsProxyUrl + 'allow-insecure-requests');
|
||||||
} else {
|
} else {
|
||||||
await fetch('http://materialious__deny-insecure-requests');
|
await fetch(corsProxyUrl + 'deny-insecure-requests');
|
||||||
}
|
}
|
||||||
} else if (Capacitor.getPlatform() === 'electron') {
|
} else if (Capacitor.getPlatform() === 'electron') {
|
||||||
await window.electronAPI.setAllowInsecureSSL(isAllowed);
|
await window.electronAPI.setAllowInsecureSSL(isAllowed);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import sodium from 'libsodium-wrappers-sumo';
|
|||||||
import { isOwnBackend } from './shared';
|
import { isOwnBackend } from './shared';
|
||||||
|
|
||||||
export const originalFetch = window.fetch;
|
export const originalFetch = window.fetch;
|
||||||
const corsProxyUrl =
|
export const corsProxyUrl =
|
||||||
Capacitor.getPlatform() === 'android'
|
Capacitor.getPlatform() === 'android'
|
||||||
? 'http://localhost:3000/'
|
? 'http://localhost:3000/'
|
||||||
: `${location.origin}/api/proxy/`;
|
: `${location.origin}/api/proxy/`;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -169,11 +169,11 @@ const server = http.createServer((req, res) => {
|
|||||||
let targetUrl = req.url.slice(1);
|
let targetUrl = req.url.slice(1);
|
||||||
|
|
||||||
// Quick way to quickly send commands between app and nodejs backend.
|
// Quick way to quickly send commands between app and nodejs backend.
|
||||||
if (targetUrl === 'http://materialious__allow-insecure-requests') {
|
if (targetUrl === 'allow-insecure-requests') {
|
||||||
rejectUnauthorized = false;
|
rejectUnauthorized = false;
|
||||||
res.writeHead(200);
|
res.writeHead(200);
|
||||||
return res.end();
|
return res.end();
|
||||||
} else if (targetUrl === 'http://materialious__deny-insecure-requests') {
|
} else if (targetUrl === 'deny-insecure-requests') {
|
||||||
rejectUnauthorized = true;
|
rejectUnauthorized = true;
|
||||||
res.writeHead(200);
|
res.writeHead(200);
|
||||||
return res.end();
|
return res.end();
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ import os
|
|||||||
import re
|
import re
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
LATEST_VERSION = "1.16.25"
|
LATEST_VERSION = "1.16.26"
|
||||||
RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D
|
RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D
|
||||||
|
|
||||||
WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
|
WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
|
||||||
|
|||||||
Reference in New Issue
Block a user