New Gradle project structure

359 files changed, 0 insertions, 215 deletions

diff --git a/OpenPGP-Keychain/.gitignore b/OpenPGP-Keychain/.gitignore
index afa9dfc45..aa8bb5760 100644
--- a/OpenPGP-Keychain/.gitignore
+++ b/OpenPGP-Keychain/.gitignore
@@ -2,7 +2,6 @@
 bin
 gen
 obj
-libs/armeabi
 lint.xml
 local.properties
 release.properties
@@ -14,9 +13,6 @@ ant.properties
 .gradle
 build
 gradle.properties
-gradlew
-gradlew.bat
-gradle
 
 #Maven
 target
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index b24d7a68c..cf58740e8 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -15,7 +15,6 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar'])
     compile 'com.android.support:support-v4:19.0.+' // already in actionbarsherlock
     compile project(':libraries:ActionBarSherlock')
     compile project(':libraries:HtmlTextView')
@@ -38,20 +37,6 @@ android {
         targetSdkVersion 19
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        instrumentTest.setRoot('tests')
-    }
-
     /*
      * To sign release build, create file gradle.properties in ~/.gradle/ with this content:
      *
diff --git a/OpenPGP-Keychain/build.xml b/OpenPGP-Keychain/build.xml
deleted file mode 100644
index 211b7eb94..000000000
--- a/OpenPGP-Keychain/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Keychain" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/OpenPGP-Keychain/libs/android-support-v4.jar b/OpenPGP-Keychain/libs/android-support-v4.jar
deleted file mode 100644
index 9056828a0..000000000
--- a/OpenPGP-Keychain/libs/android-support-v4.jar
+++ /dev/null
diff --git a/OpenPGP-Keychain/pom.xml b/OpenPGP-Keychain/pom.xml
deleted file mode 100644
index cadb2a38d..000000000
--- a/OpenPGP-Keychain/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<version>1.0.9-SNAPSHOT</version>
-	<groupId>org.thialfihar.android</groupId>
-	<artifactId>apg</artifactId>
-	<packaging>apk</packaging>
-	<name>APG</name>
-	<description>
-    </description>
-	<url>http://code.google.com/p/android-privacy-guard/</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<android.version>1.6_r2</android.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-			<version>1.6_r2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.madgag</groupId>
-			<artifactId>scprov-jdk15</artifactId>
-			<version>1.46.99.4-UNOFFICIAL-ROBERTO-RELEASE-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>android-integration</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<target>1.6</target>
-					<source>1.6</source>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<version>3.0.0-alpha-11</version>
-				<configuration>
-					<sdk>
-						<path>${user.home}/android-sdk-linux_x86/</path>
-						<platform>4</platform>
-					</sdk>
-					<deleteConflictingFiles>true</deleteConflictingFiles>
-					<extractDuplicates>true</extractDuplicates>
-				</configuration>
-				<extensions>true</extensions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/OpenPGP-Keychain/proguard-project.txt b/OpenPGP-Keychain/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/OpenPGP-Keychain/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
deleted file mode 100644
index 96546d84f..000000000
--- a/OpenPGP-Keychain/project.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
-android.library.reference.1=../libraries/ActionBarSherlock
-android.library.reference.2=../libraries/HtmlTextView
-android.library.reference.3=../libraries/StickyListHeaders/library
-android.library.reference.4=../libraries/zxing
-android.library.reference.5=../libraries/AndroidBootstrap
-android.library.reference.6=../libraries/zxing-android-integration
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 1863d2b62..1863d2b62 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpCallback.aidl
index ba41de1ba..ba41de1ba 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
index 4ca356fad..4ca356fad 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl
index 8f9e8a0fd..8f9e8a0fd 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpData.aidl
index 3711e4fb4..3711e4fb4 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpData.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl
index 7a6bed1e6..7a6bed1e6 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl
index e246792d0..e246792d0 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
index f69f66fd7..f69f66fd7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
index 669bd31b5..669bd31b5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
+++ b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
diff --git a/OpenPGP-Keychain/assets/fontawesome-webfont.ttf b/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf
index 7ec2e1de8..7ec2e1de8 100644
--- a/OpenPGP-Keychain/assets/fontawesome-webfont.ttf
+++ b/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpConstants.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpConstants.java
index b1ca1bfe6..b1ca1bfe6 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpConstants.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpConstants.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpData.java
index 6615c2146..6615c2146 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpData.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpError.java
index f108d3169..f108d3169 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpError.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpHelper.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpHelper.java
index 7305c47ce..7305c47ce 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpHelper.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpListPreference.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpListPreference.java
index 4ddd97485..4ddd97485 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpListPreference.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpListPreference.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpServiceConnection.java
index f7ba06aaf..f7ba06aaf 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpServiceConnection.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java
index 829f8f8cf..829f8f8cf 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 74b407cd4..74b407cd4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java
index 22f30cb1f..22f30cb1f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 4a25f2df1..4a25f2df1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
index 704448e47..704448e47 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
index a209f16cf..a209f16cf 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
index e4aa6d229..e4aa6d229 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
index fee120273..fee120273 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 9b817cb50..9b817cb50 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
index ec56fe912..ec56fe912 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
index 9f3cd8e88..9f3cd8e88 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index 493f25707..493f25707 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
index e406a142e..e406a142e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
index 7ac904d89..7ac904d89 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 0a4806239..0a4806239 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index 6a5ce7415..6a5ce7415 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 3ec6fd2a8..3ec6fd2a8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java
index f3f327e85..f3f327e85 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpToX509.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
index e18eb0d6d..e18eb0d6d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpToX509.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
index 92542fa35..92542fa35 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
index 36c663727..36c663727 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
index d2381f6f0..d2381f6f0 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 60c5c91a8..60c5c91a8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 70fb11e47..70fb11e47 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
index a879d60a8..a879d60a8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
index fcee76fd7..fcee76fd7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
index 5693e6de2..5693e6de2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 1683c7c0e..1683c7c0e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index ba3169b18..ba3169b18 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
index 170b946d2..170b946d2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 08b9c26e6..08b9c26e6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
index 555303238..555303238 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
index 1152d6796..1152d6796 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
index cef002265..cef002265 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
index 14b774eb5..14b774eb5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettings.java
index 9da4c8392..9da4c8392 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettings.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
index 8d56fc593..8d56fc593 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
index 025929cfa..025929cfa 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
index 427e6bb8f..427e6bb8f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
index 575f76a22..575f76a22 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
index 477ee04d0..477ee04d0 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
index 3c553fff5..3c553fff5 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
index 4c9d553ad..4c9d553ad 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteService.java
index bc513d532..bc513d532 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
index de07989d8..de07989d8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index e91630316..e91630316 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index ee8a01432..ee8a01432 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 631672c1f..631672c1f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 9ede8238d..9ede8238d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index d604c1c86..d604c1c86 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
index 840ebb650..840ebb650 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
index ce932fd70..ce932fd70 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 1be5b8548..1be5b8548 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
index 04671587a..04671587a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
index a02bfd678..a02bfd678 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 18d9dc2ec..18d9dc2ec 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
index 83af8cf48..83af8cf48 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
index 3ede641d3..3ede641d3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index c985f1f60..c985f1f60 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
index 1b8bfe6f3..1b8bfe6f3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index 6ae2b9bf9..6ae2b9bf9 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
index 1ad9781ec..1ad9781ec 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
index 0e2d22e1e..0e2d22e1e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
index 85cde1e7e..85cde1e7e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
index 9dca1094f..9dca1094f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index f73681f54..f73681f54 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index 674510550..674510550 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
index e1dfed12a..e1dfed12a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index 6bbab09b2..6bbab09b2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index 57587cc75..57587cc75 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 6083ba00d..6083ba00d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
index 221325613..221325613 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index 3370a0564..3370a0564 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index ea86bbfca..ea86bbfca 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
index a2e3e4339..a2e3e4339 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 41539d0f8..41539d0f8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
index 1a100a585..1a100a585 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index 00ad8c957..00ad8c957 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
index 42afa2e95..42afa2e95 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
index 0043203bf..0043203bf 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
index 78f7b1f7e..78f7b1f7e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index f4a5e1a5d..f4a5e1a5d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index d5162c403..d5162c403 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
index cf8699417..cf8699417 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index 89b9acf61..89b9acf61 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 20c3ec3f3..20c3ec3f3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index a68f9bdbe..a68f9bdbe 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
index d018f4b8e..d018f4b8e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index 898457324..898457324 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index aa6cdfd68..aa6cdfd68 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
index aac066d61..aac066d61 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
index bae398751..bae398751 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
index 771816bfc..771816bfc 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
index 1cf510d3a..1cf510d3a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
index b9dcd0d25..b9dcd0d25 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
index bc60b2adf..bc60b2adf 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index 0f5d26644..0f5d26644 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
index 01259ccd1..01259ccd1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 1f9605fb1..1f9605fb1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
index 752d44f89..752d44f89 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 5428b626e..5428b626e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
index d3c37edc6..d3c37edc6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/AlgorithmNames.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
index 9e0042c00..9e0042c00 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 8b5e94858..8b5e94858 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
index 092c14e00..092c14e00 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
index a43c03e3e..a43c03e3e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
index caaa07524..caaa07524 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
index cdc188887..cdc188887 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
index bcf275c32..bcf275c32 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
index 530a81044..530a81044 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PRNGFixes.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
index aa21581c6..aa21581c6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
index a783d7820..a783d7820 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
index f503227a3..f503227a3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
index 26c05ad0a..26c05ad0a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
index 9e8118e7a..9e8118e7a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/QrCodeUtils.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
diff --git a/OpenPGP-Keychain/res/anim/push_left_in.xml b/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml
index 45fb4875a..45fb4875a 100644
--- a/OpenPGP-Keychain/res/anim/push_left_in.xml
+++ b/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml
diff --git a/OpenPGP-Keychain/res/anim/push_left_out.xml b/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml
index 845679f16..845679f16 100644
--- a/OpenPGP-Keychain/res/anim/push_left_out.xml
+++ b/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml
diff --git a/OpenPGP-Keychain/res/anim/push_right_in.xml b/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml
index 09a244406..09a244406 100644
--- a/OpenPGP-Keychain/res/anim/push_right_in.xml
+++ b/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml
diff --git a/OpenPGP-Keychain/res/anim/push_right_out.xml b/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml
index e8893a69a..e8893a69a 100644
--- a/OpenPGP-Keychain/res/anim/push_right_out.xml
+++ b/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png
index 9e54464ed..9e54464ed 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/certify_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
index 236bff558..236bff558 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png
index 5ebac9706..5ebac9706 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png
index cde36e1fa..cde36e1fa 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png
index 9c717dd32..9c717dd32 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png
index 58bf97217..58bf97217 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png
index 742ba271c..742ba271c 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png
index 8a6cbfea2..8a6cbfea2 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png
index c59f601ca..c59f601ca 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png
index 1cb61faf4..1cb61faf4 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
index efee6dfd2..efee6dfd2 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png
index 571634090..571634090 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/key_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png
index 63bdba209..63bdba209 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/key_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png
index 575b2d866..575b2d866 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/certify_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
index ffe3a28d7..ffe3a28d7 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png
index c43cf6553..c43cf6553 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png
index 9f4c3d6a2..9f4c3d6a2 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png
index 9dfb7cc2c..9dfb7cc2c 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png
index cf5fab3ad..cf5fab3ad 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png
index 1d6522beb..1d6522beb 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png
index bff81179a..bff81179a 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png
index 1ed2c56ee..1ed2c56ee 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png
index 2369d03f3..2369d03f3 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
index 9033f1ec2..9033f1ec2 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png
index bab8c56bb..bab8c56bb 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/key_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
index fabe9d965..fabe9d965 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
index 91434a47b..91434a47b 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
index ca7d159fd..ca7d159fd 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png
index db69d6c25..db69d6c25 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png
index b8915716e..b8915716e 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
index 5e48a9c6b..5e48a9c6b 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png
index 2f6dc413b..2f6dc413b 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png
index a5fa74def..a5fa74def 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png
index 578cb24eb..578cb24eb 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
index de20fa0e7..de20fa0e7 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png
index 79b8e27c6..79b8e27c6 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
index b91e9d7f2..b91e9d7f2 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
index f18aa6144..f18aa6144 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
index b522daffe..b522daffe 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
index f054a68e6..f054a68e6 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png
index 3e441000f..3e441000f 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png
index 9c4685d6e..9c4685d6e 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png
index ac8190c93..ac8190c93 100644
--- a/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png
index cdc0fc9f0..cdc0fc9f0 100644
--- a/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable/certify_small.png
index 575b2d866..575b2d866 100644
--- a/OpenPGP-Keychain/res/drawable/certify_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/OpenPGP-Keychain/res/drawable/encrypted_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable/ic_next.png
index 8271c1380..8271c1380 100644
--- a/OpenPGP-Keychain/res/drawable/ic_next.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png
index ef90db972..ef90db972 100644
--- a/OpenPGP-Keychain/res/drawable/ic_previous.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable/key_small.png b/OpenPGP-Keychain/src/main/res/drawable/key_small.png
index 121803508..121803508 100644
--- a/OpenPGP-Keychain/res/drawable/key_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/OpenPGP-Keychain/res/drawable/overlay_error.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/OpenPGP-Keychain/res/drawable/overlay_ok.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable/section_header.xml b/OpenPGP-Keychain/src/main/res/drawable/section_header.xml
index a4468484e..a4468484e 100644
--- a/OpenPGP-Keychain/res/drawable/section_header.xml
+++ b/OpenPGP-Keychain/src/main/res/drawable/section_header.xml
diff --git a/OpenPGP-Keychain/res/drawable/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/OpenPGP-Keychain/res/drawable/signed_large.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable/signed_small.png
index 590220281..590220281 100644
--- a/OpenPGP-Keychain/res/drawable/signed_small.png
+++ b/OpenPGP-Keychain/src/main/res/drawable/signed_small.png
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
index bcbb5f5c1..bcbb5f5c1 100644
--- a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
index 8c8428e75..8c8428e75 100644
--- a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
index 0f0521d3c..0f0521d3c 100644
--- a/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
index 54e5933e3..54e5933e3 100644
--- a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
index 5927dbf43..5927dbf43 100644
--- a/OpenPGP-Keychain/res/layout/api_app_error_message.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
index 2cbc81cf7..2cbc81cf7 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
index 877b4e74e..877b4e74e 100644
--- a/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
index 3dc8d5e84..3dc8d5e84 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
index 0695e5922..0695e5922 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml
index cb20a20af..cb20a20af 100644
--- a/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
index 71fbcfb12..71fbcfb12 100644
--- a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/create_key_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml
index a2e908433..a2e908433 100644
--- a/OpenPGP-Keychain/res/layout/create_key_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index 9d9e1a1e8..9d9e1a1e8 100644
--- a/OpenPGP-Keychain/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
index 18210afc5..18210afc5 100644
--- a/OpenPGP-Keychain/res/layout/drawer_list.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
diff --git a/OpenPGP-Keychain/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml
index 14760e79d..14760e79d 100644
--- a/OpenPGP-Keychain/res/layout/drawer_list_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
index 351aec512..351aec512 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml
index 4bf4aa38a..4bf4aa38a 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_section.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml
index 9f10ff8c1..9f10ff8c1 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_section.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
index 663949d8e..663949d8e 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
diff --git a/OpenPGP-Keychain/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
index eea484df2..eea484df2 100644
--- a/OpenPGP-Keychain/res/layout/encrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/file_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
index 87816067f..87816067f 100644
--- a/OpenPGP-Keychain/res/layout/file_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/help_about_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml
index 71788e720..71788e720 100644
--- a/OpenPGP-Keychain/res/layout/help_about_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/help_activity.xml b/OpenPGP-Keychain/src/main/res/layout/help_activity.xml
index 58e4919dc..58e4919dc 100644
--- a/OpenPGP-Keychain/res/layout/help_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/help_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
index d7794ace3..d7794ace3 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml
index abde4e972..abde4e972 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml
index 126bcd8a6..126bcd8a6 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml
index 74a2d7853..74a2d7853 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_list_entry.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
index 37d1c5702..37d1c5702 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_list_entry.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_list_entry_user_id.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml
index 9d3a4a1ab..9d3a4a1ab 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_list_entry_user_id.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml
index 203cc6ad6..203cc6ad6 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 5229e7cf5..5229e7cf5 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
index 2571bb6e7..2571bb6e7 100644
--- a/OpenPGP-Keychain/res/layout/key_list_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml
index f0e843e56..f0e843e56 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml
index f3a21e1bf..f3a21e1bf 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml
index 5768e4153..5768e4153 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_header.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml
index 13370f2e5..13370f2e5 100644
--- a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
index 058a43eaf..058a43eaf 100644
--- a/OpenPGP-Keychain/res/layout/key_server_editor.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_export.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml
index cfbf7d79d..cfbf7d79d 100644
--- a/OpenPGP-Keychain/res/layout/key_server_export.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
index 8b99e5d2f..8b99e5d2f 100644
--- a/OpenPGP-Keychain/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query.xml
index 5ba90de47..5ba90de47 100644
--- a/OpenPGP-Keychain/res/layout/key_server_query.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_query.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_item.xml
index 6d883d26d..6d883d26d 100644
--- a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_item.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_user_id.xml
index c69735e67..c69735e67 100644
--- a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_user_id.xml
diff --git a/OpenPGP-Keychain/res/layout/passphrase_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml
index 4b331f0f2..4b331f0f2 100644
--- a/OpenPGP-Keychain/res/layout/passphrase_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
index 2bdd231ee..2bdd231ee 100644
--- a/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/select_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml
index bbfe17c44..bbfe17c44 100644
--- a/OpenPGP-Keychain/res/layout/select_key_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml
diff --git a/OpenPGP-Keychain/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml
index a18ce46fc..a18ce46fc 100644
--- a/OpenPGP-Keychain/res/layout/select_public_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml
index c4cdd7576..c4cdd7576 100644
--- a/OpenPGP-Keychain/res/layout/select_secret_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index 4a3cd3d28..4a3cd3d28 100644
--- a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml
index 0b58ae72f..0b58ae72f 100644
--- a/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
index 98c602e88..98c602e88 100644
--- a/OpenPGP-Keychain/res/layout/sign_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
index 6fde11e94..6fde11e94 100644
--- a/OpenPGP-Keychain/res/layout/view_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
index b50253980..b50253980 100644
--- a/OpenPGP-Keychain/res/layout/view_key_keys_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
index 2d022ba13..2d022ba13 100644
--- a/OpenPGP-Keychain/res/layout/view_key_userids_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
diff --git a/OpenPGP-Keychain/res/menu/api_app_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
index 1ee05f5de..1ee05f5de 100644
--- a/OpenPGP-Keychain/res/menu/api_app_settings.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
diff --git a/OpenPGP-Keychain/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
index 38c52e7f0..38c52e7f0 100644
--- a/OpenPGP-Keychain/res/menu/key_edit.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
index 72ebe0216..72ebe0216 100644
--- a/OpenPGP-Keychain/res/menu/key_list_public.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
index e750c1259..e750c1259 100644
--- a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
index c610eda35..c610eda35 100644
--- a/OpenPGP-Keychain/res/menu/key_list_secret.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
index 8cd181e16..8cd181e16 100644
--- a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
index 6d7a06ece..6d7a06ece 100644
--- a/OpenPGP-Keychain/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
diff --git a/OpenPGP-Keychain/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
index 03d8289c6..03d8289c6 100644
--- a/OpenPGP-Keychain/res/raw-de/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
index b588dff08..b588dff08 100644
--- a/OpenPGP-Keychain/res/raw-de/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-de/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-de/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-de/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-de/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-es-rCO/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-es-rCO/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-es-rCO/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-es-rCO/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-es-rCO/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html
index 6bede7bd6..6bede7bd6 100644
--- a/OpenPGP-Keychain/res/raw-fr/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
index 3b545fc20..3b545fc20 100644
--- a/OpenPGP-Keychain/res/raw-fr/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html
index 6d6e7d693..6d6e7d693 100644
--- a/OpenPGP-Keychain/res/raw-fr/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
index bec69318b..bec69318b 100644
--- a/OpenPGP-Keychain/res/raw-fr/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-fr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html
index b2592fd8e..b2592fd8e 100644
--- a/OpenPGP-Keychain/res/raw-fr/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_about.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-it-rIT/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-it-rIT/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-it-rIT/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_start.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-it-rIT/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-it-rIT/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_about.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-nl-rNL/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-nl-rNL/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-nl-rNL/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_start.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-nl-rNL/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-nl-rNL/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-pt-rBR/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-pt-rBR/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-pt-rBR/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_start.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-pt-rBR/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-pt-rBR/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html
index be687d431..be687d431 100644
--- a/OpenPGP-Keychain/res/raw-ru/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
index 1f306d330..1f306d330 100644
--- a/OpenPGP-Keychain/res/raw-ru/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html
index fcf55cdaf..fcf55cdaf 100644
--- a/OpenPGP-Keychain/res/raw-ru/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
index d55f3296b..d55f3296b 100644
--- a/OpenPGP-Keychain/res/raw-ru/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-ru/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html
index 584353da4..584353da4 100644
--- a/OpenPGP-Keychain/res/raw-ru/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-sl-rSI/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-sl-rSI/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-sl-rSI/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_start.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-sl-rSI/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-sl-rSI/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html
index 3d4549cbd..3d4549cbd 100644
--- a/OpenPGP-Keychain/res/raw-tr/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-tr/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-tr/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-tr/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-tr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-tr/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_about.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-uk/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-uk/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-uk/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_start.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-uk/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-uk/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-uk/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
index 7db2f83de..7db2f83de 100644
--- a/OpenPGP-Keychain/res/raw-zh/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
index 433b3c343..433b3c343 100644
--- a/OpenPGP-Keychain/res/raw-zh/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
index 2e7e637e5..2e7e637e5 100644
--- a/OpenPGP-Keychain/res/raw-zh/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
index 1386e8cc1..1386e8cc1 100644
--- a/OpenPGP-Keychain/res/raw-zh/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-zh/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
index 453d435e3..453d435e3 100644
--- a/OpenPGP-Keychain/res/raw-zh/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html
index 54af42b16..54af42b16 100644
--- a/OpenPGP-Keychain/res/raw/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html
diff --git a/OpenPGP-Keychain/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
index dee9d366e..dee9d366e 100644
--- a/OpenPGP-Keychain/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
index 301c04267..301c04267 100644
--- a/OpenPGP-Keychain/res/raw/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw/help_start.html b/OpenPGP-Keychain/src/main/res/raw/help_start.html
index 097e22ba8..097e22ba8 100644
--- a/OpenPGP-Keychain/res/raw/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_start.html
diff --git a/OpenPGP-Keychain/res/raw/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
index 734e69fc5..734e69fc5 100644
--- a/OpenPGP-Keychain/res/raw/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
index e0b621013..e0b621013 100644
--- a/OpenPGP-Keychain/res/values-de/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
diff --git a/OpenPGP-Keychain/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
index 420c0fa9b..420c0fa9b 100644
--- a/OpenPGP-Keychain/res/values-es-rCO/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
diff --git a/OpenPGP-Keychain/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index e18af1819..e18af1819 100644
--- a/OpenPGP-Keychain/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
diff --git a/OpenPGP-Keychain/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
index 44424561b..44424561b 100644
--- a/OpenPGP-Keychain/res/values-it-rIT/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
diff --git a/OpenPGP-Keychain/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
index 41288eb10..41288eb10 100644
--- a/OpenPGP-Keychain/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
diff --git a/OpenPGP-Keychain/res/values-pt-rBR/strings.xml b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
index 6bb115049..6bb115049 100644
--- a/OpenPGP-Keychain/res/values-pt-rBR/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
diff --git a/OpenPGP-Keychain/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index 6ab9676a2..6ab9676a2 100644
--- a/OpenPGP-Keychain/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
diff --git a/OpenPGP-Keychain/res/values-sl-rSI/strings.xml b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
index 6bb115049..6bb115049 100644
--- a/OpenPGP-Keychain/res/values-sl-rSI/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
diff --git a/OpenPGP-Keychain/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
index d9fe8713e..d9fe8713e 100644
--- a/OpenPGP-Keychain/res/values-tr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
diff --git a/OpenPGP-Keychain/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index f556d73d0..f556d73d0 100644
--- a/OpenPGP-Keychain/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
diff --git a/OpenPGP-Keychain/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index 6bb115049..6bb115049 100644
--- a/OpenPGP-Keychain/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml
index 974239110..974239110 100644
--- a/OpenPGP-Keychain/res/values/arrays.xml
+++ b/OpenPGP-Keychain/src/main/res/values/arrays.xml
diff --git a/OpenPGP-Keychain/res/values/colors.xml b/OpenPGP-Keychain/src/main/res/values/colors.xml
index 780137181..780137181 100644
--- a/OpenPGP-Keychain/res/values/colors.xml
+++ b/OpenPGP-Keychain/src/main/res/values/colors.xml
diff --git a/OpenPGP-Keychain/res/values/static_strings.xml b/OpenPGP-Keychain/src/main/res/values/static_strings.xml
index 3c9cf6673..3c9cf6673 100644
--- a/OpenPGP-Keychain/res/values/static_strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/static_strings.xml
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 8e555df5a..8e555df5a 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
diff --git a/OpenPGP-Keychain/res/values/styles.xml b/OpenPGP-Keychain/src/main/res/values/styles.xml
index 9e61bbef4..9e61bbef4 100644
--- a/OpenPGP-Keychain/res/values/styles.xml
+++ b/OpenPGP-Keychain/src/main/res/values/styles.xml
diff --git a/OpenPGP-Keychain/res/xml/preferences.xml b/OpenPGP-Keychain/src/main/res/xml/preferences.xml
index f5b46c232..f5b46c232 100644
--- a/OpenPGP-Keychain/res/xml/preferences.xml
+++ b/OpenPGP-Keychain/src/main/res/xml/preferences.xml
diff --git a/OpenPGP-Keychain/res/xml/searchable_public_keys.xml b/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml
index f07a809a0..f07a809a0 100644
--- a/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
+++ b/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml
diff --git a/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml b/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml
index 59b9841db..59b9841db 100644
--- a/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
+++ b/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml