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 26 matching lines @@
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.os.IBinder;
 import android.util.Log;
 
 /**
  * Update downloader.
  */
 public class UpdaterService extends Service
 {
-  private final static String TAG = Utils.getTag(UpdaterService.class);
+  private static final String TAG = Utils.getTag(UpdaterService.class);
 
   private File updateDir;
 
   @Override
   public void onCreate()
   {
     super.onCreate();
     // Use common Android path for downloads
-    this.updateDir = new File(Environment.getExternalStorageDirectory().getPath(), "downloads");
+    updateDir = new File(Environment.getExternalStorageDirectory().getPath(), "downloads");
   }
 
-  @SuppressWarnings("deprecation")
   @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()))
     {
-      this.stopSelf();
+      stopSelf();
       return;
     }
-    this.updateDir.mkdirs();
+    updateDir.mkdirs();
 
     // Start download
     if (intent != null && intent.hasExtra("url"))
-    {
       new DownloadTask(this).execute(intent.getStringExtra("url"));
-    }
   }
 
   @Override
   public IBinder onBind(final Intent intent)
   {
     return null;
   }
 
   private class DownloadTask extends AsyncTask<String, Integer, String>
   {
     private final Context context;
     private final Notification notification;
     private final PendingIntent contentIntent;
     private final NotificationManager notificationManager;
     private final int notificationId = R.string.app_name + 2;
 
     public DownloadTask(final Context context)
     {
       this.context = context;
-      this.notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-      this.notification = new Notification();
-      this.contentIntent = PendingIntent.getActivity(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
+      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()
     {
-      this.notification.flags |= Notification.FLAG_ONGOING_EVENT;
-      this.notification.when = 0;
-      this.notification.icon = R.drawable.ic_stat_download;
-      this.notification.setLatestEventInfo(this.context, UpdaterService.this.getString(R.string.app_name),
-          String.format(UpdaterService.this.getString(R.string.msg_update_downloading), 0),
-          this.contentIntent);
-      this.notificationManager.notify(this.notificationId, this.notification);
+      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);
     }
 
     @Override
     protected String doInBackground(final String... sUrl)
     {
       try
       {
         // Create connection
         final URL url = new URL(sUrl[0]);
         Log.e(TAG, "D: " + sUrl[0]);
         final URLConnection connection = url.openConnection();
         connection.connect();
         final int fileLength = connection.getContentLength();
         Log.e(TAG, "S: " + fileLength);
 
         // Check if file already exists
-        final File updateFile = new File(UpdaterService.this.updateDir, "AdblockPlus-update.apk");
+        final File updateFile = new File(updateDir, "AdblockPlus-update.apk");
         if (updateFile.exists())
         {
           // if (updateFile.length() == fileLength)
           // return updateFile.getAbsolutePath();
           // else
           updateFile.delete();
         }
 
         // Download the file
         final InputStream input = new BufferedInputStream(url.openStream());
         final OutputStream output = new FileOutputStream(updateFile);
 
         final byte data[] = new byte[1024];
         long total = 0;
         int count;
         int progress = 0;
         while ((count = input.read(data)) != -1)
         {
           total += count;
           output.write(data, 0, count);
 
-          final int p = (int)(total * 100 / fileLength);
+          final int p = (int) (total * 100 / fileLength);
           if (p != progress)
           {
-            this.publishProgress(p);
+            publishProgress(p);
             progress = p;
           }
         }
 
         output.flush();
         output.close();
         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)
     {
-      this.notification.setLatestEventInfo(this.context, UpdaterService.this.getString(R.string.app_name),
-          String.format(UpdaterService.this.getString(R.string.msg_update_downloading), progress[0]),
-          this.contentIntent);
-      this.notificationManager.notify(this.notificationId, this.notification);
+      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)
     {
-      this.notificationManager.cancel(this.notificationId);
+      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(this.context, UpdaterActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        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(this.context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        notification.setLatestEventInfo(this.context, this.context.getText(R.string.app_name), this.context.getString(R.string.msg_update_ready),
-            contentIntent);
-        this.notificationManager.notify(R.string.app_name + 1, notification);
+        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);
       }
     }
   }
 }