Increment version

With partial APKs avoided (#113)

lib/app_sources/fdroid.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
@@ -28,41 +30,24 @@ class FDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
+    return Uri.parse(standardUrl).pathSegments.last;
+  }
 
-  @override
-  Future<APKDetails> getLatestAPKDetails(
-      String standardUrl, List<String> additionalData) async {
-    Response res = await get(Uri.parse(standardUrl));
+  APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
+      Response res, String apkUrlPrefix) {
     if (res.statusCode == 200) {
-      var releases = parse(res.body).querySelectorAll('.package-version');
+      List<dynamic> releases = jsonDecode(res.body)['packages'] ?? [];
       if (releases.isEmpty) {
         throw NoReleasesError();
       }
-      String? latestVersion = releases[0]
-          .querySelector('.package-version-header b')
-          ?.innerHtml
-          .split(' ')
-          .sublist(1)
-          .join(' ');
+      String? latestVersion = releases[0]['versionName'];
       if (latestVersion == null) {
         throw NoVersionError();
       }
       List<String> apkUrls = releases
-          .where((element) =>
-              element
-                  .querySelector('.package-version-header b')
-                  ?.innerHtml
-                  .split(' ')
-                  .sublist(1)
-                  .join(' ') ==
-              latestVersion)
-          .map((e) =>
-              e
-                  .querySelector('.package-version-download a')
-                  ?.attributes['href'] ??
-              '')
-          .where((element) => element.isNotEmpty)
+          .where((element) => element['versionName'] == latestVersion)
+          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
           .toList();
       if (apkUrls.isEmpty) {
         throw NoAPKError();
@@ -73,6 +58,15 @@ class FDroid extends AppSource {
     }
   }
 
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    String? appId = tryInferringAppId(standardUrl);
+    return getAPKUrlsFromFDroidPackagesAPIResponse(
+        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
+        'https://f-droid.org/repo/$appId');
+  }
+
   @override
   AppNames getAppNames(String standardUrl) {
     return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last);

lib/app_sources/github.dart

@@ -105,9 +105,6 @@ class GitHub extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
@@ -167,14 +164,8 @@ class GitHub extends AppSource {
       }
       return APKDetails(version, targetRelease['apkUrls']);
     } else {
-      if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw RateLimitError(
-            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
-                    60000000)
-                .round());
-      }
-
-      throw NoReleasesError();
+      rateLimitErrorCheck(res);
+      throw getObtainiumHttpError(res);
     }
   }
 
@@ -200,15 +191,17 @@ class GitHub extends AppSource {
       }
       return urlsWithDescriptions;
     } else {
+      rateLimitErrorCheck(res);
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  rateLimitErrorCheck(Response res) {
     if (res.headers['x-ratelimit-remaining'] == '0') {
       throw RateLimitError(
           (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
                   60000000)
               .round());
     }
-      throw ObtainiumError(
-          res.reasonPhrase ?? 'Error ${res.statusCode.toString()}',
-          unexpected: true);
-    }
   }
 }

lib/app_sources/gitlab.dart

@@ -23,9 +23,6 @@ class GitLab extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/-/releases';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/izzyondroid.dart

@@ -1,5 +1,6 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -22,41 +23,18 @@ class IzzyOnDroid extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
+  String? tryInferringAppId(String standardUrl) {
+    return FDroid().tryInferringAppId(standardUrl);
+  }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {
-    Response res = await get(Uri.parse(standardUrl));
-    if (res.statusCode == 200) {
-      var parsedHtml = parse(res.body);
-      var multipleVersionApkUrls = parsedHtml
-          .querySelectorAll('a')
-          .where((element) =>
-              element.attributes['href']?.toLowerCase().endsWith('.apk') ??
-              false)
-          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
-          .toList();
-      if (multipleVersionApkUrls.isEmpty) {
-        throw NoAPKError();
-      }
-      var version = parsedHtml
-          .querySelector('#keydata')
-          ?.querySelectorAll('b')
-          .where(
-              (element) => element.innerHtml.toLowerCase().contains('version'))
-          .toList()[0]
-          .parentNode
-          ?.parentNode
-          ?.children[1]
-          .innerHtml;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(version, [multipleVersionApkUrls[0]]);
-    } else {
-      throw NoReleasesError();
-    }
+    String? appId = tryInferringAppId(standardUrl);
+    return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(
+        await get(
+            Uri.parse('https://apt.izzysoft.de/fdroid/api/v1/packages/$appId')),
+        'https://android.izzysoft.de/frepo/$appId');
   }
 
   @override

