summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-04-18 13:08:40 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-05-19 02:48:47 +0200
commit58aa44faf9000c12449f0bd7b837b9efb32082ca (patch)
treed7c050715f490a5e0cbdb11770097b046e57d88f
parentsend the csrf token with the updater scripts (diff)
downloadcore-58aa44faf9000c12449f0bd7b837b9efb32082ca.tar.gz
core-58aa44faf9000c12449f0bd7b837b9efb32082ca.zip
update the update URL and adapt to the server changes
Change-Id: I6ece7924e6e0980c2bb4fffa9d733e6352382084
-rw-r--r--desktop/source/app/updater.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 2b9c68a0d969..a4bf6d6e9d81 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -509,15 +509,12 @@ void update_checker()
OUString aProductName = utl::ConfigManager::getProductName();
OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
rtl::Bootstrap::expandMacros(aBuildID);
- OUString aVersion = "5.3.0.0.alpha0+";
OUString aBuildTarget = "${_OS}_${_ARCH}";
rtl::Bootstrap::expandMacros(aBuildTarget);
- OUString aLocale = "en-US";
OUString aChannel = officecfg::Office::Update::Update::UpdateChannel::get();
- OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/1/" + aProductName +
- "/" + aVersion + "/" + aBuildID + "/" + aBuildTarget + "/" + aLocale +
- "/" + aChannel;
+ OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + aProductName +
+ "/" + aBuildID + "/" + aBuildTarget + "/" + "/" + aChannel;
OString aURL = OUStringToOString(aDownloadCheckURL, RTL_TEXTENCODING_UTF8);
std::string response_body = download_content(aURL, false);