chore: merge dev to main (#976)

ReVanced · Jun 30, 2023 · e78af6a · e78af6a
2 parents c1cc812 + 6fe05cd
commit e78af6a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json
@@ -53,7 +53,8 @@
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
         "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
-        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?"
+        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?",
+        "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",

diff --git a/lib/services/github_api.dart b/lib/services/github_api.dart
@@ -8,6 +8,8 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+
 
 @lazySingleton
 class GithubAPI {
@@ -63,7 +65,16 @@ class GithubAPI {
       final response = await _dio.get(
         '/repos/$repoName/releases',
       );
-      return response.data[0];
+      final Map<String, dynamic> releases = response.data[0];
+      int updates = 0;
+      final String currentVersion = await ManagerAPI().getCurrentManagerVersion();
+      while (response.data[updates]['tag_name'] != 'v$currentVersion') {
+        updates++;
+      }
+      for(int i = 1; i < updates; i++){
+        releases.update('body', (value) => value + '\n' + '# '+ response.data[i]['tag_name']+'\n' + response.data[i]['body']);
+      }
+      return releases;
     } on Exception catch (e) {
       if (kDebugMode) {
         print(e);

diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart
@@ -64,7 +64,7 @@ class PatcherViewModel extends BaseViewModel {
           builder: (context) => AlertDialog(
             title: I18nText('warning'),
             backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText('patcherView.armv7WarningDialogText'),
+            content: I18nText('patcherView.splitApkWarningDialogText'),
             actions: <Widget>[
               CustomMaterialButton(
                 label: I18nText('noButton'),