Issue 5360 - Whitelist subscription shown as '-user-35236'

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
@@ skipping 263 matching lines @@
     Log.d(TAG, "Adding: " + url);
     this.addNewSubscription(url);
   }
 
   private static class ActiveSubscriptionContainer implements AdblockPlusApiCallback
   {
     public final HashMap<String, String> enabledSubscriptions = new HashMap<String, String>();
     private final Semaphore entriesReady = new Semaphore(0);
     private final Context context;
 
-    ActiveSubscriptionContainer(Context context) {

[anton, 2017/08/07 09:40:16]

`{` should be in the next line

[diegocarloslima, 2017/08/07 11:07:34]

Acknowledged.

+    ActiveSubscriptionContainer(Context context)
+    {
       this.context = context;
     }
 
     public void refresh()
     {
       AddOnBridge.queryActiveSubscriptions(this);
       this.entriesReady.acquireUninterruptibly();
     }
 
     @Override
     public void onApiRequestSucceeded(NativeJSObject jsObject)
     {
       try
       {
         this.enabledSubscriptions.clear();
         if (jsObject.getBoolean("success"))
         {
           NativeJSObject[] subs = jsObject.getObjectArray("value");
           for (int i = 0; i < subs.length; i++)
           {
             final String url = subs[i].getString("url");
 
             String title = subs[i].has("title") ? subs[i].getString("title") : url;
-            if(title.startsWith("~user~")) {

[anton, 2017/08/07 09:40:16]

space expected between `if` and `(`

[anton, 2017/08/07 09:40:16]

`{` is expected to be in the next line

[diegocarloslima, 2017/08/07 11:07:34]

Acknowledged.

+            if (title.startsWith("~user~"))
+            {
               title = this.context.getString(R.string.abb_pref_category_whitelisted_sites);
             }
 
             if (!IGNORED_URLS.contains(url))
             {
               Log.d(TAG, "Adding: " + url + ", " + title);
               this.enabledSubscriptions.put(url, title);
             }
           }
         }
@@ skipping 40 matching lines @@
       // ignored
     }
 
     @Override
     public void onApiRequestFailed(String errorMessage)
     {
       // ignored
     }
   }
 }