Usage of new API, cleanups (reduced)

src/org/adblockplus/android/updater/AlarmReceiver.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 44 matching lines @@
 import android.util.Log;
 
 /**
  * Processes Alarm event to check for update availability.
  */
 public class AlarmReceiver extends BroadcastReceiver
 {
   private static final String TAG = Utils.getTag(AlarmReceiver.class);
   private static final int NOTIFICATION_ID = R.string.app_name + 1;
 
-  @SuppressWarnings("deprecation")
   @Override
   public void onReceive(final Context context, final Intent intent)
   {
     Log.i(TAG, "Alarm; requesting updater service");
 
     final AdblockPlus application = AdblockPlus.getApplication();
 
     // Indicates manual (immediate) update check which requires response to user.
     final boolean notify = intent.getBooleanExtra("notifynoupdate", false);
 
@@ skipping 28 matching lines @@
           boolean success = false;
           try
           {
             // Read updates manifest
             final DefaultHttpClient httpClient = new DefaultHttpClient();
 
             final String locale = Locale.getDefault().toString().toLowerCase();
             final String device = AdblockPlus.getDeviceName();
             final boolean releaseBuild = context.getResources().getBoolean(R.bool.def_release);
             final String updateUrlTemplate = context.getString(releaseBuild ? R.string.update_url : R.string.devbuild_update_url);
-            final URL updateUrl = new URL(String.format(updateUrlTemplate, Build.VERSION.SDK_INT, AdblockPlus.getApplication().getBuildNumber(),
-                locale, device));
+            final URL updateUrl = new URL(String.format(updateUrlTemplate, Build.VERSION.SDK_INT, AdblockPlus.getApplication().getBuildNumber(), locale, device));
             // The following line correctly url-encodes query string parameters
-            final URI uri = new URI(updateUrl.getProtocol(), updateUrl.getUserInfo(), updateUrl.getHost(), updateUrl.getPort(), updateUrl.getPath(),
-                updateUrl.getQuery(), updateUrl.getRef());
+            final URI uri = new URI(updateUrl.getProtocol(), updateUrl.getUserInfo(), updateUrl.getHost(), updateUrl.getPort(), updateUrl.getPath(), updateUrl.getQuery(), updateUrl.getRef());
             final HttpGet httpGet = new HttpGet(uri);
 
             final HttpResponse httpResponse = httpClient.execute(httpGet);
             final HttpEntity httpEntity = httpResponse.getEntity();
             final String xml = EntityUtils.toString(httpEntity);
 
             // Parse XML
             final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             final DocumentBuilder db = dbf.newDocumentBuilder();
 
@@ skipping 88 matching lines @@
       if (notify)
       {
         notification.setLatestEventInfo(context, context.getText(R.string.app_name), context.getString(R.string.msg_update_fail), emptyIntent);
         notificationManager.notify(NOTIFICATION_ID, notification);
       }
       // Schedule retry in 30 minutes - there is no connection available at this time
       application.scheduleUpdater(30);
     }
   }
 }