Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version

Check for compatible apps from the appstore fails

3 files changed, 6 insertions, 4 deletions

diff --git a/apps/updatenotification/lib/Command/Check.php b/apps/updatenotification/lib/Command/Check.php
index f363832873b..fac4e4201f2 100644
--- a/apps/updatenotification/lib/Command/Check.php
+++ b/apps/updatenotification/lib/Command/Check.php
@@ -67,7 +67,7 @@ class Check extends Command {
 		// Server
 		$r = $this->updateChecker->getUpdateState();
 		if (isset($r['updateAvailable']) && $r['updateAvailable']) {
-			$output->writeln($r['updateVersion'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
+			$output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
 			$updatesAvailableCount += 1;
 		}
 
diff --git a/apps/updatenotification/lib/Settings/Admin.php b/apps/updatenotification/lib/Settings/Admin.php
index 54adf558224..b1abdd874d1 100644
--- a/apps/updatenotification/lib/Settings/Admin.php
+++ b/apps/updatenotification/lib/Settings/Admin.php
@@ -97,7 +97,8 @@ class Admin implements ISettings {
 			'lastChecked' => $lastUpdateCheck,
 			'currentChannel' => $currentChannel,
 			'channels' => $channels,
-			'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+			'newVersion' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+			'newVersionString' => empty($updateState['updateVersionString']) ? '' : $updateState['updateVersionString'],
 			'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
 			'changes' => $this->filterChanges($updateState['changes'] ?? []),
 			'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
diff --git a/apps/updatenotification/lib/UpdateChecker.php b/apps/updatenotification/lib/UpdateChecker.php
index bd03cb442be..6375e21b084 100644
--- a/apps/updatenotification/lib/UpdateChecker.php
+++ b/apps/updatenotification/lib/UpdateChecker.php
@@ -51,7 +51,8 @@ class UpdateChecker {
 
 		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
 			$result['updateAvailable'] = true;
-			$result['updateVersion'] = $data['versionstring'];
+			$result['updateVersion'] = $data['version'];
+			$result['updateVersionString'] = $data['versionstring'];
 			$result['updaterEnabled'] = $data['autoupdater'] === '1';
 			$result['versionIsEol'] = $data['eol'] === '1';
 			if (strpos($data['web'], 'https://') === 0) {
@@ -80,7 +81,7 @@ class UpdateChecker {
 	public function populateJavaScriptVariables(array $data) {
 		$data['array']['oc_updateState'] =  json_encode([
 			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
+			'updateVersion' => $this->getUpdateState()['updateVersionString'],
 			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
 		]);
 	}