cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix account crash on Android 7, fixes #1956

Browse Source
This commit is contained in:
Dominik Schürmann
2016-11-30 18:41:11 +01:00
parent b02f50dd22
commit 7d7a184f79
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1535,7 +1535,7 @@
<!-- Android Account --> <!-- Android Account -->
<string name="account_no_manual_account_creation">"You can not create OpenKeychain accounts manually."</string> <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_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_title">"Access to contacts required"</string>
<string name="sync_notification_permission_required_text">"Touch to configure linking to contacts"</string> <string name="sync_notification_permission_required_text">"Touch to configure linking to contacts"</string>

7
OpenKeychain/src/main/res/xml/account_preferences.xml
View File

@@ -1,10 +1,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/account_privacy_title" /> <PreferenceScreen
<Preference
android:persistent="false" android:persistent="false"
android:selectable="false" android:selectable="false"
android:summary="@string/account_privacy_text" /> android:summary="@string/account_privacy_text"
android:title="@string/account_privacy_title" />
</PreferenceScreen> </PreferenceScreen>