Merge changes for v1.14-r4, updating manifest for 1.15-r1 release

Author: PhilippC

src/Kp2aBusinessLogic/database/edit/AddTemplateEntries.cs

@@ -175,30 +175,40 @@ public AddTemplateEntries(IKp2aApp app, OnOperationFinishedHandler operationFini
                         }
                     }
                 },
-                new TemplateEntry()
-                {
-                    Title = UiStringKey.TemplateTitle_EMail,
-                    Icon = PwIcon.EMail,
-                    Uuid = new PwUuid(MemUtil.HexStringToByteArray("0B84EC3029E330478CD99B670942295B")),
-                    Fields = new List<TemplateEntry.ITemplateField>()
-                    {
-                        new TemplateEntry.CustomField()
-                        {
-                            FieldName = UiStringKey.TemplateField_EMail_EMail,
-                            Type = TemplateEntry.FieldType.Inline
-                        },
-                        new TemplateEntry.StandardField()
-                        {
-                            FieldName = PwDefs.UrlField
-                        },
-                        new TemplateEntry.StandardField()
-                        {
-                            FieldName = PwDefs.PasswordField
-                        }
-
-                    }
-                },
-                new TemplateEntry()
+				/*
+				On 2025-11-25, Google refused to accept app updates because it claims the app collects e-mail addresses 
+				but does not declare so in the data security declaration.
+				I sent an appeal but that was no accepted. There are now two bad choices: 
+				1.) Declare that we are collecting PII 
+				    (which is visible to everybody on the Play page and leads to a bunch of follow up questions which are all non-sense,
+				    e.g. can the user have this info deleted)
+				2.) or remove the e-mail template, because the screenshot they sent as "proof" showed creating a new entry there.
+				Let's go with 2.
+				new TemplateEntry()
+				{
+					Title = UiStringKey.TemplateTitle_EMail,
+					Icon = PwIcon.EMail,
+					Uuid = new PwUuid(MemUtil.HexStringToByteArray("0B84EC3029E330478CD99B670942295B")),
+					Fields = new List<TemplateEntry.ITemplateField>()
+					{
+						new TemplateEntry.CustomField()
+						{
+							FieldName = UiStringKey.TemplateField_EMail_EMail,
+							Type = TemplateEntry.FieldType.Inline
+						},
+						new TemplateEntry.StandardField()
+						{
+							FieldName = PwDefs.UrlField
+						},
+						new TemplateEntry.StandardField()
+						{
+							FieldName = PwDefs.PasswordField
+						}
+
+				    }
+				},
+                */
+				new TemplateEntry()
                 {
                     Title = UiStringKey.TemplateTitle_WLan,
                     Icon = PwIcon.IRCommunication,

src/keepass2android-app/Manifests/AndroidManifest_net.xml

@@ -16,8 +16,8 @@
    along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="245"
-      android:versionName="1.15-r0"
+      android:versionCode="247"
+      android:versionName="1.15-r1"
       package="keepass2android.keepass2android"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

@@ -16,8 +16,8 @@
    along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="245"
-      android:versionName="1.15-r0"
+      android:versionCode="247"
+      android:versionName="1.15-r1"
       package="keepass2android.keepass2android_nonet"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">

src/keepass2android-app/Resources/xml/preferences.xml

@@ -38,12 +38,6 @@ Keepassdroid, Copyright Brian Pellin.
     android:title="@string/application"
     android:summary="@string/application_settings" />
 
-
-  <Preference android:key="plugin_key" android:title="@string/plugins" app:iconSpaceReserved="false">
-    
-    <intent android:action="kp2a.action.PluginListActivity" />
-  </Preference>
-
   <Preference
     app:iconSpaceReserved="false"
     android:key="@string/about_prefs_key"