From 0d4b818f4765f61804285f9619610bd06aaa2d92 Mon Sep 17 00:00:00 2001 From: Allison Naaktgeboren Date: Fri, 14 Aug 2015 13:57:29 -0700 Subject: [PATCH] Bug 1189790 - Include bookmarks for Kinderfox.r=sebastian --- mobile/android/base/GeckoProfile.java | 3 --- mobile/android/base/db/LocalBrowserDB.java | 16 ++++++++++++++++ ...kmarkdefaults_favicon_restricted_support.png | Bin 0 -> 20144 bytes ...markdefaults_favicon_restricted_webmaker.png | Bin 0 -> 5455 bytes mobile/android/base/strings.xml.in | 6 ++++++ .../android/base/util/UnusedResourcesUtil.java | 2 ++ mobile/locales/en-US/profile/bookmarks.inc | 8 ++++++++ 7 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png create mode 100644 mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java index 134b5cbaa639..84011fdfcffe 100644 --- a/mobile/android/base/GeckoProfile.java +++ b/mobile/android/base/GeckoProfile.java @@ -909,9 +909,6 @@ public final class GeckoProfile { if (!profileDir.exists()) { return; } - if (RestrictedProfiles.isUserRestricted(context)) { - return; - } // We pass the number of added bookmarks to ensure that the // indices of the distribution and default bookmarks are diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java index 3ee673694616..01cf08809a88 100644 --- a/mobile/android/base/db/LocalBrowserDB.java +++ b/mobile/android/base/db/LocalBrowserDB.java @@ -40,6 +40,7 @@ import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.favicons.decoders.FaviconDecoder; import org.mozilla.gecko.favicons.decoders.LoadFaviconResult; import org.mozilla.gecko.gfx.BitmapUtils; +import org.mozilla.gecko.RestrictedProfiles; import org.mozilla.gecko.sync.Utils; import org.mozilla.gecko.util.GeckoJarReader; import org.mozilla.gecko.util.StringUtils; @@ -224,6 +225,21 @@ public class LocalBrowserDB implements BrowserDB { } try { + if (RestrictedProfiles.isRestrictedProfile()) { + // matching on variable name from strings.xml.in + final String addons = "bookmarkdefaults_title_addons"; + final String marketplace = "bookmarkdefaults_title_marketplace"; + final String regularSumo = "bookmarkdefaults_title_support"; + if (name.equals(addons) || name.equals(marketplace) || name.equals(regularSumo)) { + continue; + } + } + if (!RestrictedProfiles.isRestrictedProfile()) { + // if we're not in kidfox, skip the kidfox specific bookmark(s) + if (name.startsWith("bookmarkdefaults_title_restricted")) { + continue; + } + } final int titleID = fields[i].getInt(null); final String title = context.getString(titleID); diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png new file mode 100644 index 0000000000000000000000000000000000000000..ea7d6a3aeb309205443e72cdb6666bd3201f19ce GIT binary patch literal 20144 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 literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png new file mode 100644 index 0000000000000000000000000000000000000000..ad177aa868450fbdea94533aa351aa40380561dc GIT binary patch literal 5455 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 https://marketplace.firefox.com/ + @bookmarks_restricted_webmaker@ + https://webmaker.org/ + + @bookmarks_restricted_support@ + https://support.mozilla.org/kb/kids + &identity_connection_secure; &identity_connection_insecure; diff --git a/mobile/android/base/util/UnusedResourcesUtil.java b/mobile/android/base/util/UnusedResourcesUtil.java index 6cf1cda285d9..5bfd4d400571 100644 --- a/mobile/android/base/util/UnusedResourcesUtil.java +++ b/mobile/android/base/util/UnusedResourcesUtil.java @@ -62,6 +62,8 @@ final class UnusedResourcesUtil { R.raw.bookmarkdefaults_favicon_addons, R.raw.bookmarkdefaults_favicon_marketplace, R.raw.bookmarkdefaults_favicon_support, + R.raw.bookmarkdefaults_favicon_restricted_support, + R.raw.bookmarkdefaults_favicon_restricted_webmaker, }; public static final int[] USED_IN_PREFS = { diff --git a/mobile/locales/en-US/profile/bookmarks.inc b/mobile/locales/en-US/profile/bookmarks.inc index 2fbf208b38e4..dd25ad102997 100644 --- a/mobile/locales/en-US/profile/bookmarks.inc +++ b/mobile/locales/en-US/profile/bookmarks.inc @@ -30,4 +30,12 @@ # link title for https://marketplace.firefox.com #define bookmarks_marketplace Firefox Marketplace +# LOCALIZATION NOTE (bookmarks_restricted_support): +# link title for https://support.mozilla.org/kb/kids +#define bookmarks_restricted_support Firefox Help and Support for a simplified kid-friendly version of Firefox + +# LOCALIZATION NOTE (bookmarks_restricted_webmaker): +# link title for https://webmaker.org +#define bookmarks_restricted_webmaker Learn the Web: Mozilla Webmaker + #unfilter emptyLines