Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

src/org/adblockplus/libadblockplus/ShowNotificationCallback.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.libadblockplus;
 
-public abstract class UpdateAvailableCallback implements Disposable
+public abstract class ShowNotificationCallback implements Disposable

[Felix Dahlke, 2015/11/20 07:53:52]

This change looks strange, isn't this a new file? Did anything happen to
UpdateAvailableCallback.java?

[René Jeschke, 2015/11/20 12:19:15]

It actually is a new file, git also displays it as a new one, strangely
upload.py seems to base it on UpdateAvailableCallback.

So, no, UpdateAvailableCallback has not been changed nor deleted.

[Felix Dahlke, 2015/11/20 12:21:28]

OK, thought so. Maybe it has to do with Git's magic about detecting renames or
something.

 {
   private final Disposer disposer;
   protected final long ptr;
 
   static
   {
     System.loadLibrary("adblockplus-jni");
     registerNatives();
   }
 
-  public UpdateAvailableCallback()
+  public ShowNotificationCallback()
   {
     this.ptr = ctor(this);
     this.disposer = new Disposer(this, new DisposeWrapper(this.ptr));
   }
 
-  public abstract void updateAvailableCallback(String url);
+  public abstract void showNotificationCallback(Notification jsValue);
 
   @Override
   public void dispose()
   {
     this.disposer.dispose();
   }
 
   private final static class DisposeWrapper implements Disposable
   {
     private final long ptr;
 
     public DisposeWrapper(final long ptr)
     {
       this.ptr = ptr;
     }
 
     @Override
     public void dispose()
     {
       dtor(this.ptr);
     }
   }
 
   private final static native void registerNatives();
 
   private final static native long ctor(Object callbackObject);
 
   private final static native void dtor(long ptr);
 }