diff --git a/lib/Tools/Traits/TNCLocalSignatory.php b/lib/Tools/Traits/TNCLocalSignatory.php
index 5b7f5675e..c3af8676c 100644
--- a/lib/Tools/Traits/TNCLocalSignatory.php
+++ b/lib/Tools/Traits/TNCLocalSignatory.php
@@ -13,7 +13,7 @@
use OCA\Circles\Tools\Exceptions\SignatoryException;
use OCA\Circles\Tools\Model\NCSignatory;
-use OCP\IConfig;
+use OCP\IAppConfig;
use OCP\Server;
trait TNCLocalSignatory {
@@ -30,10 +30,8 @@ trait TNCLocalSignatory {
*/
public function fillSimpleSignatory(NCSignatory $signatory, bool $generate = false): void {
$app = $this->setup('app', '', self::$SIGNATORIES_APP);
- $signatories = json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs'), true);
- if (!is_array($signatories)) {
- $signatories = [];
- }
+ $appConfig = Server::get(IAppConfig::class);
+ $signatories = $appConfig->getValueArray($app, 'key_pairs');
$sign = $this->getArray($signatory->getId(), $signatories);
if (!empty($sign)) {
@@ -62,8 +60,8 @@ public function createSimpleSignatory(NCSignatory $signatory): void {
$signatory->setKeyOwner($signatory->getId());
$this->generateKeys($signatory);
- $signatories =
- json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs', '[]'), true);
+ $appConfig = Server::get(IAppConfig::class);
+ $signatories = $appConfig->getValueArray($app, 'key_pairs');
$signatories[$signatory->getId()] = [
'keyId' => $signatory->getKeyId(),
'keyOwner' => $signatory->getKeyOwner(),
@@ -71,7 +69,7 @@ public function createSimpleSignatory(NCSignatory $signatory): void {
'privateKey' => $signatory->getPrivateKey()
];
- Server::get(IConfig::class)->setAppValue($app, 'key_pairs', json_encode($signatories));
+ $appConfig->setValueArray($app, 'key_pairs', $signatories);
}
@@ -80,12 +78,10 @@ public function createSimpleSignatory(NCSignatory $signatory): void {
*/
public function removeSimpleSignatory(NCSignatory $signatory): void {
$app = $this->setup('app', '', self::$SIGNATORIES_APP);
- $signatories = json_decode(Server::get(IConfig::class)->getAppValue($app, 'key_pairs'), true);
- if (!is_array($signatories)) {
- $signatories = [];
- }
+ $appConfig = Server::get(IAppConfig::class);
+ $signatories = $appConfig->getValueArray($app, 'key_pairs');
unset($signatories[$signatory->getId()]);
- Server::get(IConfig::class)->setAppValue($app, 'key_pairs', json_encode($signatories));
+ $appConfig->setValueArray($app, 'key_pairs', $signatories);
}
}
diff --git a/lib/Tools/Traits/TNCSetup.php b/lib/Tools/Traits/TNCSetup.php
index 9262abc84..ec74762ae 100644
--- a/lib/Tools/Traits/TNCSetup.php
+++ b/lib/Tools/Traits/TNCSetup.php
@@ -11,7 +11,7 @@
namespace OCA\Circles\Tools\Traits;
-use OCP\IConfig;
+use OCP\IAppConfig;
use OCP\Server;
trait TNCSetup {
@@ -79,8 +79,8 @@ public function appConfig(string $key): string {
return '';
}
- $config = Server::get(IConfig::class);
+ $config = Server::get(IAppConfig::class);
- return $config->getAppValue($app, $key, '');
+ return $config->getValueString($app, $key, '');
}
}
diff --git a/psalm.xml b/psalm.xml
index 5fe3895a8..07c1b4bab 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -93,4 +93,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 6def66372..099a23e2b 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -5,7 +5,32 @@
getAppContainer()]]>
+ getServerContainer()]]>
+ getUserId())]]>
+ getId()]]>
getId()]]>
@@ -30,12 +55,41 @@
getItemsFromRequest($qb)]]>
@@ -52,12 +106,31 @@
settings)]]>
@@ -87,6 +178,9 @@
+
+ get('addressBookId', $data)]]>
+
+
+ l10n->t('This member does not exist'))]]>
+ l10n->t('This member does not exist'))]]>
+
+
getUserId())]]>
+