Issue 5919 - Adjust our code to the new messaging system

mobile/android/thirdparty/org/adblockplus/browser/SubscriptionContainer.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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.browser;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 
-import org.mozilla.gecko.util.NativeJSObject;
+import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.util.Log;
 import android.util.Xml;
 
 final class SubscriptionContainer implements AdblockPlusApiCallback
 {
   private static final String TAG = SubscriptionContainer.class.getName();
   private final ConcurrentHashMap<String, Boolean> enableState = new ConcurrentHashMap<>();
   private final Semaphore entriesReady = new Semaphore(0);
   private final List<SubscriptionContainer.Subscription> entries = new ArrayList<>();
   private final HashMap<String, SubscriptionContainer.Subscription> urlMap = new HashMap<>();
   private final List<WeakReference<SubscriptionListener>> subscriptionListeners = new ArrayList<>();
 
   private SubscriptionContainer()
   {
     // prevent external instantiation
   }
 
   public final static SubscriptionContainer create()
   {
     return create(true);
   }
 
   public final static SubscriptionContainer create(final boolean refresh)
   {
     final SubscriptionContainer sc = new SubscriptionContainer();
-    AddOnBridge.queryValue(sc, "subscriptionsXml");
+    AddOnBridge.queryValue("subscriptionsXml", sc);
     sc.entriesReady.acquireUninterruptibly();
 
     for (final SubscriptionContainer.Subscription e : sc.entries)
     {
       sc.urlMap.put(e.url, e);
       sc.enableState.put(e.url, Boolean.FALSE);
     }
 
     if (refresh)
     {
@@ skipping 75 matching lines @@
       }
     }
 
     if (shouldAddListener)
     {
       this.subscriptionListeners.add(new WeakReference<>(listener));
     }
   }
 
   @Override
-  public void onApiRequestSucceeded(NativeJSObject jsObject)
+  public void onApiRequestSucceeded(GeckoBundle bundle)
   {
     final XmlPullParser parser = Xml.newPullParser();
     try
     {
       parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-      parser.setInput(new StringReader(AddOnBridge.getStringFromJsObject(jsObject, "value", "")));
+      parser.setInput(new StringReader(bundle.getString("value", "")));
       parser.nextTag();
       parser.require(XmlPullParser.START_TAG, null, "subscriptions");
       while (parser.next() != XmlPullParser.END_TAG)
       {
         if (parser.getEventType() != XmlPullParser.START_TAG)
         {
           continue;
         }
         if ("subscription".equals(parser.getName()))
         {
@@ skipping 55 matching lines @@
         final SubscriptionChangeAction.Mode mode)
     {
       return new SubscriptionChangeAction(subscription, parent, mode).post();
     }
 
     public SubscriptionContainer.SubscriptionChangeAction post()
     {
       switch (this.mode)
       {
         case QUERY_SUBSCRIPTION_ENABLED:
-          AddOnBridge.querySubscriptionListStatus(this, this.subscription.url);
+          AddOnBridge.querySubscriptionListStatus(this.subscription.url, this);
           break;
         case ENABLE_SUBSCRIPTION:
-          AddOnBridge.addSubscription(this, this.subscription.url, this.subscription.title);
+          AddOnBridge.addSubscription(this.subscription.url, this.subscription.title, this);
           break;
         case DISABLE_SUBSCRIPTION:
-          AddOnBridge.removeSubscription(this, this.subscription.url);
+          AddOnBridge.removeSubscription(this.subscription.url, this);
           break;
         default:
           break;
       }
       return this;
     }
 
     @Override
-    public void onApiRequestSucceeded(NativeJSObject jsObject)
+    public void onApiRequestSucceeded(GeckoBundle bundle)
     {
       switch (this.mode)
       {
         case QUERY_SUBSCRIPTION_ENABLED:
           try
           {
-            this.parent.enableState.put(this.subscription.url,
-                Boolean.valueOf(AddOnBridge.getBooleanFromJsObject(jsObject, "value", false)));
+            this.parent.enableState.put(this.subscription.url, bundle.getBoolean("value"));
           }
           finally
           {
             this.parent.entriesReady.release();
           }
           break;
         case ENABLE_SUBSCRIPTION:
         case DISABLE_SUBSCRIPTION:
           this.parent.enableState.put(this.subscription.url, this.mode == Mode.ENABLE_SUBSCRIPTION);
           final Iterator<WeakReference<SubscriptionListener>> iterator = this.parent.subscriptionListeners.iterator();
@@ skipping 60 matching lines @@
     {
       return this.specialization + " (" + this.title + ") @ " + this.url;
     }
   }
 
   public interface SubscriptionListener
   {
     void onSubscriptionUpdated();
   }
 }