Fixed bug for FDroid repos with uppercase in AppID

Update it.json

README.md

@@ -16,6 +16,7 @@ Currently supported App sources:
 - [SourceForge](https://sourceforge.net/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
 - Third Party F-Droid Repos (URLs ending with `/fdroid/repo`)
+- [Steam](https://store.steampowered.com/mobile)
 
 ## Limitations
 - App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.

assets/translations/en.json

@@ -185,6 +185,9 @@
     "appWithIdOrNameNotFound": "No App was found with that ID or Name",
     "reposHaveMultipleApps": "Repos may contain multiple Apps",
     "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/it.json

@@ -52,7 +52,7 @@
     "additionalOptsFor": "Opzioni aggiuntive per {}",
     "supportedSourcesBelow": "Fonti supportate:",
     "trackOnlyInBrackets": "(Solo-Monitoraggio)",
-    "searchableInBrackets": "(Ricercabile)",
+    "searchableInBrackets": "(ricercabile)",
     "appsString": "App",
     "noApps": "Nessuna App",
     "noAppsForFilter": "Nessuna App per i filtri selezionati",
@@ -181,10 +181,13 @@
     "removeAppQuestion": "Rimuovere App?",
     "yesMarkUpdated": "Sì, contrassegna come aggiornato",
     "fdroid": "F-Droid",
-    "appIdOrName": "App ID or Name",
-    "appWithIdOrNameNotFound": "No App was found with that ID or Name",
-    "reposHaveMultipleApps": "Repos may contain multiple Apps",
-    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "appIdOrName": "ID o nome dell'App",
+    "appWithIdOrNameNotFound": "Non è stata trovata alcuna App con quell'ID o nome",
+    "reposHaveMultipleApps": "I repository possono contenere più App",
+    "fdroidThirdPartyRepo": "Repository di terze parti di F-Droid",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/zh.json

@@ -39,10 +39,10 @@
     "app": "应用程序",
     "appsFromSourceAreTrackOnly": "来自此来源的应用为仅追踪",
     "youPickedTrackOnly": "你已选择仅追踪选项",
-    "trackOnlyAppDescription": "The App will be tracked for updates, but Obtainium will not be able to download or install it.",
+    "trackOnlyAppDescription": "该应用程序将被跟踪更新，但 Obtainium 无法下载或安装它",
     "cancelled": "已取消",
     "appAlreadyAdded": "此应用程序已被添加",
-    "alreadyUpToDateQuestion": "App Already up to Date?",
+    "alreadyUpToDateQuestion": "应用已是最新？",
     "addApp": "添加应用",
     "appSourceURL": "应用来源 URL",
     "error": "错误",
@@ -123,21 +123,21 @@
     "followSystem": "跟随系统",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
-    "appSortBy": "应用排列方式",
-    "authorName": "作者/名字",
-    "nameAuthor": "名字/作者",
-    "asAdded": "以添加顺序",
-    "appSortOrder": "以排列顺序",
+    "appSortBy": "排列方式",
+    "authorName": "作者 / 名字",
+    "nameAuthor": "名字 / 作者",
+    "asAdded": "添加顺序",
+    "appSortOrder": "排列顺序",
     "ascending": "升序",
     "descending": "降序",
     "bgUpdateCheckInterval": "后台更新检查间隔",
-    "neverManualOnly": "从不 - 仅手动",
+    "neverManualOnly": "手动",
     "appearance": "外观",
     "showWebInAppView": "在应用来源页显示网页",
     "pinUpdates": "将需要更新的应用固定到顶部",
-    "updates": "已更新",
-    "sourceSpecific": "指定源",
-    "appSource": "应用源",
+    "updates": "检查间隔",
+    "sourceSpecific": "Github 访问令牌",
+    "appSource": "源代码",
     "noLogs": "无日志",
     "appLogs": "应用日志",
     "close": "关闭",
@@ -170,21 +170,24 @@
     "pleaseAllowInstallPerm": "请允许 Obtainium 安装应用程序",
     "trackOnly": "仅追踪",
     "errorWithHttpStatusCode": "错误 {}",
-    "versionCorrectionDisabled": "Version correction disabled (plugin doesn't seem to work)",
-    "unknown": "Unknown",
-    "none": "None",
-    "never": "Never",
-    "latestVersionX": "Latest Version: {}",
-    "installedVersionX": "Installed Version: {}",
-    "lastUpdateCheckX": "Last Update Check: {}",
-    "remove": "Remove",
-    "removeAppQuestion": "Remove App?",
-    "yesMarkUpdated": "Yes, Mark as Updated",
+    "versionCorrectionDisabled": "禁用版本更正（插件似乎未起作用）",
+    "unknown": "未知",
+    "none": "无",
+    "never": "从不",
+    "latestVersionX": "最新: {}",
+    "installedVersionX": "已安装: {}",
+    "lastUpdateCheckX": "最后检查: {}",
+    "remove": "删除",
+    "removeAppQuestion": "删除应用？",
+    "yesMarkUpdated": "'是的，标为已更新",
     "fdroid": "F-Droid",
-    "appIdOrName": "App ID or Name",
-    "appWithIdOrNameNotFound": "No App was found with that ID or Name",
-    "reposHaveMultipleApps": "Repos may contain multiple Apps",
-    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "appIdOrName": "应用 ID 或名称",
+    "appWithIdOrNameNotFound": "没有发现具有此 ID 或名称的应用",
+    "reposHaveMultipleApps": "来源可能包含多个应用",
+    "fdroidThirdPartyRepo": "F-Droid 第三方源",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/steammobile.dart

@@ -0,0 +1,69 @@
+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() {
+    host = 'store.steampowered.com';
+    name = tr('steam');
+    additionalSourceAppSpecificFormItems = [
+      [
+        GeneratedFormItem(
+            label: tr('app'),
+            key: 'app',
+            required: true,
+            opts: apks.entries.toList())
+      ]
+    ];
+  }
+
+  final apks = {'steam': tr('steamMobile'), 'steam-chat-app': tr('steamChat')};
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData,
+      {bool trackOnly = false}) async {
+    Response res = await get(Uri.parse('https://$host/mobile'));
+    if (res.statusCode == 200) {
+      var apkNamePrefix = findGeneratedFormValueByKey(
+          additionalSourceAppSpecificFormItems
+              .reduce((value, element) => [...value, ...element]),
+          additionalData,
+          'app');
+      if (apkNamePrefix == null) {
+        throw NoReleasesError();
+      }
+      String apkInURLRegexPattern = '/$apkNamePrefix-[^/]+\\.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, apkUrls, AppNames(name, apks[apkNamePrefix]!));
+    } else {
+      throw NoReleasesError();
+    }
+  }
+}

