Merge pull request #366 from ImranR98/dev

Open changelog inside App for supported Sources (#82)

README.md

@@ -19,6 +19,8 @@ Currently supported App sources:
 - Third Party F-Droid Repos
   - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
+- [Telegram App](https://telegram.org)
+- [Neutron Code](https://neutroncode.com)
 - "HTML" (Fallback)
   - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)
 

lib/app_sources/codeberg.dart

@@ -118,9 +118,11 @@ class Codeberg extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
+      var changeLog = targetRelease['body'].toString();
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
           getAppNames(standardUrl),
-          releaseDate: releaseDate);
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/fdroid.dart

@@ -27,9 +27,6 @@ class FDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {

lib/app_sources/github.dart

@@ -160,9 +160,11 @@ class GitHub extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
+      var changeLog = targetRelease['body'].toString();
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
           getAppNames(standardUrl),
-          releaseDate: releaseDate);
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
       rateLimitErrorCheck(res);
       throw getObtainiumHttpError(res);

lib/app_sources/html.dart

@@ -10,9 +10,6 @@ class HTML extends AppSource {
     return url;
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/izzyondroid.dart

@@ -18,9 +18,6 @@ class IzzyOnDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {

lib/app_sources/neutroncode.dart

@@ -0,0 +1,111 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class NeutronCode extends AppSource {
+  NeutronCode() {
+    host = 'neutroncode.com';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => standardUrl;
+
+  String monthNameToNumberString(String s) {
+    switch (s.toLowerCase()) {
+      case 'january':
+        return '01';
+      case 'february':
+        return '02';
+      case 'march':
+        return '03';
+      case 'april':
+        return '04';
+      case 'may':
+        return '05';
+      case 'june':
+        return '06';
+      case 'july':
+        return '07';
+      case 'august':
+        return '08';
+      case 'september':
+        return '09';
+      case 'october':
+        return '10';
+      case 'november':
+        return '11';
+      case 'december':
+        return '12';
+      default:
+        throw ArgumentError('Invalid month name: $s');
+    }
+  }
+
+  customDateParse(String dateString) {
+    List<String> parts = dateString.split(' ');
+    if (parts.length != 3) {
+      return null;
+    }
+    String result = '';
+    for (var s in parts.reversed) {
+      try {
+        try {
+          int.parse(s);
+          result += '$s-';
+        } catch (e) {
+          result += '${monthNameToNumberString(s)}-';
+        }
+      } catch (e) {
+        return null;
+      }
+    }
+    return result.substring(0, result.length - 1);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(Uri.parse(standardUrl));
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var name = http.querySelector('.pd-title')?.innerHtml;
+      var filename = http.querySelector('.pd-filename .pd-float')?.innerHtml;
+      if (filename == null) {
+        throw NoReleasesError();
+      }
+      var version =
+          http.querySelector('.pd-version-txt')?.nextElementSibling?.innerHtml;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://$host/download/$filename';
+      var dateStringOriginal =
+          http.querySelector('.pd-date-txt')?.nextElementSibling?.innerHtml;
+      var dateString = dateStringOriginal != null
+          ? (customDateParse(dateStringOriginal))
+          : null;
+      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
+      return APKDetails(version, [apkUrl],
+          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
+          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
+          changeLog: changeLogElements.isNotEmpty
+              ? changeLogElements.last.innerHtml
+              : null);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/signal.dart

@@ -13,9 +13,6 @@ class Signal extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/sourceforge.dart

@@ -18,9 +18,6 @@ class SourceForge extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/steammobile.dart

@@ -24,9 +24,6 @@ class SteamMobile extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/telegramapp.dart

@@ -0,0 +1,40 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class TelegramApp extends AppSource {
+  TelegramApp() {
+    host = 'telegram.org';
+    name = 'Telegram ${tr('app')}';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(Uri.parse('https://t.me/s/TAndroidAPK'));
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var messages =
+          http.querySelectorAll('.tgme_widget_message_text.js-message_text');
+      var version = messages.isNotEmpty
+          ? messages.last.innerHtml.split('\n').first.trim().split(' ').first
+          : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://telegram.org/dl/android/apk';
+      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

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.11.9';
+const String currentVersion = '0.11.11';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/apps.dart

@@ -232,6 +232,49 @@ class AppsPageState extends State<AppsPage> {
               String? changesUrl = SourceProvider()
                   .getSource(listedApps[index].app.url)
                   .changeLogPageFromStandardUrl(listedApps[index].app.url);
+              String? changeLog = listedApps[index].app.changeLog;
+              var showChanges = (changeLog == null && changesUrl == null)
+                  ? null
+                  : () {
+                      if (changeLog != null) {
+                        showDialog(
+                            context: context,
+                            builder: (BuildContext context) {
+                              return GeneratedFormModal(
+                                title: tr('changes'),
+                                items: [],
+                                additionalWidgets: [
+                                  Text(changeLog),
+                                  changesUrl != null
+                                      ? const SizedBox(
+                                          height: 16,
+                                        )
+                                      : const SizedBox.shrink(),
+                                  changesUrl != null
+                                      ? GestureDetector(
+                                          child: Text(
+                                            changesUrl,
+                                            style: const TextStyle(
+                                                decoration:
+                                                    TextDecoration.underline,
+                                                fontStyle: FontStyle.italic),
+                                          ),
+                                          onTap: () {
+                                            launchUrlString(changesUrl,
+                                                mode: LaunchMode
+                                                    .externalApplication);
+                                          },
+                                        )
+                                      : const SizedBox.shrink()
+                                ],
+                                singleNullReturnButton: tr('ok'),
+                              );
+                            });
+                      } else {
+                        launchUrlString(changesUrl!,
+                            mode: LaunchMode.externalApplication);
+                      }
+                    };
               var transparent = const Color.fromARGB(0, 0, 0, 0).value;
               var hasUpdate = listedApps[index].app.installedVersion != null &&
                   listedApps[index].app.installedVersion !=
@@ -366,13 +409,7 @@ class AppsPageState extends State<AppsPage> {
                                     mainAxisSize: MainAxisSize.min,
                                     children: [
                                       GestureDetector(
-                                          onTap: changesUrl == null
-                                              ? null
-                                              : () {
-                                                  launchUrlString(changesUrl,
-                                                      mode: LaunchMode
-                                                          .externalApplication);
-                                                },
+                                          onTap: showChanges,
                                           child: Text(
                                             listedApps[index].app.releaseDate ==
                                                     null
@@ -381,10 +418,11 @@ class AppsPageState extends State<AppsPage> {
                                                     .format(listedApps[index]
                                                         .app
                                                         .releaseDate!),
-                                            style: const TextStyle(
+                                            style: TextStyle(
                                                 fontStyle: FontStyle.italic,
-                                                decoration:
-                                                    TextDecoration.underline),
+                                                decoration: showChanges != null
+                                                    ? TextDecoration.underline
+                                                    : TextDecoration.none),
                                           ))
                                     ],
                                   ),

lib/providers/apps_provider.dart

@@ -145,6 +145,9 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
+    NotificationsProvider? notificationsProvider =
+        context?.read<NotificationsProvider>();
+    var notifId = DownloadNotification(app.name, 0).id;
     if (apps[app.id] != null) {
       apps[app.id]!.downloadProgress = 0;
       notifyListeners();
@@ -155,8 +158,6 @@ class AppsProvider with ChangeNotifier {
       String downloadUrl = await SourceProvider()
           .getSource(app.url)
           .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
-      NotificationsProvider? notificationsProvider =
-          context?.read<NotificationsProvider>();
       var notif = DownloadNotification(app.name, 100);
       notificationsProvider?.cancel(notif.id);
       int? prevProg;
@@ -173,7 +174,6 @@ class AppsProvider with ChangeNotifier {
         }
         prevProg = prog;
       });
-      notificationsProvider?.cancel(notif.id);
       // Delete older versions of the APK if any
       for (var file in downloadedFile.parent.listSync()) {
         var fn = file.path.split('/').last;
@@ -201,6 +201,7 @@ class AppsProvider with ChangeNotifier {
       }
       return DownloadedApk(app.id, downloadedFile);
     } finally {
+      notificationsProvider?.cancel(notifId);
       if (apps[app.id] != null) {
         apps[app.id]!.downloadProgress = null;
         notifyListeners();

lib/providers/source_provider.dart

@@ -15,9 +15,11 @@ import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
+import 'package:obtainium/app_sources/neutroncode.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/app_sources/telegramapp.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -34,8 +36,10 @@ class APKDetails {
   late List<String> apkUrls;
   late AppNames names;
   late DateTime? releaseDate;
+  late String? changeLog;
 
-  APKDetails(this.version, this.apkUrls, this.names, {this.releaseDate});
+  APKDetails(this.version, this.apkUrls, this.names,
+      {this.releaseDate, this.changeLog});
 }
 
 class App {
@@ -52,6 +56,7 @@ class App {
   bool pinned = false;
   List<String> categories;
   late DateTime? releaseDate;
+  late String? changeLog;
   App(
       this.id,
       this.url,
@@ -65,7 +70,8 @@ class App {
       this.lastUpdateCheck,
       this.pinned,
       {this.categories = const [],
-      this.releaseDate});
+      this.releaseDate,
+      this.changeLog});
 
   @override
   String toString() {
@@ -128,34 +134,35 @@ class App {
       preferredApkIndex = 0;
     }
     return App(
-      json['id'] as String,
-      json['url'] as String,
-      json['author'] as String,
-      json['name'] as String,
-      json['installedVersion'] == null
-          ? null
-          : json['installedVersion'] as String,
-      json['latestVersion'] as String,
-      json['apkUrls'] == null
-          ? []
-          : List<String>.from(jsonDecode(json['apkUrls'])),
-      preferredApkIndex,
-      additionalSettings,
-      json['lastUpdateCheck'] == null
-          ? null
-          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
-      json['pinned'] ?? false,
-      categories: json['categories'] != null
-          ? (json['categories'] as List<dynamic>)
-              .map((e) => e.toString())
-              .toList()
-          : json['category'] != null
-              ? [json['category'] as String]
-              : [],
-      releaseDate: json['releaseDate'] == null
-          ? null
-          : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
-    );
+        json['id'] as String,
+        json['url'] as String,
+        json['author'] as String,
+        json['name'] as String,
+        json['installedVersion'] == null
+            ? null
+            : json['installedVersion'] as String,
+        json['latestVersion'] as String,
+        json['apkUrls'] == null
+            ? []
+            : List<String>.from(jsonDecode(json['apkUrls'])),
+        preferredApkIndex,
+        additionalSettings,
+        json['lastUpdateCheck'] == null
+            ? null
+            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
+        json['pinned'] ?? false,
+        categories: json['categories'] != null
+            ? (json['categories'] as List<dynamic>)
+                .map((e) => e.toString())
+                .toList()
+            : json['category'] != null
+                ? [json['category'] as String]
+                : [],
+        releaseDate: json['releaseDate'] == null
+            ? null
+            : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
+        changeLog:
+            json['changeLog'] == null ? null : json['changeLog'] as String);
   }
 
   Map<String, dynamic> toJson() => {
@@ -171,7 +178,8 @@ class App {
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
         'categories': categories,
-        'releaseDate': releaseDate?.microsecondsSinceEpoch
+        'releaseDate': releaseDate?.microsecondsSinceEpoch,
+        'changeLog': changeLog
       };
 }
 
@@ -338,6 +346,8 @@ class SourceProvider {
     APKMirror(),
     FDroidRepo(),
     SteamMobile(),
+    TelegramApp(),
+    NeutronCode(),
     HTML() // This should ALWAYS be the last option as they are tried in order
   ];
 
@@ -433,7 +443,8 @@ class SourceProvider {
         DateTime.now(),
         currentApp?.pinned ?? false,
         categories: currentApp?.categories ?? const [],
-        releaseDate: apk.releaseDate);
+        releaseDate: apk.releaseDate,
+        changeLog: apk.changeLog);
   }
 
   // Returns errors in [results, errors] instead of throwing them

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.11.9+130 # When changing this, update the tag in main() accordingly
+version: 0.11.11+132 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'