peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-08-15 19:38:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: "releaseDateAsVersion" resets to "noVersionDetection"

Browse Source 
Also 2 related UI fixes
This commit is contained in:
Imran Remtulla
2023-03-30 17:44:39 -04:00
parent 9fba747802
commit 6b7d962b87
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/app.dart
View File

@@ -80,9 +80,7 @@ class _AppPageState extends State<AppPage> {
), ),
Text( Text(
'${tr('installedVersionX', args: [ '${tr('installedVersionX', args: [
app?.installedInfo?.versionName ?? app?.app.installedVersion ?? tr('none')
app?.app.installedVersion ??
tr('none')
])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [ ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
tr('app') tr('app')
])}' : ''}', ])}' : ''}',
@@ -249,6 +247,8 @@ class _AppPageState extends State<AppPage> {
if (e.key == 'versionDetection' && e is GeneratedFormDropdown) { if (e.key == 'versionDetection' && e is GeneratedFormDropdown) {
e.disabledOptKeys ??= []; e.disabledOptKeys ??= [];
if (app?.app.installedVersion != null && if (app?.app.installedVersion != null &&
app?.app.additionalSettings['versionDetection'] !=
'releaseDateAsVersion' &&
!appsProvider.isVersionDetectionPossible(app)) { !appsProvider.isVersionDetectionPossible(app)) {
e.disabledOptKeys!.add('standardVersionDetection'); e.disabledOptKeys!.add('standardVersionDetection');
} }

4
lib/providers/apps_provider.dart
View File

@@ -486,6 +486,8 @@ class AppsProvider with ChangeNotifier {
bool isVersionDetectionPossible(AppInMemory? app) { bool isVersionDetectionPossible(AppInMemory? app) {
return app?.app.additionalSettings['trackOnly'] != true && return app?.app.additionalSettings['trackOnly'] != true &&
app?.app.additionalSettings['versionDetection'] !=
'releaseDateAsVersion' &&
app?.installedInfo?.versionName != null && app?.installedInfo?.versionName != null &&
app?.app.installedVersion != null && app?.app.installedVersion != null &&
reconcileVersionDifferences( reconcileVersionDifferences(
@@ -539,6 +541,8 @@ class AppsProvider with ChangeNotifier {
} }
// FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED // FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED
if (installedInfo != null && if (installedInfo != null &&
app.additionalSettings['versionDetection'] ==
'standardVersionDetection' &&
!isVersionDetectionPossible(AppInMemory(app, null, installedInfo))) { !isVersionDetectionPossible(AppInMemory(app, null, installedInfo))) {
app.additionalSettings['versionDetection'] = 'noVersionDetection'; app.additionalSettings['versionDetection'] = 'noVersionDetection';
logs.add('Could not reconcile version formats for: ${app.id}'); logs.add('Could not reconcile version formats for: ${app.id}');