Merge pull request #695 from nextcloud/bugfix/noid/misc

some fixes
pull/698/head
Maxence Lange 2019-08-23 13:04:27 -01:00 zatwierdzone przez GitHub
commit 25fe5dc871
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -94,9 +94,6 @@ class PushService {
/**
* @param string $streamId
*
* @throws SocialAppConfigException
* @throws PushInstallException
*/
public function onNewStream(string $streamId) {
// FIXME: remove in nc18
@ -114,8 +111,13 @@ class PushService {
return;
}
$pushHelper = $this->pushManager->getPushHelper();
$details = $this->detailsService->generateDetailsFromStream($stream);
try {
$pushHelper = $this->pushManager->getPushHelper();
$details = $this->detailsService->generateDetailsFromStream($stream);
} catch (PushInstallException | SocialAppConfigException $e) {
return;
}
$home = array_map(
function(Person $item): string {
return $item->getUserId();

Wyświetl plik

@ -396,12 +396,12 @@ class SignatureService {
* @param string $publicKey
* @param array $sign
* @param string $estimated
* @param bool $signed
* @param string $signed
*
* @throws SignatureException
*/
private function checkRequestSignatureUsingPublicKey(
string $publicKey, array $sign, string $estimated, bool $signed
string $publicKey, array $sign, string $estimated, string $signed
) {
$algorithm = $this->getAlgorithmFromSignature($sign);
if ($publicKey === ''