From e44f77a68a4176238e4dc0e626e8c8e714f5dddf Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Fri, 1 Nov 2024 14:12:55 -0400 Subject: [PATCH] Remove unused classes and translations (related to Steam Mobile and Signal) --- assets/translations/bs.json | 2 - assets/translations/cs.json | 2 - assets/translations/da.json | 2 - assets/translations/de.json | 2 - assets/translations/en-EO.json | 2 - assets/translations/en.json | 2 - assets/translations/es.json | 2 - assets/translations/fa.json | 2 - assets/translations/fr.json | 2 - assets/translations/hu.json | 2 - assets/translations/id.json | 2 - assets/translations/it.json | 2 - assets/translations/ja.json | 2 - assets/translations/nl.json | 2 - assets/translations/pl.json | 2 - assets/translations/pt.json | 2 - assets/translations/ru.json | 2 - assets/translations/sv.json | 2 - assets/translations/tr.json | 2 - assets/translations/uk.json | 2 - assets/translations/vi.json | 2 - assets/translations/zh-Hant-TW.json | 2 - assets/translations/zh.json | 2 - lib/app_sources/signal.dart | 37 ----------------- lib/app_sources/steammobile.dart | 63 ----------------------------- lib/providers/source_provider.dart | 3 +- 26 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 lib/app_sources/signal.dart delete mode 100644 lib/app_sources/steammobile.dart diff --git a/assets/translations/bs.json b/assets/translations/bs.json index 2075ea7..803f1bc 100644 --- a/assets/translations/bs.json +++ b/assets/translations/bs.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Nije pronađena aplikacija s tim ID-om ili imenom", "reposHaveMultipleApps": "Repo-i mogu sadržavati više aplikacija", "fdroidThirdPartyRepo": "F-Droid Repo treće strane", - "steamMobile": "Steam Mobile", - "steamChat": "Razgovor na Steamu (chat)", "install": "Instaliraj", "markInstalled": "Označi kao instalirano", "update": "Nadogradi", diff --git a/assets/translations/cs.json b/assets/translations/cs.json index 0d6ec90..26d8b77 100644 --- a/assets/translations/cs.json +++ b/assets/translations/cs.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Žádná aplikace s tímto ID nebo názvem nebyla nalezena", "reposHaveMultipleApps": "Repozitáře mohou obsahovat více aplikací", "fdroidThirdPartyRepo": "F-Droid repozitář třetí strany", - "steamMobile": "Steam Mobile", - "steamChat": "Steam Chat", "install": "Nainstalujte", "markInstalled": "Označit jako nainstalovaný", "update": "Aktualizovat", diff --git a/assets/translations/da.json b/assets/translations/da.json index 3afdde2..68f4270 100644 --- a/assets/translations/da.json +++ b/assets/translations/da.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Ingen app med det ID eller navn blev fundet", "reposHaveMultipleApps": "Repos kan indeholde flere apps", "fdroidThirdPartyRepo": "F-Droid Tredjeparts-repo", - "steamMobile": "Steam Mobil", - "steamChat": "Steam Chat", "install": "Installer", "markInstalled": "Markér som installeret", "update": "Opdater", diff --git a/assets/translations/de.json b/assets/translations/de.json index 1b41fe1..45a427c 100644 --- a/assets/translations/de.json +++ b/assets/translations/de.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Es wurde keine App mit dieser ID oder diesem Namen gefunden", "reposHaveMultipleApps": "Repos können mehrere Apps enthalten", "fdroidThirdPartyRepo": "F-Droid-Drittanbieter-Repo", - "steamMobile": "Steam Mobile", - "steamChat": "Steam-Chat", "install": "Installieren", "markInstalled": "Als installiert markieren", "update": "Aktualisieren", diff --git a/assets/translations/en-EO.json b/assets/translations/en-EO.json index 1e64ed8..228fa15 100644 --- a/assets/translations/en-EO.json +++ b/assets/translations/en-EO.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Neniu apo estas trovita kun tiu identigilo aŭ nomo", "reposHaveMultipleApps": "Deponejoj povas enhavi plurajn apojn", "fdroidThirdPartyRepo": "Tria deponejo de F-Droid", - "steamMobile": "Telefona Steam", - "steamChat": "Steam Babilejo", "install": "Instali", "markInstalled": "Marki kiel instalita", "update": "Ĝisdatigi", diff --git a/assets/translations/en.json b/assets/translations/en.json index 36f4673..1c0fbd2 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "No App was found with that ID or Name", "reposHaveMultipleApps": "Repos may contain multiple Apps", "fdroidThirdPartyRepo": "F-Droid Third-Party Repo", - "steamMobile": "Steam Mobile", - "steamChat": "Steam Chat", "install": "Install", "markInstalled": "Mark Installed", "update": "Update", diff --git a/assets/translations/es.json b/assets/translations/es.json index 0f53c19..5f6082b 100644 --- a/assets/translations/es.json +++ b/assets/translations/es.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "No se han encontrado aplicaciones con ese ID o nombre", "reposHaveMultipleApps": "Los repositorios pueden contener varias aplicaciones", "fdroidThirdPartyRepo": "Repositorio de terceros F-Droid", - "steamMobile": "Steam para móviles", - "steamChat": "Chat de Steam", "install": "Instalar", "markInstalled": "Marcar como instalada", "update": "Actualizar", diff --git a/assets/translations/fa.json b/assets/translations/fa.json index 6c8ec08..3bf1556 100644 --- a/assets/translations/fa.json +++ b/assets/translations/fa.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "هیچ برنامه ای با آن شناسه یا نام یافت نشد", "reposHaveMultipleApps": "مخازن ممکن است شامل چندین برنامه باشد", "fdroidThirdPartyRepo": "مخازن شخص ثالث F-Droid", - "steamMobile": "استیم موبایل", - "steamChat": "چت استیم", "install": "نصب", "markInstalled": "علامت گذاری به عنوان نصب شده", "update": "به روز رسانی", diff --git a/assets/translations/fr.json b/assets/translations/fr.json index 24d83cd..fcce235 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Aucune application n'a été trouvée avec cet identifiant ou ce nom", "reposHaveMultipleApps": "Les dépôts peuvent contenir plusieurs applications", "fdroidThirdPartyRepo": "Dépôt tiers F-Droid", - "steamMobile": "Application mobile Steam", - "steamChat": "Steam Chat", "install": "Installer", "markInstalled": "Marquer comme étant installé", "update": "Mettre à jour", diff --git a/assets/translations/hu.json b/assets/translations/hu.json index 2da5bfa..53bcb47 100644 --- a/assets/translations/hu.json +++ b/assets/translations/hu.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Nem található alkalmazás ezzel az azonosítóval vagy névvel", "reposHaveMultipleApps": "A tárolók több alkalmazást is tartalmazhatnak", "fdroidThirdPartyRepo": "F-Droid harmadik féltől származó tároló", - "steamMobile": "Steam Mobil", - "steamChat": "Steam Chat", "install": "Telepítés", "markInstalled": "Telepítettnek jelölés", "update": "Frissítés", diff --git a/assets/translations/id.json b/assets/translations/id.json index 04492cd..54b1cd2 100644 --- a/assets/translations/id.json +++ b/assets/translations/id.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Tidak ada aplikasi yang ditemukan dengan ID atau nama tersebut", "reposHaveMultipleApps": "Repositori dapat berisi beberapa aplikasi", "fdroidThirdPartyRepo": "Repositori pihak ketiga F-Droid", - "steamMobile": "Steam Mobile", - "steamChat": "Obrolan Steam", "install": "Pasang", "markInstalled": "Tandai terpasang", "update": "perbarui", diff --git a/assets/translations/it.json b/assets/translations/it.json index 27edb13..2348f7b 100644 --- a/assets/translations/it.json +++ b/assets/translations/it.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Non è stata trovata alcuna app con quell'ID o nome", "reposHaveMultipleApps": "I repository possono contenere più app", "fdroidThirdPartyRepo": "Repository F-Droid di terze parti", - "steamMobile": "Mobile a vapore", - "steamChat": "Chat di vapore", "install": "Installa", "markInstalled": "Contrassegna come installata", "update": "Aggiorna", diff --git a/assets/translations/ja.json b/assets/translations/ja.json index eaf8e3d..3d83631 100644 --- a/assets/translations/ja.json +++ b/assets/translations/ja.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした", "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります", "fdroidThirdPartyRepo": "F-Droid サードパーティリポジトリ", - "steamMobile": "Steamモバイル", - "steamChat": "Steamチャット", "install": "インストール", "markInstalled": "インストール済みとしてマークする", "update": "アップデート", diff --git a/assets/translations/nl.json b/assets/translations/nl.json index 0ba4b98..9f249a9 100644 --- a/assets/translations/nl.json +++ b/assets/translations/nl.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Er is geen app gevonden met dat ID of die naam", "reposHaveMultipleApps": "Repositories kunnen meerdere apps bevatten", "fdroidThirdPartyRepo": "F-Droid Repository voor derden", - "steamMobile": "Steam Mobile", - "steamChat": "Steam Chat", "install": "Installeren", "markInstalled": "Als geïnstalleerd markeren", "update": "Bijwerken", diff --git a/assets/translations/pl.json b/assets/translations/pl.json index 9bbf36f..0354101 100644 --- a/assets/translations/pl.json +++ b/assets/translations/pl.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Nie znaleziono aplikacji o tym identyfikatorze lub nazwie", "reposHaveMultipleApps": "Repozytoria mogą zawierać wiele aplikacji", "fdroidThirdPartyRepo": "Zewnętrzne repo F-Droid", - "steamMobile": "Mobilny Steam", - "steamChat": "Steam Chat", "install": "Instaluj", "markInstalled": "Oznacz jako zainstalowane", "update": "Zaktualizuj", diff --git a/assets/translations/pt.json b/assets/translations/pt.json index 877db80..1400222 100644 --- a/assets/translations/pt.json +++ b/assets/translations/pt.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Nenhum aplicativo foi encontrado com esse ID ou nome", "reposHaveMultipleApps": "Repositórios podem conter múltiplos aplicativos", "fdroidThirdPartyRepo": "Repositórios de terceiros F-Droid", - "steamMobile": "Steam para celular", - "steamChat": "Chat do Steam", "install": "Instalar", "markInstalled": "Marcar instalado", "update": "Atualizar", diff --git a/assets/translations/ru.json b/assets/translations/ru.json index 9674bd2..1dacc45 100644 --- a/assets/translations/ru.json +++ b/assets/translations/ru.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Приложение с таким ID или названием не было найдено", "reposHaveMultipleApps": "В хранилище несколько приложений", "fdroidThirdPartyRepo": "Сторонние репозитории F-Droid", - "steamMobile": "Приложение Steam", - "steamChat": "Steam Chat", "install": "Установить", "markInstalled": "Пометить как установленное", "update": "Обновить", diff --git a/assets/translations/sv.json b/assets/translations/sv.json index 9412d2d..e4626c9 100644 --- a/assets/translations/sv.json +++ b/assets/translations/sv.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Ingen App funnen med det namnet eller ID", "reposHaveMultipleApps": "Förråd kan innehålla flera ApparR", "fdroidThirdPartyRepo": "F-Droid Tredjeparts Förråd", - "steamMobile": "Steam Mobile", - "steamChat": "Steam Chat", "install": "Installera", "markInstalled": "Märk Installerad", "update": "Uppdatera", diff --git a/assets/translations/tr.json b/assets/translations/tr.json index f0b81b5..acbe7ee 100644 --- a/assets/translations/tr.json +++ b/assets/translations/tr.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Bu kimlik veya ada sahip bir uygulama bulunamadı", "reposHaveMultipleApps": "Depolar birden fazla uygulama içerebilir", "fdroidThirdPartyRepo": "F-Droid Üçüncü Parti Depo", - "steamMobile": "Steam Mobil", - "steamChat": "Steam Sohbet", "install": "Yükle", "markInstalled": "Yüklendi olarak İşaretle", "update": "Güncelle", diff --git a/assets/translations/uk.json b/assets/translations/uk.json index 61d3a6e..5fd3542 100644 --- a/assets/translations/uk.json +++ b/assets/translations/uk.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Застосунок з таким ідентифікатором або назвою не знайдено", "reposHaveMultipleApps": "Сховища можуть містити кілька застосунків", "fdroidThirdPartyRepo": "F-Droid Стороннє сховище", - "steamMobile": "Мобільний Steam", - "steamChat": "Чат Steam", "install": "Встановити", "markInstalled": "Позначити як встановлене", "update": "Оновити", diff --git a/assets/translations/vi.json b/assets/translations/vi.json index 716606f..111e8c5 100644 --- a/assets/translations/vi.json +++ b/assets/translations/vi.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "Không tìm thấy ứng dụng nào có ID hoặc tên đó", "reposHaveMultipleApps": "Kho có thể chứa nhiều Ứng dụng", "fdroidThirdPartyRepo": "Kho lưu trữ bên thứ ba F-Droid", - "steamMobile": "Điện thoại di động hơi nước", - "steamChat": "Trò chuyện hơi nước", "install": "Cài đặt", "markInstalled": "Đánh dấu là đã cài đặt", "update": "Cập nhật", diff --git a/assets/translations/zh-Hant-TW.json b/assets/translations/zh-Hant-TW.json index 0efbae5..dbea296 100644 --- a/assets/translations/zh-Hant-TW.json +++ b/assets/translations/zh-Hant-TW.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "找不到具有該 ID 或名稱的應用程式", "reposHaveMultipleApps": "倉庫可能包含多個應用程式", "fdroidThirdPartyRepo": "F-Droid 第三方倉庫", - "steamMobile": "Steam 行動版", - "steamChat": "Steam 聊天", "install": "安裝", "markInstalled": "標記為已安裝", "update": "更新", diff --git a/assets/translations/zh.json b/assets/translations/zh.json index e4ac296..85c03d4 100644 --- a/assets/translations/zh.json +++ b/assets/translations/zh.json @@ -179,8 +179,6 @@ "appWithIdOrNameNotFound": "未找到符合此 ID 或名称的应用", "reposHaveMultipleApps": "存储库中可能包含多个应用", "fdroidThirdPartyRepo": "F-Droid 第三方存储库", - "steamMobile": "Steam Mobile", - "steamChat": "Steam Chat", "install": "安装", "markInstalled": "标记为已安装", "update": "更新", diff --git a/lib/app_sources/signal.dart b/lib/app_sources/signal.dart deleted file mode 100644 index 6bbaddb..0000000 --- a/lib/app_sources/signal.dart +++ /dev/null @@ -1,37 +0,0 @@ -import 'dart:convert'; -import 'package:http/http.dart'; -import 'package:obtainium/custom_errors.dart'; -import 'package:obtainium/providers/source_provider.dart'; - -class Signal extends AppSource { - Signal() { - hosts = ['signal.org']; - } - - @override - String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) { - return 'https://${hosts[0]}'; - } - - @override - Future getLatestAPKDetails( - String standardUrl, - Map additionalSettings, - ) async { - Response res = await sourceRequest( - 'https://updates.${hosts[0]}/android/latest.json', additionalSettings); - if (res.statusCode == 200) { - var json = jsonDecode(res.body); - String? apkUrl = json['url']; - List apkUrls = apkUrl == null ? [] : [apkUrl]; - String? version = json['versionName']; - if (version == null) { - throw NoVersionError(); - } - return APKDetails( - version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal')); - } else { - throw getObtainiumHttpError(res); - } - } -} diff --git a/lib/app_sources/steammobile.dart b/lib/app_sources/steammobile.dart deleted file mode 100644 index 8e6c11e..0000000 --- a/lib/app_sources/steammobile.dart +++ /dev/null @@ -1,63 +0,0 @@ -import 'package:easy_localization/easy_localization.dart'; -import 'package:html/parser.dart'; -import 'package:http/http.dart'; -import 'package:obtainium/components/generated_form.dart'; -import 'package:obtainium/custom_errors.dart'; -import 'package:obtainium/providers/source_provider.dart'; - -class SteamMobile extends AppSource { - SteamMobile() { - hosts = ['store.steampowered.com']; - name = 'Steam'; - additionalSourceAppSpecificSettingFormItems = [ - [ - GeneratedFormDropdown('app', apks.entries.toList(), - label: tr('app'), defaultValue: apks.entries.toList()[0].key) - ] - ]; - } - - final apks = {'steam': tr('steamMobile'), 'steam-chat-app': tr('steamChat')}; - - @override - String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) { - return 'https://${hosts[0]}'; - } - - @override - Future getLatestAPKDetails( - String standardUrl, - Map additionalSettings, - ) async { - Response res = - await sourceRequest('https://${hosts[0]}/mobile', additionalSettings); - if (res.statusCode == 200) { - var apkNamePrefix = additionalSettings['app'] as String?; - if (apkNamePrefix == null) { - throw NoReleasesError(); - } - String apkInURLRegexPattern = - '/$apkNamePrefix-([0-9]+\\.)*[0-9]+\\.apk\$'; - var links = parse(res.body) - .querySelectorAll('a') - .map((e) => e.attributes['href'] ?? '') - .where((e) => RegExp('https://.*$apkInURLRegexPattern').hasMatch(e)) - .toList(); - - if (links.isEmpty) { - throw NoReleasesError(); - } - var versionMatch = RegExp(apkInURLRegexPattern).firstMatch(links[0]); - if (versionMatch == null) { - throw NoVersionError(); - } - var version = links[0].substring( - versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4); - var apkUrls = [links[0]]; - return APKDetails(version, getApkUrlsFromUrls(apkUrls), - AppNames(name, apks[apkNamePrefix]!)); - } else { - throw getObtainiumHttpError(res); - } - } -} diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart index d868057..cfd8c09 100644 --- a/lib/providers/source_provider.dart +++ b/lib/providers/source_provider.dart @@ -25,7 +25,6 @@ import 'package:obtainium/app_sources/jenkins.dart'; import 'package:obtainium/app_sources/neutroncode.dart'; import 'package:obtainium/app_sources/sourceforge.dart'; import 'package:obtainium/app_sources/sourcehut.dart'; -import 'package:obtainium/app_sources/steammobile.dart'; import 'package:obtainium/app_sources/telegramapp.dart'; import 'package:obtainium/app_sources/tencent.dart'; import 'package:obtainium/app_sources/uptodown.dart'; @@ -182,7 +181,7 @@ appJSONCompatibilityModifiers(Map json) { }).toList(); } // Steam source apps should be converted to HTML (#1244) - var legacySteamSourceApps = SteamMobile().apks.keys; + var legacySteamSourceApps = ['steam', 'steam-chat-app']; if (legacySteamSourceApps.contains(additionalSettings['app'] ?? '')) { json['url'] = '${json['url']}/mobile'; var replacementAdditionalSettings = getDefaultValuesFromFormItems(