Skip to content

Commit

Permalink
Merge pull request #1793 from nextcloud/require-png-ios
Browse files Browse the repository at this point in the history
Remove requiring PNG for iOS
  • Loading branch information
artonge authored Sep 20, 2024
2 parents e094bd9 + a6808ab commit f438f56
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/Controller/APIv2Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ protected function get($filter, $since, $limit, $previews, $filterObjectType, $f
return new DataResponse([], Http::STATUS_FORBIDDEN);
}

$this->activityManager->setRequirePNG($this->request->isUserAgent([IRequest::USER_AGENT_CLIENT_IOS]));
$this->activityManager->setRequirePNG(false);
try {
$response = $this->data->get(
$this->helper,
Expand Down
3 changes: 2 additions & 1 deletion tests/Controller/APIv1ControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ public function testGet(string $user, int $start, int $count, array $expected):
$this->createMock(IUserSession::class),
$config,
\OC::$server->query(IValidator::class),
$this->createMock(IL10N::class)
\OC::$server->query(\OCP\RichObjectStrings\IRichTextFormatter::class),
$this->createMock(IL10N::class),
);
$activityManager->registerProvider(Provider::class);
$activityManager->registerSetting(Setting1::class);
Expand Down

0 comments on commit f438f56

Please sign in to comment.