lib/app_sources/mullvad.dart

@@ -22,9 +22,6 @@ class Mullvad extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       'https://github.com/mullvad/mullvadvpn-app/blob/master/CHANGELOG.md';
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/signal.dart

@@ -16,9 +16,6 @@ class Signal extends AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/app_sources/sourceforge.dart

@@ -21,9 +21,6 @@ class SourceForge extends AppSource {
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) => null;
 
-  @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
       String standardUrl, List<String> additionalData) async {

lib/main.dart

@@ -16,7 +16,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 
-const String currentVersion = '0.7.2';
+const String currentVersion = '0.7.4';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/mass_app_sources/githubstars.dart

@@ -27,14 +27,9 @@ class GitHubStars implements MassAppUrlSource {
       }
       return urlsWithDescriptions;
     } else {
-      if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw RateLimitError(
-            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
-                    60000000)
-                .round());
-      }
-
-      throw ObtainiumError('Unable to find user\'s starred repos');
+      var gh = GitHub();
+      gh.rateLimitErrorCheck(res);
+      throw getObtainiumHttpError(res);
     }
   }
 

lib/pages/add_app.dart

@@ -115,11 +115,15 @@ class _AddAppPageState extends State<AddAppPage> {
                                                     additionalData);
                                             await settingsProvider
                                                 .getInstallPermission();
