Issue 1108 - Support notifications

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android.updater;
 
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
 
+import org.adblockplus.android.AdblockPlus;
 import org.adblockplus.android.R;
 import org.adblockplus.android.Utils;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
@@ skipping 41 matching lines @@
   {
     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;
       notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
       notification = new Notification();
       contentIntent = PendingIntent.getActivity(context, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     @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);
+      notificationManager.notify(AdblockPlus.UPDATE_NOTIFICATION_ID, notification);
     }
 
     @Override
     protected String doInBackground(final String... sUrl)
     {
       try
       {
         // Create connection
         final URL url = new URL(sUrl[0]);
         Log.e(TAG, "D: " + sUrl[0]);
@@ skipping 42 matching lines @@
       {
         Log.e(TAG, "Download error", e);
         return null;
       }
     }
 
     @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);
+      notificationManager.notify(AdblockPlus.UPDATE_NOTIFICATION_ID, notification);
     }
 
     @Override
     protected void onPostExecute(final String result)
     {
-      notificationManager.cancel(notificationId);
+      notificationManager.cancel(AdblockPlus.UPDATE_NOTIFICATION_ID);
       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);
+        notificationManager.notify(AdblockPlus.UPDATE_NOTIFICATION_ID, notification);

[Felix Dahlke, 2015/02/18 12:49:56]

Any idea why this used a different ID than notificationId before? Doesn't seem
to make sense at first glance.

[René Jeschke, 2015/02/18 13:13:02]

Yeah, was thinking about this, also. I did not find a good reason, why this used
a different it. It also doesn't make sense, as we cancel 'notificationId'
anyway, so I thought it's save to reduce this to UPDATE_NOTIFICATION_ID.

       }
     }
   }
 }