Skip to content

Add Apple Provisioning profile #10068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Jan 31, 2019
Merged

Add Apple Provisioning profile #10068

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16fec60
Add Apple Provisioning profile
georgehrke Oct 19, 2017
9d285c4
Fix theming defaults injection if theming app is disabled
MorrisJobke Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix theming defaults injection if theming app is disabled 
Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke
MorrisJobke committed Jan 31, 2019
commit 9d285c4459fcc89c4f875b9e4d9c362146404dfd
8 changes: 3 additions & 5 deletions apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@

namespace OCA\DAV\Provisioning\Apple;

use OCA\Theming\ThemingDefaults;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\DAV\UUIDUtil;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;

Expand All @@ -52,7 +50,7 @@ class AppleProvisioningPlugin extends ServerPlugin {
protected $userSession;

/**
* @var ThemingDefaults
* @var \OC_Defaults
*/
protected $themingDefaults;

Expand All @@ -76,13 +74,13 @@ class AppleProvisioningPlugin extends ServerPlugin {
*
* @param IUserSession $userSession
* @param IURLGenerator $urlGenerator
* @param ThemingDefaults $themingDefaults
* @param \OC_Defaults $themingDefaults
* @param IRequest $request
* @param IL10N $l10n
* @param \closure $uuidClosure
*/
public function __construct(IUserSession $userSession, IURLGenerator $urlGenerator,
ThemingDefaults $themingDefaults, IRequest $request,
\OC_Defaults $themingDefaults, IRequest $request,
IL10N $l10n, \closure $uuidClosure) {
$this->userSession = $userSession;
$this->urlGenerator = $urlGenerator;
Expand Down