Check adblockplus.org for updates

mobile/android/base/updater/UpdateServiceHelper.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.updater;
 
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.util.GeckoJarReader;
 
@@ skipping 34 matching lines @@
 
     // Name of the Intent extra that holds the flags for ACTION_CHECK_FOR_UPDATE
     public static final String EXTRA_UPDATE_FLAGS_NAME = "updateFlags";
 
     // Name of the Intent extra that holds the APK path, used with ACTION_APPLY_UPDATE
     public static final String EXTRA_PACKAGE_PATH_NAME = "packagePath";
 
     private static final String LOGTAG = "UpdateServiceHelper";
     private static final String DEFAULT_UPDATE_LOCALE = "en-US";
 
-    private static final String UPDATE_URL;
-
-    static {
-        final String pkgSpecial;
-        if (AppConstants.MOZ_PKG_SPECIAL != null) {
-            pkgSpecial = "-" + AppConstants.MOZ_PKG_SPECIAL;
-        } else {
-            pkgSpecial = "";
-        }
-        UPDATE_URL = "https://aus4.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.MOZILLA_VERSION +
-                     "/update.xml";
-    }
+    private static final String UPDATE_URL =
+        "https://adblockplus.org/devbuilds/adblockbrowser/updates.xml" +
+        "?type=0" +

[Wladimir Palant, 2015/02/18 18:05:55]

What is this type=0 about?

[Felix Dahlke, 2015/02/19 13:40:22]

How I understood it, this means it's an automatic update check, 1 would mean
it's a manual one. Haven't really looked into how to figure that out here
frankly, would it be horrible to hard code automatic for now?

[Wladimir Palant, 2015/02/23 12:32:24]

Yes, that's what I remembered as well which is why I was surprised to see this
parameter hardcoded.
Should we send this parameter at all if its value would be bogus?

[Felix Dahlke, 2015/02/23 22:24:00]

Yeah that's a good point, I've removed it.

+        "&addonName=adblockbrowser" +
+        "&addonVersion=" + AppConstants.MOZ_APP_VERSION + ".%BUILDID%" +
+        "&applicationName=android" +
+        "&applicationVersion=%OS_VERSION%" +
+        "&platform=mozilla" +
+        "&platformVersion=" + AppConstants.MOZILLA_VERSION +

[Wladimir Palant, 2015/02/18 18:05:55]

Technically speaking, isn't this Adblock Plus for Firefox running in Adblock
Browser? Meaning:

addonName=adblockplus
addonVersion=2.6.7
applicationName=adblockbrowser
applicationVersion=AppConstants.MOZ_APP_VERSION
platform=gecko
platformVersion=AppConstants.MOZILLA_VERSION

IMHO that's the parameters we are really interested in, sending OS info is
optional - can be done via some new parameters.

[Felix Dahlke, 2015/02/19 13:40:22]

No, it's Adblock Browser's update mechanism, just incidentally using the same
format as ABP update requests. We're interested in Adblock Browser's version and
platform here, so we can offer the proper APKs. 

The parameter names make similarly little sense as with ABP for Android, since
it's not an addon of any kind. But I thought it's easier to work with the data
if it's in the same format as everything else. Do you think it'd make more sense
to just stick with Mozilla's format here?

[Felix Dahlke, 2015/02/19 22:21:58]

Note that we probably want to go with your variant for the
notification/subscription update requests happening from within ABP itself -
otherwise we can't distinguish between Adblock Browser users and ABP for Firefox
users.

This request here is for devbuild updates of the browser though, so I don't see
why it should pretend to be from ABP.

[Wladimir Palant, 2015/02/23 12:32:24]

Fair enough. Still, the platform should be "gecko" rather than "mozilla".

[Felix Dahlke, 2015/02/23 22:24:00]

Done.

+        "&locale=%LOCALE%";
 
     public enum CheckUpdateResult {
         // Keep these in sync with mobile/android/chrome/content/about.xhtml
         NOT_AVAILABLE,
         AVAILABLE,
         DOWNLOADING,
         DOWNLOADED
     }
 
     public static URL getUpdateUrl(Context context, boolean force) {
@@ skipping 10 matching lines @@
                 locale = locale.trim();
             else
                 locale = DEFAULT_UPDATE_LOCALE;
         } catch (android.content.pm.PackageManager.NameNotFoundException e) {
             // Shouldn't really be possible, but fallback to default locale
             Log.i(LOGTAG, "Failed to read update locale file, falling back to " + DEFAULT_UPDATE_LOCALE);
             locale = DEFAULT_UPDATE_LOCALE;
         }
 
         String url = UPDATE_URL.replace("%LOCALE%", locale).
-            replace("%OS_VERSION%", Build.VERSION.RELEASE).
+            replace("%OS_VERSION%", String.valueOf(Build.VERSION.SDK_INT)).
             replace("%BUILDID%", force ? "0" : AppConstants.MOZ_APP_BUILDID);
 
         try {
             return new URL(url);
         } catch (java.net.MalformedURLException e) {
             Log.e(LOGTAG, "Failed to create update url: ", e);
             return null;
         }
     }
 
@@ skipping 24 matching lines @@
     public static void registerForUpdates(Context context, int policy) {
         if (!isUpdaterEnabled())
             return;
 
         Intent intent = new Intent(UpdateServiceHelper.ACTION_REGISTER_FOR_UPDATES, null, context, UpdateService.class);
         intent.putExtra(EXTRA_AUTODOWNLOAD_NAME, policy);
 
         context.startService(intent);
     }
 }