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" +
+        "&addonName=adblockbrowser" +
+        "&addonVersion=%BUILDID%" +
+        "&applicationName=android" +
+        "&applicationVersion=%OS_VERSION%" +
+        "&platform=" + AppConstants.MOZ_APP_BASENAME +

[Felix Dahlke, 2014/12/09 19:58:34]

This just says "Fennec". We can change it to something of our liking of course,
but I feel there's no real point: It's just used internally. Anything
user-visible is taken from the branding.

+        "&platformVersion=" + AppConstants.MOZ_APP_VERSION +

[Felix Dahlke, 2014/12/09 19:58:34]

We can and probably will change this since it's the user visible version. In
that case we could switch to AppConstants.MOZILLA_VERSION which should be
unaffected by this. At the end of the day, I don't think it matters really, I
don't see what the update server would need this for.

+        "&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)).

[Felix Dahlke, 2014/12/09 19:58:34]

Firefox uses the full version string here, but I feel it makes more sense for us
to be consistent with ABP for Android and use the API level.

             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);
     }
 }