Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java

Issue 29835555: Issue 6799 - Hebrew subscription is not installed for Hebrew locale (Closed)
Patch Set: Created July 20, 2018, 1:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 private volatile FilterChangeCallback filterChangeCallback; 74 private volatile FilterChangeCallback filterChangeCallback;
75 private volatile ShowNotificationCallback showNotificationCallback; 75 private volatile ShowNotificationCallback showNotificationCallback;
76 private volatile boolean elemhideEnabled; 76 private volatile boolean elemhideEnabled;
77 private volatile boolean enabled = true; 77 private volatile boolean enabled = true;
78 private volatile List<String> whitelistedDomains; 78 private volatile List<String> whitelistedDomains;
79 79
80 public static AppInfo generateAppInfo(final Context context, boolean developme ntBuild, 80 public static AppInfo generateAppInfo(final Context context, boolean developme ntBuild,
81 String application, String applicationVe rsion) 81 String application, String applicationVe rsion)
82 { 82 {
83 final String sdkVersion = String.valueOf(VERSION.SDK_INT); 83 final String sdkVersion = String.valueOf(VERSION.SDK_INT);
84 final String locale = Locale.getDefault().toString().replace('_', '-'); 84 String locale = Locale.getDefault().toString().replace('_', '-');
85 if (locale.startsWith("iw-"))
86 {
87 locale = "he" + locale.substring(2);
88 }
diegocarloslima 2018/07/20 13:48:44 Looks good, but I believe that if you use Locale.g
85 89
86 AppInfo.Builder builder = 90 AppInfo.Builder builder =
87 AppInfo 91 AppInfo
88 .builder() 92 .builder()
89 .setApplicationVersion(sdkVersion) 93 .setApplicationVersion(sdkVersion)
90 .setLocale(locale) 94 .setLocale(locale)
91 .setDevelopmentBuild(developmentBuild); 95 .setDevelopmentBuild(developmentBuild);
92 96
93 if (application != null) 97 if (application != null)
94 { 98 {
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 public void setWhitelistedDomains(List<String> domains) 639 public void setWhitelistedDomains(List<String> domains)
636 { 640 {
637 this.whitelistedDomains = domains; 641 this.whitelistedDomains = domains;
638 } 642 }
639 643
640 public List<String> getWhitelistedDomains() 644 public List<String> getWhitelistedDomains()
641 { 645 {
642 return whitelistedDomains; 646 return whitelistedDomains;
643 } 647 }
644 } 648 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld