diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:56:02 +0200 |
commit | d20ca24a070d547be3bce4d513ef151b6be5f955 (patch) | |
tree | b0b56d41c3f41db217e8f894c0545a0217dbba4f /toolkit/components/parentalcontrols | |
parent | b2ca17a29814f6aaf043240cd1ec2f86ca989419 (diff) | |
download | UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.gz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.lz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.xz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.zip |
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/components/parentalcontrols')
-rw-r--r-- | toolkit/components/parentalcontrols/moz.build | 20 | ||||
-rw-r--r-- | toolkit/components/parentalcontrols/nsParentalControlsServiceAndroid.cpp | 103 |
2 files changed, 4 insertions, 119 deletions
diff --git a/toolkit/components/parentalcontrols/moz.build b/toolkit/components/parentalcontrols/moz.build index 083312fef..17db8aaee 100644 --- a/toolkit/components/parentalcontrols/moz.build +++ b/toolkit/components/parentalcontrols/moz.build @@ -4,28 +4,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -XPIDL_SOURCES += [ - 'nsIParentalControlsService.idl', -] +XPIDL_SOURCES += ['nsIParentalControlsService.idl'] XPIDL_MODULE = 'parentalcontrols' if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']: if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - SOURCES += [ - 'nsParentalControlsServiceWin.cpp', - ] + SOURCES += ['nsParentalControlsServiceWin.cpp'] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ - 'nsParentalControlsServiceCocoa.mm', - ] - elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - UNIFIED_SOURCES += [ - 'nsParentalControlsServiceAndroid.cpp', - ] + UNIFIED_SOURCES += ['nsParentalControlsServiceCocoa.mm'] else: - SOURCES += [ - 'nsParentalControlsServiceDefault.cpp', - ] + SOURCES += ['nsParentalControlsServiceDefault.cpp'] FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/parentalcontrols/nsParentalControlsServiceAndroid.cpp b/toolkit/components/parentalcontrols/nsParentalControlsServiceAndroid.cpp deleted file mode 100644 index 364749000..000000000 --- a/toolkit/components/parentalcontrols/nsParentalControlsServiceAndroid.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsParentalControlsService.h" -#include "nsString.h" -#include "nsIFile.h" -#include "FennecJNIWrappers.h" - -namespace java = mozilla::java; - -NS_IMPL_ISUPPORTS(nsParentalControlsService, nsIParentalControlsService) - -nsParentalControlsService::nsParentalControlsService() : - mEnabled(false) -{ - if (mozilla::jni::IsFennec()) { - mEnabled = java::Restrictions::IsUserRestricted(); - } -} - -nsParentalControlsService::~nsParentalControlsService() -{ -} - -NS_IMETHODIMP -nsParentalControlsService::GetParentalControlsEnabled(bool *aResult) -{ - *aResult = mEnabled; - return NS_OK; -} - -NS_IMETHODIMP -nsParentalControlsService::GetBlockFileDownloadsEnabled(bool *aResult) -{ - // NOTE: isAllowed returns the opposite intention, so we need to flip it - bool res; - IsAllowed(nsIParentalControlsService::DOWNLOAD, NULL, &res); - *aResult = !res; - - return NS_OK; -} - -NS_IMETHODIMP -nsParentalControlsService::GetLoggingEnabled(bool *aResult) -{ - // Android doesn't currently have any method of logging restricted actions. - *aResult = false; - return NS_OK; -} - -NS_IMETHODIMP -nsParentalControlsService::Log(int16_t aEntryType, - bool aBlocked, - nsIURI *aSource, - nsIFile *aTarget) -{ - return NS_ERROR_NOT_AVAILABLE; -} - -NS_IMETHODIMP -nsParentalControlsService::RequestURIOverride(nsIURI *aTarget, - nsIInterfaceRequestor *aWindowContext, - bool *_retval) -{ - return NS_ERROR_NOT_AVAILABLE; -} - -NS_IMETHODIMP -nsParentalControlsService::RequestURIOverrides(nsIArray *aTargets, - nsIInterfaceRequestor *aWindowContext, - bool *_retval) -{ - return NS_ERROR_NOT_AVAILABLE; -} - -NS_IMETHODIMP -nsParentalControlsService::IsAllowed(int16_t aAction, - nsIURI *aUri, - bool *_retval) -{ - nsresult rv = NS_OK; - *_retval = true; - - if (!mEnabled) { - return rv; - } - - if (mozilla::jni::IsFennec()) { - nsAutoCString url; - if (aUri) { - rv = aUri->GetSpec(url); - NS_ENSURE_SUCCESS(rv, rv); - } - - *_retval = java::Restrictions::IsAllowed(aAction, - NS_ConvertUTF8toUTF16(url)); - return rv; - } - - return NS_ERROR_NOT_AVAILABLE; -} |