Skip to content

Commit ce2efca

Browse files
authored
Merge a6808ab into e094bd9
2 parents e094bd9 + a6808ab commit ce2efca

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/Controller/APIv2Controller.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ protected function get($filter, $since, $limit, $previews, $filterObjectType, $f
184184
return new DataResponse([], Http::STATUS_FORBIDDEN);
185185
}
186186

187-
$this->activityManager->setRequirePNG($this->request->isUserAgent([IRequest::USER_AGENT_CLIENT_IOS]));
187+
$this->activityManager->setRequirePNG(false);
188188
try {
189189
$response = $this->data->get(
190190
$this->helper,

tests/Controller/APIv1ControllerTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ public function testGet(string $user, int $start, int $count, array $expected):
208208
$this->createMock(IUserSession::class),
209209
$config,
210210
\OC::$server->query(IValidator::class),
211-
$this->createMock(IL10N::class)
211+
\OC::$server->query(\OCP\RichObjectStrings\IRichTextFormatter::class),
212+
$this->createMock(IL10N::class),
212213
);
213214
$activityManager->registerProvider(Provider::class);
214215
$activityManager->registerSetting(Setting1::class);

0 commit comments

Comments
 (0)