lib/components/generated_form.dart

@@ -16,7 +16,7 @@ class GeneratedFormItem {
   late String id;
   late List<Widget> belowWidgets;
   late String? hint;
-  late List<String>? opts;
+  late List<MapEntry<String, String>>? opts;
 
   GeneratedFormItem(
       {this.label = 'Input',
@@ -86,7 +86,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
               return j < widget.defaultValues.length
                   ? widget.defaultValues[j++]
                   : e.opts != null
-                      ? e.opts!.first
+                      ? e.opts!.first.key
                       : '';
             }).toList())
         .toList();
@@ -130,14 +130,15 @@ class _GeneratedFormState extends State<GeneratedForm> {
             return Text(tr('dropdownNoOptsError'));
           }
           return DropdownButtonFormField(
-              decoration: InputDecoration(labelText: tr('colour')),
+              decoration: InputDecoration(labelText: e.value.label),
               value: values[row.key][e.key],
               items: e.value.opts!
-                  .map((e) => DropdownMenuItem(value: e, child: Text(e)))
+                  .map((e) =>
+                      DropdownMenuItem(value: e.key, child: Text(e.value)))
                   .toList(),
               onChanged: (value) {
                 setState(() {
-                  values[row.key][e.key] = value ?? e.value.opts!.first;
+                  values[row.key][e.key] = value ?? e.value.opts!.first.key;
                   someValueChanged();
                 });
               });

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.8.13';
+const String currentVersion = '0.8.15';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -87,7 +87,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
       if (e is RateLimitError || e is SocketException) {
         var remainingMinutes = e is RateLimitError ? e.remainingMinutes : 15;
         logs.add(plural('bgUpdateGotErrorRetryInMinutes', remainingMinutes,
-            args: [(e as AppSource).name, remainingMinutes.toString()]));
+            args: [e.toString(), remainingMinutes.toString()]));
         AndroidAlarmManager.oneShot(Duration(minutes: remainingMinutes),
             Random().nextInt(pow(2, 31) as int), bgUpdateCheck, params: {
           'ignoreAfterMicroseconds': nextIgnoreAfter.microsecondsSinceEpoch

lib/providers/apps_provider.dart

@@ -274,9 +274,14 @@ class AppsProvider with ChangeNotifier {
             );
           });
     }
+    getHost(String url) {
+      var temp = Uri.parse(url).host.split('.');
+      return temp.sublist(temp.length - 2).join('.');
+    }
+
     // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
     if (apkUrl != null &&
-        Uri.parse(apkUrl).origin != Uri.parse(app.url).origin &&
+        getHost(apkUrl) != getHost(app.url) &&
         context != null) {
       if (await showDialog(
               context: context,

lib/providers/source_provider.dart

@@ -8,13 +8,14 @@ import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
-import 'package:obtainium/app_sources/fdroidRepo.dart';
+import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
+import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -108,11 +109,11 @@ class App {
 
 // Ensure the input is starts with HTTPS and has no WWW
 preStandardizeUrl(String url) {
-  url = url.toLowerCase();
-  if (url.indexOf('http://') != 0 && url.indexOf('https://') != 0) {
+  if (url.toLowerCase().indexOf('http://') != 0 &&
+      url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
   }
-  if (url.indexOf('https://www.') == 0) {
+  if (url.toLowerCase().indexOf('https://www.') == 0) {
     url = 'https://${url.substring(12)}';
   }
   url = url
@@ -212,7 +213,8 @@ class SourceProvider {
     Signal(),
     SourceForge(),
     APKMirror(),
-    FDroidRepo()
+    FDroidRepo(),
+    SteamMobile()
   ];
 
   // Add more mass url source classes here so they are available via the service
@@ -247,7 +249,7 @@ class SourceProvider {
   bool ifSourceAppsRequireAdditionalData(AppSource source) {
     for (var row in source.additionalSourceAppSpecificFormItems) {
       for (var element in row) {
-        if (element.required) {
+        if (element.required && element.opts == null) {
           return true;
         }
       }

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: 0.8.13+77 # When changing this, update the tag in main() accordingly
+version: 0.8.15+79 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'