Usage of new API, cleanups (reduced)

src/org/adblockplus/android/updater/UpdaterService.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 38 matching lines @@
   private File updateDir;
 
   @Override
   public void onCreate()
   {
     super.onCreate();
     // Use common Android path for downloads
     updateDir = new File(Environment.getExternalStorageDirectory().getPath(), "downloads");
   }
 
-  @SuppressWarnings("deprecation")

[Felix Dahlke, 2014/04/28 07:29:01]

As before, not a fan. Also below.

   @Override
   public void onStart(final Intent intent, final int startId)
   {
     super.onStart(intent, startId);
 
     // Stop if media not available
     if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
     {
       stopSelf();
       return;
@@ skipping 20 matching lines @@
     private final int notificationId = R.string.app_name + 2;
 
     public DownloadTask(final Context context)
     {
       this.context = context;
       notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
       notification = new Notification();
       contentIntent = PendingIntent.getActivity(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected void onPreExecute()
     {
       notification.flags |= Notification.FLAG_ONGOING_EVENT;
       notification.when = 0;
       notification.icon = R.drawable.ic_stat_download;
       notification.setLatestEventInfo(context, getString(R.string.app_name), String.format(getString(R.string.msg_update_downloading), 0), contentIntent);
       notificationManager.notify(notificationId, notification);
     }
 
@@ skipping 46 matching lines @@
         input.close();
         return updateFile.getAbsolutePath();
       }
       catch (final Exception e)
       {
         Log.e(TAG, "Download error", e);
         return null;
       }
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected void onProgressUpdate(final Integer... progress)
     {
       notification.setLatestEventInfo(context, getString(R.string.app_name), String.format(getString(R.string.msg_update_downloading), progress[0]), contentIntent);
       notificationManager.notify(notificationId, notification);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected void onPostExecute(final String result)
     {
       notificationManager.cancel(notificationId);
       if (result != null)
       {
         final Notification notification = new Notification();
         notification.icon = R.drawable.ic_stat_download;
         notification.when = System.currentTimeMillis();
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
         final Intent intent = new Intent(context, UpdaterActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction("update");
         intent.putExtra("path", result);
         final PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         notification.setLatestEventInfo(context, context.getText(R.string.app_name), context.getString(R.string.msg_update_ready), contentIntent);
         notificationManager.notify(R.string.app_name + 1, notification);
       }
     }
   }
 }