Skip to content

Commit

Permalink
Merge pull request #2021 from ImranR98/dev
Browse files Browse the repository at this point in the history
Catch errors when running JSON compat mods - app breaking bug (#2015, #2019)
  • Loading branch information
ImranR98 authored Dec 9, 2024
2 parents c0968e8 + 0df1c1c commit e5afe75
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion lib/providers/source_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import 'package:obtainium/app_sources/uptodown.dart';
import 'package:obtainium/components/generated_form.dart';
import 'package:obtainium/custom_errors.dart';
import 'package:obtainium/mass_app_sources/githubstars.dart';
import 'package:obtainium/providers/logs_provider.dart';
import 'package:obtainium/providers/settings_provider.dart';

class AppNames {
Expand Down Expand Up @@ -367,7 +368,14 @@ class App {
otherAssetUrls: otherAssetUrls);

factory App.fromJson(Map<String, dynamic> json) {
json = appJSONCompatibilityModifiers(json);
Map<String, dynamic> originalJSON = new Map.from(json);
try {
json = appJSONCompatibilityModifiers(json);
} catch (e) {
json = originalJSON;
LogsProvider().add(
'Error running JSON compat modifiers: ${e.toString()}: ${originalJSON.toString()}');
}
return App(
json['id'] as String,
json['url'] as String,
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.1.33+2290
version: 1.1.34+2291

environment:
sdk: '>=3.0.0 <4.0.0'
Expand Down

0 comments on commit e5afe75

Please sign in to comment.