+                                            // Only download the APK here if you need to for the package ID
+                                            if (sourceProvider
+                                                .isTempId(app.id)) {
                                               // ignore: use_build_context_synchronously
                                               var apkUrl = await appsProvider
                                                   .confirmApkUrl(app, context);
                                               if (apkUrl == null) {
-                                              throw ObtainiumError('Cancelled');
+                                                throw ObtainiumError(
+                                                    'Cancelled');
                                               }
                                               app.preferredApkIndex =
                                                   app.apkUrls.indexOf(apkUrl);
@@ -127,6 +131,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                                   await appsProvider
                                                       .downloadApp(app);
                                               app.id = downloadedApk.appId;
+                                            }
                                             if (appsProvider.apps
                                                 .containsKey(app.id)) {
                                               throw ObtainiumError(

lib/providers/apps_provider.dart

@@ -65,7 +65,9 @@ class AppsProvider with ChangeNotifier {
         // Delete existing APKs
         (await getExternalStorageDirectory())
             ?.listSync()
-            .where((element) => element.path.endsWith('.apk'))
+            .where((element) =>
+                element.path.endsWith('.apk') ||
+                element.path.endsWith('.apk.part'))
             .forEach((apk) {
           apk.delete();
         });
@@ -73,20 +75,21 @@ class AppsProvider with ChangeNotifier {
     }
   }
 
-  downloadFile(String url, String fileName, Function? onProgress) async {
+  downloadFile(String url, String fileName, Function? onProgress,
+      {bool useExisting = true}) async {
     var destDir = (await getExternalStorageDirectory())!.path;
     StreamedResponse response =
         await Client().send(Request('GET', Uri.parse(url)));
     File downloadedFile = File('$destDir/$fileName');
-
-    if (downloadedFile.existsSync()) {
-      downloadedFile.deleteSync();
+    if (!(downloadedFile.existsSync() && useExisting)) {
+      File tempDownloadedFile = File('${downloadedFile.path}.part');
+      if (tempDownloadedFile.existsSync()) {
+        tempDownloadedFile.deleteSync();
       }
       var length = response.contentLength;
       var received = 0;
       double? progress;
-    var sink = downloadedFile.openWrite();
-
+      var sink = tempDownloadedFile.openWrite();
       await response.stream.map((s) {
         received += s.length;
         progress = (length != null ? received / length * 100 : 30);
@@ -95,17 +98,17 @@ class AppsProvider with ChangeNotifier {
         }
         return s;
       }).pipe(sink);
-
       await sink.close();
       progress = null;
       if (onProgress != null) {
         onProgress(progress);
       }
-
       if (response.statusCode != 200) {
-      downloadedFile.deleteSync();
+        tempDownloadedFile.deleteSync();
         throw response.reasonPhrase ?? 'Unknown Error';
       }
+      tempDownloadedFile.renameSync(downloadedFile.path);
+    }
     return downloadedFile;
   }
 
@@ -424,22 +427,28 @@ class AppsProvider with ChangeNotifier {
     }
     loadingApps = true;
     notifyListeners();
-    List<FileSystemEntity> appFiles = (await getAppsDir())
+    List<App> newApps = (await getAppsDir())
         .listSync()
         .where((item) => item.path.toLowerCase().endsWith('.json'))
+        .map((e) => App.fromJson(jsonDecode(File(e.path).readAsStringSync())))
         .toList();
-    apps.clear();
+    var idsToDelete = apps.values
+        .map((e) => e.app.id)
+        .toSet()
+        .difference(newApps.map((e) => e.id).toSet());
+    for (var id in idsToDelete) {
+      apps.remove(id);
+    }
     var sp = SourceProvider();
     List<List<String>> errors = [];
-    for (int i = 0; i < appFiles.length; i++) {
-      App app =
-          App.fromJson(jsonDecode(File(appFiles[i].path).readAsStringSync()));
-      var info = await getInstalledInfo(app.id);
+    for (int i = 0; i < newApps.length; i++) {
+      var info = await getInstalledInfo(newApps[i].id);
       try {
-        sp.getSource(app.url);
-        apps.putIfAbsent(app.id, () => AppInMemory(app, null, info));
+        sp.getSource(newApps[i].url);
+        apps.putIfAbsent(
+            newApps[i].id, () => AppInMemory(newApps[i], null, info));
       } catch (e) {
-        errors.add([app.id, app.name, e.toString()]);
+        errors.add([newApps[i].id, newApps[i].name, e.toString()]);
       }
     }
     if (errors.isNotEmpty) {

lib/providers/source_provider.dart

@@ -4,6 +4,7 @@
 import 'dart:convert';
 
 import 'package:html/dom.dart';
+import 'package:http/http.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
@@ -154,14 +155,23 @@ class AppSource {
     throw NotImplementedError();
   }
 
-  Future<String> apkUrlPrefetchModifier(String apkUrl) {
-    throw NotImplementedError();
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+    return apkUrl;
   }
 
   bool canSearch = false;
   Future<Map<String, String>> search(String query) {
     throw NotImplementedError();
   }
+
+  String? tryInferringAppId(String standardUrl) {
+    return null;
+  }
+}
+
+ObtainiumError getObtainiumHttpError(Response res) {
+  return ObtainiumError(
+      res.reasonPhrase ?? 'Error ${res.statusCode.toString()}');
 }
 
 abstract class MassAppUrlSource {
@@ -234,7 +244,9 @@ class SourceProvider {
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalData);
     return App(
-        id ?? generateTempID(names, source),
+        id ??
+            source.tryInferringAppId(standardUrl) ??
+            generateTempID(names, source),
         standardUrl,
         names.author[0].toUpperCase() + names.author.substring(1),
         name.trim().isNotEmpty

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.7.2+58 # When changing this, update the tag in main() accordingly
+version: 0.7.4+60 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'