Issue 6591 - Bundle ABP for Samsung Internet China with Easylist for China

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/SubscriptionUtils.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.sbrowser.contentblocker.util;
 
 import java.util.List;
 import java.util.Locale;
 
+import org.adblockplus.adblockplussbrowser.BuildConfig;
 import org.adblockplus.sbrowser.contentblocker.engine.DefaultSubscriptionInfo;
 import org.adblockplus.sbrowser.contentblocker.engine.Engine;
 
 import android.content.res.Resources;
 
 public class SubscriptionUtils
 {
 
+  public static final String EASYLIST_URL = "https://easylist-downloads.adblockplus.org/easylist.txt";
+  private static final String EASYLIST_CHINA_URL ="https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt";

[anton, 2018/04/20 14:03:20]

why can't it be public?

[diegocarloslima, 2018/04/20 14:48:52]

It actually can, but since it was't being used anywhere else I left as private,
but if you think is valid to keep it public, I'm fine with that

[anton, 2018/04/20 14:50:28]

ok, i'm not strong about it. Just wanted to make sure it was intentional and
consistent with other code.

+
   private static final String INDONESIAN_OLD = "in";
   private static final String INDONESIAN_NEW = "id";
   private static final String HEBREW_OLD = "iw";
   private static final String HEBREW_NEW = "he";
   private static final String YIDDISH_OLD = "ji";
   private static final String YIDDISH_NEW = "yi";
 
   /**
    * @param defaultSubscriptions
    * @return The URL of the filter list which fits best for the device language.
    * If no match was found, return EASYLIST as default.
    */
   public static String chooseDefaultSubscriptionUrl(List<DefaultSubscriptionInfo> defaultSubscriptions)
   {
+    if(BuildConfig.FLAVOR.equals(BuildConfig.FLAVOR_REGION_CHINA))

[anton, 2018/04/20 14:03:20]

isn't space require here?

[diegocarloslima, 2018/04/20 14:48:52]

Acknowledged.

+    {
+      return EASYLIST_CHINA_URL;
+    }
     for (final DefaultSubscriptionInfo info : defaultSubscriptions)
     {
       if (info != null && info.getPrefixes().contains(getDeviceLanguageCode()) && info.isComplete())
       {
         return info.getUrl();
       }
     }
-    return Engine.EASYLIST_URL;
+    return EASYLIST_URL;
   }
 
   @SuppressWarnings("deprecation")
   private static String getDeviceLanguageCode()
   {
     Locale locale;
     if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
     {
       locale = Resources.getSystem().getConfiguration().getLocales().get(0);
     }
@@ skipping 19 matching lines @@
         return HEBREW_NEW;
       case YIDDISH_OLD:
         return YIDDISH_NEW;
       case INDONESIAN_OLD:
         return INDONESIAN_NEW;
       default:
         return language;
     }
   }
 }