[stable21] Fix label of account name and hide parts with subscription

lib/Settings/MissionSettings.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Privacy App
  *
@@ -23,32 +25,30 @@
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
+use OCP\Support\Subscription\IRegistry;
 
-/**
- * Class MissionSettings
- *
- * @package OCA\Privacy\Settings
- */
 class MissionSettings implements ISettings {
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm():TemplateResponse {
+	/** @var IRegistry */
+	protected $subscription;
+
+	public function __construct(IRegistry $subscription) {
+		$this->subscription = $subscription;
+	}
+
+	public function getForm(): TemplateResponse {
 		return new TemplateResponse('privacy', 'mission');
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getSection():string {
+	public function getSection(): ?string {
+		if ($this->subscription->delegateHasValidSubscription()) {
+			return null;
+		}
+
 		return 'privacy';
 	}
 
-	/**
-	 * @return int
-	 */
-	public function getPriority():int {
+	public function getPriority(): int {
 		return 0;
 	}
 }

lib/Settings/UserDataManifestoSettings.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Privacy App
  *
@@ -23,32 +25,30 @@
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
+use OCP\Support\Subscription\IRegistry;
 
-/**
- * Class UserDataManifestoSettings
- *
- * @package OCA\Privacy\Settings
- */
 class UserDataManifestoSettings implements ISettings {
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm():TemplateResponse {
+	/** @var IRegistry */
+	protected $subscription;
+
+	public function __construct(IRegistry $subscription) {
+		$this->subscription = $subscription;
+	}
+
+	public function getForm(): TemplateResponse {
 		return new TemplateResponse('privacy', 'user-data-manifesto');
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getSection():string {
+	public function getSection(): ?string {
+		if ($this->subscription->delegateHasValidSubscription()) {
+			return null;
+		}
+
 		return 'privacy';
 	}
 
-	/**
-	 * @return int
-	 */
-	public function getPriority():int {
+	public function getPriority(): int {
 		return 5;
 	}
 }

templates/mission.php

@@ -4,6 +4,6 @@
 ?>
 
 <div id="themes" class="section">
-	<h2><?php p($l->t('Your Nextcloud account')) ?></h2>
+	<h2><?php p($l->t('Your %s account', $theme->getName())) ?></h2>
 	<p><?php p($l->t('Your data represents who you are and can easily be abused. We at Nextcloud believe that you have a right to decide what happens with your data. Nextcloud protects your rights as defined in the User Data Manifesto!')); ?></p>
 </div>