From 7adf07a9f9bc53ec98338f92b760b75e31559c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 21 Aug 2014 10:47:29 +0200
Subject: [PATCH] XML cleanup

---
 .../src/main/res/xml/account_desc.xml         |  7 +++----
 .../src/main/res/xml/adv_preferences.xml      | 17 -----------------
 .../res/xml/custom_pgp_contacts_structure.xml |  5 +++--
 .../src/main/res/xml/gen_preferences.xml      | 19 +------------------
 .../src/main/res/xml/preference_headers.xml   | 17 -----------------
 .../res/xml/preference_headers_legacy.xml     | 17 -----------------
 .../src/main/res/xml/sync_adapter_desc.xml    |  8 ++++----
 7 files changed, 11 insertions(+), 79 deletions(-)

diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml
index a6989e9ef..41ce8fe48 100644
--- a/OpenKeychain/src/main/res/xml/account_desc.xml
+++ b/OpenKeychain/src/main/res/xml/account_desc.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="org.sufficientlysecure.keychain"
-                       android:icon="@drawable/ic_launcher"
-                       android:label="@string/app_name"/>
+    android:accountType="org.sufficientlysecure.keychain"
+    android:icon="@drawable/ic_launcher"
+    android:label="@string/app_name" />
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index 49f241ffe..02fa4ec40 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/section_defaults">
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
index 5f5f2be80..39dd8bc91 100644
--- a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
+++ b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
-                      android:detailColumn="data1"/>
+    <ContactsDataKind
+        android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
+        android:detailColumn="data1" />
 </ContactsSource>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml
index 10be61b6a..fd3c6c31a 100644
--- a/OpenKeychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/gen_preferences.xml
@@ -1,22 +1,5 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/section_general" >
+    <PreferenceCategory android:title="@string/section_general">
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:entries="@array/passphrase_cache_ttl_entries"
             android:entryValues="@array/passphrase_cache_ttl_values"
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 49c8b7634..e6b68507a 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
         android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment"
diff --git a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
index 295b44863..47b0a0920 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
@@ -1,20 +1,3 @@
-<!--
-    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference
         android:title="@string/section_general" >
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
index d8fe60e91..bbfd41842 100644
--- a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="com.android.contacts"
-              android:accountType="org.sufficientlysecure.keychain"
-              android:supportsUploading="false"
-              android:userVisible="true"/>
\ No newline at end of file
+    android:contentAuthority="com.android.contacts"
+    android:accountType="org.sufficientlysecure.keychain"
+    android:supportsUploading="false"
+    android:userVisible="true" />
\ No newline at end of file