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 632 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();
-
-            final NotificationManager notificationManager = (NotificationManager) this.proxyService
-                .getSystemService(NOTIFICATION_SERVICE);
-            int idx = 0;
-            while (notification != null)
+            org.adblockplus.libadblockplus.Notification notification =
+                AdblockPlus.getApplication().getNextNotificationToShow();
+
+            while (notification != null
+                && (notification.getType() == Type.INVALID || notification.getType() == Type.QUESTION))
             {
-              switch (notification.getType())
-              {
-                case CRITICAL:
-                case INFORMATION:
-                  notificationManager.notify(AdblockPlus.GROUPED_NOTIFICATION_ID + idx,
-                      new NotificationCompat.Builder(this.proxyService.getApplicationContext())
-                          .setSmallIcon(R.drawable.ic_stat_blocking)
-                          .setContentTitle(notification.getTitle())
-                          .setContentText(notification.getMessageString())
-                          .getNotification());
-                  idx++;

[Felix Dahlke, 2015/02/18 15:36:55]

We don't really need the index. More importantly, we need to exit the loop here
once we show any notification. We just need to keep looping until we have a
non-question notification.

[René Jeschke, 2015/02/18 15:42:58]

Done.

-                  break;
-                default:
-                  break;
-              }
-
               notification = AdblockPlus.getApplication().getNextNotificationToShow();
             }
 
-            Log.d(TAG, "Received " + idx + " new notifications");
+            if (notification != null)
+            {
+              final NotificationManager notificationManager = (NotificationManager) this.proxyService
+                  .getSystemService(NOTIFICATION_SERVICE);
+
+              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());
+            }
           }
           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;
           }
         }
       }
     }
   }
 }