From e7a54e69d1d3649893c5383616fe8ecbdcfb6de9 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 11 Oct 2022 10:53:15 +0200
Subject: [PATCH] Nextcloud25 Call to undefined method
 OC_App::registerPersonal() #96
 https://github.com/pierre-alain-b/rainloop-nextcloud/issues/285

---
 .../nextcloud/snappymail/appinfo/app.php       |  2 --
 .../nextcloud/snappymail/appinfo/info.xml      | 18 +++++++++---------
 .../snappymail/lib/AppInfo/Application.php     |  5 -----
 .../lib/Settings/PersonalSettings.php          | 13 +++++++++++--
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/integrations/nextcloud/snappymail/appinfo/app.php b/integrations/nextcloud/snappymail/appinfo/app.php
index 7b86a17b8..71cd1fdb4 100644
--- a/integrations/nextcloud/snappymail/appinfo/app.php
+++ b/integrations/nextcloud/snappymail/appinfo/app.php
@@ -10,6 +10,4 @@
 
 $app = new OCA\SnappyMail\AppInfo\Application();
 $app->registerNavigation();
-$app->registerPersonalSettings();
 $app->getContainer()->query('SnappyMailHelper')->registerHooks();
-
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index bded35fb7..712291113 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -6,24 +6,24 @@
 	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).</description>
 	<version>2.18.5</version>
 	<licence>agpl</licence>
-	<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
-  <namespace>SnappyMail</namespace>
+	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
+	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/pierre-alain-b/snappymail-nextcloud/blob/master/README.md</user>
+		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
 		<website>https://snappymail.eu/</website>
 	</documentation>
 	<category>social</category>
     <category>tools</category>
     <category>integration</category>
     <screenshot>https://raw.githubusercontent.com/pierre-alain-b/snappymail-nextcloud/master/screenshots/2016.10.20-screenshot.jpg</screenshot>
-	<website>https://github.com/pierre-alain-b/snappymail-nextcloud</website>
-	<bugs>https://github.com/pierre-alain-b/snappymail-nextcloud/issues</bugs>
+	<website>https://github.com/the-djmaze/snappymail</website>
+	<bugs>https://github.com/the-djmaze/snappymail/issues/96</bugs>
 	<dependencies>
-    <php min-version="7.4" />
-		<owncloud min-version="6" max-version="9.2" />
-		<nextcloud min-version="20" max-version="22" />
-  </dependencies>
+		<php min-version="7.4" />
+		<nextcloud min-version="20" max-version="24" />
+	</dependencies>
 	<settings>
 		<admin>OCA\SnappyMail\Settings\AdminSettings</admin>
+		<personal>OCA\SnappyMail\Settings\PersonalSettings</personal>
 	</settings>
 </info>
diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index 0b15bd017..bd1b439b4 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -71,9 +71,4 @@ class Application extends App {
 		});
 	}
 
-	public function registerPersonalSettings() {
-		\OCP\App::registerPersonal('snappymail', 'templates/personal');
-	}
-
 }
-
diff --git a/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php b/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
index e931868a5..318c0befa 100644
--- a/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
+++ b/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
@@ -3,8 +3,10 @@ namespace OCA\SnappyMail\Settings;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
+use OCP\Settings\ISettings;
 
-class PersonalSettings {
+class PersonalSettings implements ISettings
+{
 	private $config;
 
 	public function __construct(IConfig $config) {
@@ -28,5 +30,12 @@ class PersonalSettings {
 		return new TemplateResponse('snappymail', 'personal_settings', $parameters, '');
 	}
 
-}
+	public function getSection() {
+		return 'additional';
+	}
 
+	public function getPriority() {
+		return 50;
+	}
+
+}