Merge pull request #1874 from ImranR98/dev

- App-wide "pretend to be GPlay" option (#1859)
- UI bugfixes on add app page (#1866)
- UI tweaks (#1871, #1872)
- Added "skip latest" option to APKPure (also fallback toggle)

assets/translations/bs.json

@@ -315,6 +315,7 @@
     "wiki": "Pomoć/Wiki",
     "crowdsourcedConfigsLabel": "Konfiguracije aplikacije obezbeđene pomoću velikog broja ljudi (crowdsourcing) (koristite na svoju odgovornost)",
     "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -315,6 +315,7 @@
     "wiki": "Nápověda/Wiki",
     "crowdsourcedConfigsLabel": "Konfigurace aplikací s využitím crowdsourcingu (použití na vlastní nebezpečí)",
     "allowInsecure": "Povolení nezabezpečených požadavků HTTP",
+    "stayOneVersionBehind": "Zůstaňte o jednu verzi pozadu za nejnovější",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

assets/translations/da.json

@@ -315,6 +315,7 @@
     "wiki": "Hjælp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourcede app-konfigurationer (brug på egen risiko)",
     "allowInsecure": "Tillad usikre HTTP-anmodninger",
+    "stayOneVersionBehind": "Vær en version bagud i forhold til den nyeste",
     "removeAppQuestion": {
         "one": "Fjern app?",
         "other": "Fjern apps?"

assets/translations/de.json

@@ -315,6 +315,7 @@
     "wiki": "Hilfe/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App-Konfigurationen (Verwendung auf eigene Gefahr)",
     "allowInsecure": "Unsichere HTTP-Anfragen zulassen",
+    "stayOneVersionBehind": "Eine Version hinter der neuesten Version bleiben",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en-EO.json

@@ -315,6 +315,7 @@
     "wiki": "Helpo/Vikio",
     "crowdsourcedConfigsLabel": "Komunumaj apo-agordoj (uzu kun singardo)",
     "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "Forigi la aplikaĵon?",
         "other": "Forigi la aplikaĵojn?"

assets/translations/en.json

@@ -315,6 +315,7 @@
     "wiki": "Help/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
     "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -315,6 +315,7 @@
     "wiki": "Ayuda/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (uso bajo su propia responsabilidad)",
     "allowInsecure": "Permitir peticiones HTTP inseguras",
+    "stayOneVersionBehind": "Mantenerse una versión por detrás de la última",
     "removeAppQuestion": {
         "one": "¿Eliminar aplicación?",
         "other": "¿Eliminar aplicaciones?"

assets/translations/fa.json

@@ -315,6 +315,7 @@
     "wiki": "راهنما/ویکی",
     "crowdsourcedConfigsLabel": "تنظیمات برنامه Crowdsourced (با مسئولیت خود استفاده کنید)",
     "allowInsecure": "درخواست های HTTP ناامن را مجاز کنید",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -315,6 +315,7 @@
     "wiki": "Aide/Wiki",
     "crowdsourcedConfigsLabel": "Configurations d'applications par la communauté (à utiliser à vos risques et périls)",
     "allowInsecure": "Autoriser les requêtes HTTP non sécurisées",
+    "stayOneVersionBehind": "Rester à une version de la dernière",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -315,6 +315,7 @@
     "wiki": "Súgó/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsource-ből származó alkalmazások beállítása (saját felelősségére használja)",
     "allowInsecure": "Nem biztonságos HTTP-kérések engedélyezése",
+    "stayOneVersionBehind": "Maradjon egy verzióval a legfrissebb mögött",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazásokat?"

assets/translations/id.json

@@ -204,7 +204,7 @@
     "categoryDeleteWarning": "Semua aplikasi dalam kategori yang dihapus akan diatur sebagai tidak terkategori.",
     "addCategory": "Tambah kategori",
     "label": "Label",
-    "language": "Language",
+    "language": "Bahasa",
     "copiedToClipboard": "Disalin ke papan klip",
     "storagePermissionDenied": "Izin penyimpanan ditolak",
     "selectedCategorizeWarning": "Ini akan mengganti pengaturan kategori yang ada untuk aplikasi terpilih.",
@@ -315,6 +315,7 @@
     "wiki": "Bantuan/Wiki",
     "crowdsourcedConfigsLabel": "Konfigurasi aplikasi Crowdsourced (risiko penggunaan ditanggung sendiri)",
     "allowInsecure": "Izinkan permintaan HTTP yang tidak aman",
+    "stayOneVersionBehind": "Tetap satu versi di belakang versi terbaru",
     "removeAppQuestion": {
         "one": "Hapus aplikasi?",
         "other": "Hapus aplikasi?"
@@ -375,4 +376,4 @@
         "one": "{} APK",
         "other": "{} APK"
     }
-}
+}

assets/translations/it.json

@@ -315,6 +315,7 @@
     "wiki": "Aiuto/Wiki",
     "crowdsourcedConfigsLabel": "Configurazioni di app in crowdsourcing (uso a proprio rischio)",
     "allowInsecure": "Consentire le richieste HTTP non sicure",
+    "stayOneVersionBehind": "Rimanere una versione indietro rispetto alla più recente",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -315,6 +315,7 @@
     "wiki": "ヘルプ/ウィキ",
     "crowdsourcedConfigsLabel": "クラウドソーシングによるアプリの設定（利用は自己責任で）",
     "allowInsecure": "安全でないHTTPリクエストを許可する",
+    "stayOneVersionBehind": "最新バージョンから1つ遅れ",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/nl.json

@@ -315,6 +315,7 @@
     "wiki": "Help/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App-configuraties (gebruik op eigen risico)",
     "allowInsecure": "Onveilige HTTP-verzoeken toestaan",
+    "stayOneVersionBehind": "Blijf een versie achter op de nieuwste",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -315,6 +315,7 @@
     "wiki": "Pomoc/Wiki",
     "crowdsourcedConfigsLabel": "Konfiguracje aplikacji pochodzące z crowdsourcingu (korzystanie na własne ryzyko)",
     "allowInsecure": "Zezwalaj na niezabezpieczone żądania HTTP",
+    "stayOneVersionBehind": "Pozostań jedną wersję za najnowszą",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -315,6 +315,7 @@
     "wiki": "Ajuda/Wiki",
     "crowdsourcedConfigsLabel": "Configurações de aplicações de crowdsourcing (utilização por sua conta e risco)",
     "allowInsecure": "Permitir pedidos HTTP inseguros",
+    "stayOneVersionBehind": "Manter-se uma versão atrás da mais recente",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"

assets/translations/ru.json

@@ -315,6 +315,7 @@
     "wiki": "Помощь/Вики",
     "crowdsourcedConfigsLabel": "Конфигурации приложений на основе краудсорсинга (используйте на свой страх и риск)",
     "allowInsecure": "Разрешить небезопасные HTTP-запросы",
+    "stayOneVersionBehind": "Не отставайте от последней версии",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/sv.json

@@ -315,6 +315,7 @@
     "wiki": "Hjälp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourcade appkonfigurationer (använd på egen risk)",
     "allowInsecure": "Tillåt osäkra HTTP-förfrågningar",
+    "stayOneVersionBehind": "Håll dig en version bakom den senaste",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -315,6 +315,7 @@
     "wiki": "Yardım/Wiki",
     "crowdsourcedConfigsLabel": "Kitle Kaynaklı Uygulama Yapılandırmaları (riski size ait olmak üzere kullanın)",
     "allowInsecure": "Güvensiz HTTP isteklerine izin ver",
+    "stayOneVersionBehind": "En son sürümün bir sürüm gerisinde kalın",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/uk.json

@@ -315,6 +315,7 @@
     "wiki": "Довідка/Вікі",
     "crowdsourcedConfigsLabel": "Краудсорсингові конфігурації додатків (використовуйте на свій страх і ризик)",
     "allowInsecure": "Дозволити незахищені HTTP-запити",
+    "stayOneVersionBehind": "Залишайтеся на одну версію актуальнішою",
     "removeAppQuestion": {
         "one": "Видалити застосунок?",
         "other": "Видалити застосунки?"

assets/translations/vi.json

@@ -315,6 +315,7 @@
     "wiki": "Trợ giúp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
     "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

assets/translations/zh-Hant-TW.json

@@ -315,6 +315,7 @@
     "wiki": "幫助/維基",
     "crowdsourcedConfigsLabel": "群眾外包的應用程式設定（使用風險自負）",
     "allowInsecure": "Allow insecure HTTP requests",
+    "stayOneVersionBehind": "Stay one version behind latest",
     "removeAppQuestion": {
         "one": "移除應用程式？",
         "other": "移除應用程式？"

assets/translations/zh.json

@@ -315,6 +315,7 @@
     "wiki": "帮助/Wiki",
     "crowdsourcedConfigsLabel": "众包应用程序配置（使用风险自负）",
     "allowInsecure": "允许不安全的 HTTP 请求",
+    "stayOneVersionBehind": "比最新版本晚一个版本",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/apkpure.dart

@@ -2,6 +2,7 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -26,6 +27,16 @@ class APKPure extends AppSource {
     allowSubDomains = true;
     naiveStandardVersionDetection = true;
     showReleaseDateAsVersionToggle = true;
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormSwitch('stayOneVersionBehind',
+            label: tr('stayOneVersionBehind'), defaultValue: false)
+      ]
+    ];
   }
 
   @override
@@ -54,6 +65,97 @@ class APKPure extends AppSource {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
+  getDetailsForVersionLink(
+      String standardUrl,
+      String appId,
+      String host,
+      List<String> supportedArchs,
+      String link,
+      Map<String, dynamic> additionalSettings) async {
+    var res = await sourceRequest(link, additionalSettings);
+    if (res.statusCode == 200) {
+      var html = parse(res.body);
+      var apksDiv =
+          html.querySelector('#version-list div div.show-more-content');
+      DateTime? topReleaseDate;
+      var apkUrls = apksDiv
+              ?.querySelectorAll('div.group-title')
+              .map((e) {
+                String architectureString = e.text.trim();
+                if (architectureString.toLowerCase() == 'unlimited' ||
+                    architectureString.toLowerCase() == 'universal') {
+                  architectureString = '';
+                }
+                List<String> architectures = architectureString
+                    .split(',')
+                    .map((e) => e.trim())
+                    .where((e) => e.isNotEmpty)
+                    .toList();
+                // Only take the first APK for each architecture, ignore others for now, for simplicity
+                // Unclear why there can even be multiple APKs for the same version and arch
+                var apkInfo = e.nextElementSibling?.querySelector('div.info');
+                String? versionCode = RegExp('[0-9]+')
+                    .firstMatch(apkInfo
+                            ?.querySelector('div.info-top span.code')
+                            ?.text ??
+                        '')
+                    ?.group(0)
+                    ?.trim();
+                var types = apkInfo
+                        ?.querySelectorAll('div.info-top span.tag')
+                        .map((e) => e.text.trim())
+                        .map((t) => t == 'APKs' ? 'APK' : t) ??
+                    [];
+                String type = types.isEmpty
+                    ? 'APK'
+                    : types.length == 1
+                        ? types.first
+                        : types.last;
+                String? dateString = apkInfo
+                    ?.querySelector('div.info-bottom span.time')
+                    ?.text
+                    .trim();
+                DateTime? releaseDate = parseDateTimeMMMddCommayyyy(dateString);
+                if (additionalSettings['autoApkFilterByArch'] == true &&
+                    architectures.isNotEmpty &&
+                    architectures
+                        .where((a) => supportedArchs.contains(a))
+                        .isEmpty) {
+                  return const MapEntry('', '');
+                }
+                topReleaseDate ??=
+                    releaseDate; // Just use the release date of the first APK in the list as the release date for this version
+                return MapEntry(
+                    '$appId-$versionCode-$architectureString.${type.toLowerCase()}',
+                    'https://d.${hosts.contains(host) ? 'cdnpure.com' : host}/b/$type/$appId?versionCode=$versionCode');
+              })
+              .where((e) => e.key.isNotEmpty)
+              .toList() ??
+          [];
+      if (apkUrls.isEmpty) {
+        throw NoAPKError();
+      }
+      String version = Uri.parse(link).pathSegments.last;
+      String author = html
+              .querySelector('span.info-sdk')
+              ?.text
+              .trim()
+              .substring(version.length + 4) ??
+          Uri.parse(standardUrl).pathSegments.reversed.last;
+      String appName =
+          html.querySelector('h1.info-title')?.text.trim() ?? appId;
+      String? changeLog = html
+          .querySelector('div.module.change-log')
+          ?.innerHtml
+          .trim()
+          .replaceAll("<br>", "  \n");
+      return APKDetails(version, apkUrls, AppNames(author, appName),
+          releaseDate: topReleaseDate, changeLog: changeLog);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -80,88 +182,17 @@ class APKPure extends AppSource {
 
     for (var i = 0; i < versionLinks.length; i++) {
       var link = versionLinks[i];
-      var res = await sourceRequest(link.key, additionalSettings);
+      try {
-      if (res.statusCode == 200) {
+        if (i == 0 && additionalSettings['stayOneVersionBehind'] == true) {
-        var html = parse(res.body);
+          throw NoReleasesError();
-        var apksDiv =
+        }
-            html.querySelector('#version-list div div.show-more-content');
+        return await getDetailsForVersionLink(standardUrl, appId, host,
-        DateTime? topReleaseDate;
+            supportedArchs, link.key, additionalSettings);
-        var apkUrls = apksDiv
+      } catch (e) {
-                ?.querySelectorAll('div.group-title')
+        if (additionalSettings['fallbackToOlderReleases'] != true ||
-                .map((e) {
+            i == versionLinks.length - 1) {
-                  String architectureString = e.text.trim();
+          rethrow;
-                  if (architectureString.toLowerCase() == 'unlimited' ||
-                      architectureString.toLowerCase() == 'universal') {
-                    architectureString = '';
-                  }
-                  List<String> architectures = architectureString
-                      .split(',')
-                      .map((e) => e.trim())
-                      .where((e) => e.isNotEmpty)
-                      .toList();
-                  // Only take the first APK for each architecture, ignore others for now, for simplicity
-                  // Unclear why there can even be multiple APKs for the same version and arch
-                  var apkInfo = e.nextElementSibling?.querySelector('div.info');
-                  String? versionCode = RegExp('[0-9]+')
-                      .firstMatch(apkInfo
-                              ?.querySelector('div.info-top span.code')
-                              ?.text ??
-                          '')
-                      ?.group(0)
-                      ?.trim();
-                  var types = apkInfo
-                          ?.querySelectorAll('div.info-top span.tag')
-                          .map((e) => e.text.trim())
-                          .map((t) => t == 'APKs' ? 'APK' : t) ??
-                      [];
-                  String type = types.isEmpty
-                      ? 'APK'
-                      : types.length == 1
-                          ? types.first
-                          : types.last;
-                  String? dateString = apkInfo
-                      ?.querySelector('div.info-bottom span.time')
-                      ?.text
-                      .trim();
-                  DateTime? releaseDate =
-                      parseDateTimeMMMddCommayyyy(dateString);
-                  if (additionalSettings['autoApkFilterByArch'] == true &&
-                      architectures.isNotEmpty &&
-                      architectures
-                          .where((a) => supportedArchs.contains(a))
-                          .isEmpty) {
-                    return const MapEntry('', '');
-                  }
-                  topReleaseDate ??=
-                      releaseDate; // Just use the release date of the first APK in the list as the release date for this version
-                  return MapEntry(
-                      '$appId-$versionCode-$architectureString.${type.toLowerCase()}',
-                      'https://d.${hosts.contains(host) ? 'cdnpure.com' : host}/b/$type/$appId?versionCode=$versionCode');
-                })
-                .where((e) => e.key.isNotEmpty)
-                .toList() ??
-            [];
-        if (apkUrls.isEmpty) {
-          continue;
         }
-        String version = Uri.parse(link.key).pathSegments.last;
-        String author = html
-                .querySelector('span.info-sdk')
-                ?.text
-                .trim()
-                .substring(version.length + 4) ??
-            Uri.parse(standardUrl).pathSegments.reversed.last;
-        String appName =
-            html.querySelector('h1.info-title')?.text.trim() ?? appId;
-        String? changeLog = html
-            .querySelector('div.module.change-log')
-            ?.innerHtml
-            .trim()
-            .replaceAll("<br>", "  \n");
-        return APKDetails(version, apkUrls, AppNames(author, appName),
-            releaseDate: topReleaseDate, changeLog: changeLog);
-      } else {
-        throw getObtainiumHttpError(res);
       }
     }
     throw NoAPKError();

lib/pages/add_app.dart

@@ -30,6 +30,7 @@ class AddAppPageState extends State<AddAppPage> {
   String userInput = '';
   String searchQuery = '';
   String? pickedSourceOverride;
+  String? previousPickedSourceOverride;
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
@@ -58,6 +59,9 @@ class AddAppPageState extends State<AddAppPage> {
         if (overrideSource != null) {
           pickedSourceOverride = overrideSource;
         }
+        bool overrideChanged =
+            pickedSourceOverride != previousPickedSourceOverride;
+        previousPickedSourceOverride = pickedSourceOverride;
         if (updateUrlInput) {
           urlInputKey++;
         }
@@ -69,6 +73,7 @@ class AddAppPageState extends State<AddAppPage> {
                 overrideSource: pickedSourceOverride)
             : null;
         if (pickedSource.runtimeType != source.runtimeType ||
+            overrideChanged ||
             (prevHost != null && prevHost != source?.hosts[0])) {
           pickedSource = source;
           pickedSource?.runOnAddAppInputChange(userInput);
@@ -487,7 +492,8 @@ class AddAppPageState extends State<AddAppPage> {
               height: 16,
             ),
             GeneratedForm(
-                key: Key(pickedSource.runtimeType.toString()),
+                key: Key(
+                    '${pickedSource.runtimeType.toString()}-${pickedSource?.hostChanged.toString()}-${pickedSource?.hostIdenticalDespiteAnyChange.toString()}'),
                 items: [
                   ...pickedSource!.combinedAppSpecificSettingFormItems,
                   ...(pickedSourceOverride != null

lib/pages/app.dart

@@ -242,11 +242,11 @@ class _AppPageState extends State<AppPage> {
       );
     }
 
-    getFullInfoColumn() => Column(
+    getFullInfoColumn({bool small = false}) => Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            const SizedBox(height: 20),
+            SizedBox(height: small ? 5 : 20),
             FutureBuilder(
                 future:
                     appsProvider.updateAppIcon(app?.app.id, ignoreCache: true),
@@ -261,24 +261,28 @@ class _AppPageState extends State<AppPage> {
                                     : () => pm.openApp(app.app.id),
                                 child: Image.memory(
                                   app!.icon!,
-                                  height: 150,
+                                  height: small ? 70 : 150,
                                   gaplessPlayback: true,
                                 ),
                               )
                             ])
                       : Container();
                 }),
-            const SizedBox(
+            SizedBox(
-              height: 25,
+              height: small ? 10 : 25,
             ),
             Text(
               app?.name ?? tr('app'),
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.displayLarge,
+              style: small
+                  ? Theme.of(context).textTheme.displaySmall
+                  : Theme.of(context).textTheme.displayLarge,
             ),
             Text(tr('byX', args: [app?.app.author ?? tr('unknown')]),
                 textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.headlineMedium),
+                style: small
+                    ? Theme.of(context).textTheme.headlineSmall
+                    : Theme.of(context).textTheme.headlineMedium),
             const SizedBox(
               height: 24,
             ),
@@ -496,11 +500,8 @@ class _AppPageState extends State<AppPage> {
                                   builder: (BuildContext ctx) {
                                     return AlertDialog(
                                       scrollable: true,
-                                      content: getInfoColumn(),
+                                      content: getFullInfoColumn(small: true),
-                                      title: Text(
+                                      title: Text(app.name),
-                                          '${app.name} ${tr('byX', args: [
-                                            app.app.author
-                                          ])}'),
                                       actions: [
                                         TextButton(
                                             onPressed: () {

lib/pages/settings.dart

@@ -578,6 +578,22 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(
+                                        tr('shizukuPretendToBeGooglePlay'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .shizukuPretendToBeGooglePlay,
+                                    onChanged: (value) {
+                                      settingsProvider
+                                          .shizukuPretendToBeGooglePlay = value;
+                                    })
+                              ],
+                            ),
                             height32,
                             Text(
                               tr('sourceSpecific'),

lib/providers/apps_provider.dart

@@ -879,22 +879,20 @@ class AppsProvider with ChangeNotifier {
             apps[id]?.installedInfo == null ? context : null;
         bool needBGWorkaround =
             willBeSilent && context == null && !settingsProvider.useShizuku;
+        bool shizukuPretendToBeGooglePlay = settingsProvider
+                .shizukuPretendToBeGooglePlay ||
+            apps[id]!.app.additionalSettings['shizukuPretendToBeGooglePlay'] ==
+                true;
         if (downloadedFile != null) {
           if (needBGWorkaround) {
             // ignore: use_build_context_synchronously
             installApk(downloadedFile, contextIfNewInstall,
                 needsBGWorkaround: true,
-                shizukuPretendToBeGooglePlay: apps[id]!
+                shizukuPretendToBeGooglePlay: shizukuPretendToBeGooglePlay);
-                        .app
-                        .additionalSettings['shizukuPretendToBeGooglePlay'] ==
-                    true);
           } else {
             // ignore: use_build_context_synchronously
             sayInstalled = await installApk(downloadedFile, contextIfNewInstall,
-                shizukuPretendToBeGooglePlay: apps[id]!
+                shizukuPretendToBeGooglePlay: shizukuPretendToBeGooglePlay);
-                        .app
-                        .additionalSettings['shizukuPretendToBeGooglePlay'] ==
-                    true);
           }
         } else {
           if (needBGWorkaround) {
@@ -905,10 +903,7 @@ class AppsProvider with ChangeNotifier {
             // ignore: use_build_context_synchronously
             sayInstalled = await installXApkDir(
                 downloadedDir!, contextIfNewInstall,
-                shizukuPretendToBeGooglePlay: apps[id]!
+                shizukuPretendToBeGooglePlay: shizukuPretendToBeGooglePlay);
-                        .app
-                        .additionalSettings['shizukuPretendToBeGooglePlay'] ==
-                    true);
           }
         }
         if (willBeSilent && context == null) {

lib/providers/settings_provider.dart

@@ -48,7 +48,7 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  bool get useShizuku{
+  bool get useShizuku {
     return prefs?.getBool('useShizuku') ?? false;
   }
 
@@ -69,8 +69,7 @@ class SettingsProvider with ChangeNotifier {
 
   Color get themeColor {
     int? colorCode = prefs?.getInt('themeColor');
-    return (colorCode != null) ?
+    return (colorCode != null) ? Color(colorCode) : obtainiumThemeColor;
-        Color(colorCode) : obtainiumThemeColor;
   }
 
   set themeColor(Color themeColor) {
@@ -469,4 +468,13 @@ class SettingsProvider with ChangeNotifier {
     prefs?.setBool('beforeNewInstallsShareToAppVerifier', val);
     notifyListeners();
   }
+
+  bool get shizukuPretendToBeGooglePlay {
+    return prefs?.getBool('shizukuPretendToBeGooglePlay') ?? false;
+  }
+
+  set shizukuPretendToBeGooglePlay(bool val) {
+    prefs?.setBool('shizukuPretendToBeGooglePlay', val);
+    notifyListeners();
+  }
 }

lib/providers/source_provider.dart

@@ -414,6 +414,7 @@ HttpClient createHttpClient(bool insecure) {
 abstract class AppSource {
   List<String> hosts = [];
   bool hostChanged = false;
+  bool hostIdenticalDespiteAnyChange = false;
   late String name;
   bool enforceTrackOnly = false;
   bool changeLogIfAnyIsMarkDown = true;
@@ -628,9 +629,10 @@ abstract class AppSource {
       SettingsProvider settingsProvider) async {
     Map<String, String> results = {};
     for (var e in sourceConfigSettingFormItems) {
-      var val = hostChanged
+      var val = hostChanged && !hostIdenticalDespiteAnyChange
           ? additionalSettings[e.key]
-          : settingsProvider.getSettingString(e.key);
+          : additionalSettings[e.key] ??
+              settingsProvider.getSettingString(e.key);
       if (val != null) {
         results[e.key] = val;
       }
@@ -813,9 +815,14 @@ class SourceProvider {
         throw UnsupportedURLError();
       }
       var res = srcs.first;
-      res.hosts = [Uri.parse(url).host];
+      var originalHosts = res.hosts;
+      var newHost = Uri.parse(url).host;
+      res.hosts = [newHost];
       res.hostChanged = true;
-      return srcs.first;
+      if (originalHosts.contains(newHost)) {
+        res.hostIdenticalDespiteAnyChange = true;
+      }
+      return res;
     }
     AppSource? source;
     for (var s in sources.where((element) => element.hosts.isNotEmpty)) {

pubspec.lock

@@ -1097,10 +1097,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "6e64fcb1c19d92024da8f33503aaeeda35825d77142c01d0ea2aa32edc79fdc8"
+      sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced
       url: "https://pub.dev"
     source: hosted
-    version: "3.16.7"
+    version: "3.16.8"
   webview_flutter_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.25+2282
+version: 1.1.26+2283
 
 environment:
   sdk: '>=3.0.0 <4.0.0'