Merge remote-tracking branch 'origin/main' into dev

.github/workflows/fastlane.yml

@@ -0,0 +1,16 @@
+name: Validate Fastlane metadata
+
+on:
+  workflow_dispatch:
+  push:
+      branches: [ "main" ]
+  pull_request:
+      branches: [ "main" ]
+
+jobs:
+  go:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate Fastlane Supply Metadata
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2

fastlane/metadata/android/en-US/images/featureGraphic.png

@@ -0,0 +1 @@
+../../../../../assets/graphics/banner.png

fastlane/metadata/android/en-US/images/icon.png

@@ -0,0 +1 @@
+../../../../../assets/graphics/icon-512x512.png

fastlane/metadata/android/en-US/images/phoneScreenshots/1.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/1.apps.png

fastlane/metadata/android/en-US/images/phoneScreenshots/2.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/2.dark_theme.png

fastlane/metadata/android/en-US/images/phoneScreenshots/3.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/3.material_you.png

fastlane/metadata/android/en-US/images/phoneScreenshots/4.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/4.app.png

fastlane/metadata/android/en-US/images/phoneScreenshots/5.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/5.app_opts.png

fastlane/metadata/android/en-US/images/phoneScreenshots/6.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/6.app_webview.png

fastlane/metadata/android/ru/title.txt

@@ -0,0 +1 @@
+Obtainium

lib/app_sources/html.dart

@@ -9,32 +9,7 @@ import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
-  if (ambiguousUrl.startsWith('//')) {
-    ambiguousUrl = '${referenceAbsoluteUrl.scheme}:$ambiguousUrl';
-  }
-  try {
-    Uri.parse(ambiguousUrl).origin;
-    return ambiguousUrl;
-  } catch (err) {
-    // is relative
-  }
-  var currPathSegments = referenceAbsoluteUrl.path
-      .split('/')
-      .where((element) => element.trim().isNotEmpty)
-      .toList();
-  String absoluteUrl;
-  if (ambiguousUrl.startsWith('/')) {
-    absoluteUrl = '${referenceAbsoluteUrl.origin}$ambiguousUrl';
-  } else if (currPathSegments.isEmpty) {
-    absoluteUrl = '${referenceAbsoluteUrl.origin}/$ambiguousUrl';
-  } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
-    absoluteUrl =
-        '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
-  } else {
-    absoluteUrl =
-        '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - (currPathSegments.last.contains('.') ? 1 : 0)).join('/')}/$ambiguousUrl';
-  }
-  return Uri.parse(absoluteUrl).toString();
+  return referenceAbsoluteUrl.resolve(ambiguousUrl).toString();
 }
 
 int compareAlphaNumeric(String a, String b) {