From c7298424e55cfdfb6475df1bf0616889d50785d8 Mon Sep 17 00:00:00 2001 From: aAbed <39409020+TheAabedKhan@users.noreply.github.com> Date: Fri, 20 Sep 2024 04:42:07 +0545 Subject: [PATCH] fix: Get changelogs for alternative sources (#1766) --- lib/services/manager_api.dart | 19 ++++++++++++++----- lib/ui/views/home/home_viewmodel.dart | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/services/manager_api.dart b/lib/services/manager_api.dart index fa3f0d69..68144df6 100644 --- a/lib/services/manager_api.dart +++ b/lib/services/manager_api.dart @@ -69,7 +69,8 @@ class ManagerAPI { } // Migrate to new API URL if not done yet as the old one is sunset. - final bool hasMigratedToNewApi = _prefs.getBool('migratedToNewApiUrl') ?? false; + final bool hasMigratedToNewApi = + _prefs.getBool('migratedToNewApiUrl') ?? false; if (!hasMigratedToNewApi) { final String apiUrl = getApiUrl().toLowerCase(); if (apiUrl.contains('releases.revanced.app')) { @@ -78,11 +79,14 @@ class ManagerAPI { } } - final bool hasMigratedToAlternativeSource = _prefs.getBool('migratedToAlternativeSource') ?? false; + final bool hasMigratedToAlternativeSource = + _prefs.getBool('migratedToAlternativeSource') ?? false; if (!hasMigratedToAlternativeSource) { final String patchesRepo = getPatchesRepo(); final String integrationsRepo = getIntegrationsRepo(); - final bool usingAlternativeSources = patchesRepo.toLowerCase() != defaultPatchesRepo || integrationsRepo.toLowerCase() != defaultIntegrationsRepo; + final bool usingAlternativeSources = + patchesRepo.toLowerCase() != defaultPatchesRepo || + integrationsRepo.toLowerCase() != defaultIntegrationsRepo; _prefs.setBool('useAlternativeSources', usingAlternativeSources); _prefs.setBool('migratedToAlternativeSource', true); } @@ -119,6 +123,9 @@ class ManagerAPI { } String getPatchesRepo() { + if (!isUsingAlternativeSources()) { + return defaultPatchesRepo; + } return _prefs.getString('patchesRepo') ?? defaultPatchesRepo; } @@ -452,7 +459,7 @@ class ManagerAPI { Future downloadPatches() async { try { - final String repoName = !isUsingAlternativeSources() ? defaultPatchesRepo : getPatchesRepo(); + final String repoName = getPatchesRepo(); final String currentVersion = await getCurrentPatchesVersion(); final String url = getPatchesDownloadURL(); return await _githubAPI.getReleaseFile( @@ -471,7 +478,9 @@ class ManagerAPI { Future downloadIntegrations() async { try { - final String repoName = !isUsingAlternativeSources() ? defaultIntegrationsRepo : getIntegrationsRepo(); + final String repoName = !isUsingAlternativeSources() + ? defaultIntegrationsRepo + : getIntegrationsRepo(); final String currentVersion = await getCurrentIntegrationsVersion(); final String url = getIntegrationsDownloadURL(); return await _githubAPI.getReleaseFile( diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index 10138215..2ce7cf5b 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -484,7 +484,7 @@ class HomeViewModel extends BaseViewModel { Future getLatestPatchesChangelog() async { final release = - await _githubAPI.getLatestRelease(_managerAPI.defaultPatchesRepo); + await _githubAPI.getLatestRelease(_managerAPI.getPatchesRepo()); return release?['body']; }