From 7d7a184f799d34d3c19508fdb99a5b3eea659601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Nov 2016 18:41:11 +0100
Subject: [PATCH] Fix account crash on Android 7, fixes #1956

---
 OpenKeychain/src/main/res/values/strings.xml          | 2 +-
 OpenKeychain/src/main/res/xml/account_preferences.xml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3ef164443..593afa797 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1535,7 +1535,7 @@
     <!-- Android Account -->
     <string name="account_no_manual_account_creation">"You can not create OpenKeychain accounts manually."</string>
     <string name="account_privacy_title">"Privacy"</string>
-    <string name="account_privacy_text">"OpenKeychain does not synchronize your contacts with the Internet. It only links contacts to keys based on names and email addresses. It does this offline on your device."</string>
+    <string name="account_privacy_text">"OpenKeychain does not synchronize your contacts with the Internet. It only links contacts to keys based on names and email addresses. This is done offline on your device."</string>
     <string name="sync_notification_permission_required_title">"Access to contacts required"</string>
     <string name="sync_notification_permission_required_text">"Touch to configure linking to contacts"</string>
 
diff --git a/OpenKeychain/src/main/res/xml/account_preferences.xml b/OpenKeychain/src/main/res/xml/account_preferences.xml
index 3fdb54f1e..484968a5d 100644
--- a/OpenKeychain/src/main/res/xml/account_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/account_preferences.xml
@@ -1,10 +1,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/account_privacy_title" />
-
-    <Preference
+    <PreferenceScreen
         android:persistent="false"
         android:selectable="false"
-        android:summary="@string/account_privacy_text" />
+        android:summary="@string/account_privacy_text"
+        android:title="@string/account_privacy_title" />
 
 </PreferenceScreen>
\ No newline at end of file