861967 - updater sets PLATFORM_VERSION part of URL wrong

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[[e-mail] (:bhearsum)]

The update URL for Fennec is currently defined like this:
        UPDATE_URL = "https://aus2.mozilla.org/update/4/" + AppConstants.MOZ_APP_BASENAME + "/" +
                     AppConstants.MOZ_APP_VERSION         +
                     "/%BUILDID%/Android_"                + AppConstants.MOZ_APP_ABI + pkgSpecial +
                     "/%LOCALE%/"                         + AppConstants.MOZ_UPDATE_CHANNEL +
                     "/%OS_VERSION%/default/default/"     + AppConstants.MOZ_APP_VERSION +
                     "/update.xml";
    }

However, the last path segment of the URL should be the Gecko version, not the application version. For comparison, this is what the XUL based Fennec used: https://aus2.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PLATFORM_VERSION%/update.xml (from https://mxr.mozilla.org/mobile-browser/source/app/mobile.js#517).

Comment 1

[[e-mail] (:bhearsum)]

I pushed a possible patch for this to try: https://tbpl.mozilla.org/?tree=Try&rev=b147041377c2

Comment 2

[[e-mail] (:bhearsum)]

Attachment: use MOZILLA_VERSION

This patch seems to have worked, I got this in my log from the test build:
I/UpdateService( 5169): openning connection with url: https://aus2.mozilla.org/update/4/Fennec/23.0a1/20130415130941/Android_arm-eabi-gcc3/en-US/default/4.1.1/default/default/99.0a1/update.xml

Comment 3

[James Willcox (:snorp) ([e-mail]) (he/him)]

Comment on attachment 738096 [details] [diff] [review]
use MOZILLA_VERSION

Review of attachment 738096 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good, thanks

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 738096 [details] [diff] [review]
use MOZILLA_VERSION

Landed to inbound: https://hg.mozilla.org/integration/mozilla-inbound/rev/f2ddcae0868a

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/f2ddcae0868a