Issue 1108 - Support notifications

src/org/adblockplus/android/ProxyService.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;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
 import java.util.Properties;
 
 import org.adblockplus.android.configurators.ProxyConfigurator;
 import org.adblockplus.android.configurators.ProxyConfigurators;
 import org.adblockplus.android.configurators.ProxyRegistrationType;
+import org.adblockplus.libadblockplus.Notification.Type;
 import org.apache.commons.lang.StringUtils;
 
 import sunlabs.brazil.server.Server;
 import sunlabs.brazil.util.Base64;
 import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ skipping 579 matching lines @@
     if (this.notificationWatcher != null)
     {
       this.notificationWatcher.stop();
       this.notificationWatcher = null;
     }
   }
 
   private static class NotificationWatcher implements Runnable
   {
     public static final int DEFAULT_POLL_DELAY = 3 * 60; /* seconds */
-    public static final int DEFAULT_POLL_INTERVALS = 0; /* seconds */

[Felix Dahlke, 2015/02/18 14:55:04]

Should be POLL_INTERVAL now, huh?

[René Jeschke, 2015/02/18 15:01:25]

Done.

+    public static final int DEFAULT_POLL_INTERVAL = 0; /* seconds */
 
     private final ProxyService proxyService;
     private final int pollDelay;
     private final int pollInterval;
 
     volatile boolean running = true;
 
-    public NotificationWatcher(final ProxyService proxyService, final int firstPollInterval,
-        final int nextPollIntervals)
+    public NotificationWatcher(final ProxyService proxyService, final int pollDelay,
+        final int pollInterval)
     {
       this.proxyService = proxyService;
-      this.pollDelay = Math.max(0, firstPollInterval);

[Felix Dahlke, 2015/02/18 14:55:04]

Might as well rename the parameters while at it :P

[René Jeschke, 2015/02/18 15:01:25]

Done.

-      this.pollInterval = Math.max(0, nextPollIntervals);
+      this.pollDelay = Math.max(0, pollDelay);
+      this.pollInterval = Math.max(0, pollInterval);
     }
 
     public NotificationWatcher(final ProxyService proxyService)
     {
-      this(proxyService, DEFAULT_POLL_DELAY, DEFAULT_POLL_INTERVALS);
+      this(proxyService, DEFAULT_POLL_DELAY, DEFAULT_POLL_INTERVAL);
     }
 
     protected void stop()
     {
       this.running = false;
     }
 
     @Override
     public void run()
     {
@@ skipping 14 matching lines @@
         catch (InterruptedException ex)
         {
           break;
         }
 
         if (System.currentTimeMillis() >= nextPoll && this.running)
         {
           try
           {
             Log.d(TAG, "Polling for notifications");
-            org.adblockplus.libadblockplus.Notification notification = AdblockPlus.getApplication()
-                .getNextNotificationToShow();
-
-            int idx = 0;
-            while (notification != null)

[Felix Dahlke, 2015/02/18 14:55:04]

Maybe, just while we're at it, we should ignore question notifications here. So
we can keep the while loop. (Which to me really looks like it could be a for
loop :P)

[René Jeschke, 2015/02/18 15:01:25]

Stayed a 'while', ignoring QUESTION/INVALID now.

+            org.adblockplus.libadblockplus.Notification notification =
+                AdblockPlus.getApplication().getNextNotificationToShow();
+
+            while (notification != null
+                && (notification.getType() == Type.INVALID || notification.getType() == Type.QUESTION))
             {
-              Notification notif = new NotificationCompat.Builder(
-                  this.proxyService.getApplicationContext())
-                  .setSmallIcon(R.drawable.ic_stat_blocking)
-                  .setContentTitle(notification.getTitle())
-                  .setContentText(notification.getMessageString())
-                  .getNotification();
-
+              notification = AdblockPlus.getApplication().getNextNotificationToShow();
+            }
+
+            if (notification != null)
+            {
               final NotificationManager notificationManager = (NotificationManager) this.proxyService
                   .getSystemService(NOTIFICATION_SERVICE);
-              notificationManager.notify(AdblockPlus.GROUPED_NOTIFICATION_ID + idx, notif);
-
-              idx++;
-              notification = AdblockPlus.getApplication().getNextNotificationToShow();
+
+              notificationManager.notify(AdblockPlus.SERVER_NOTIFICATION_ID,
+                  new NotificationCompat.Builder(this.proxyService.getApplicationContext())
+                      .setSmallIcon(R.drawable.ic_stat_blocking)
+                      .setContentTitle(notification.getTitle())
+                      .setContentText(notification.getMessageString())
+                      .getNotification());
             }
-
-            Log.d(TAG, "Received " + idx + " new notifications");
           }
           catch (Exception ex)
           {
             Log.e(TAG, "Polling for notifications failed: " + ex.getMessage(), ex);
           }
 
           if (this.pollInterval == 0)
           {
             this.running = false;
           }
           else
           {
             nextPoll = System.currentTimeMillis() + 1000L * this.pollInterval;
           }
         }
       }
     }
   }
 }