Merge tag '1.9.3' into trz/merge_1.9.3

Conflicts:
	.travis.yml
	CHANGELOG.md
	README.md
	art/render.rb
	build.gradle
	libs/openpgp-api-lib/build.gradle
	settings.gradle
	src/main/AndroidManifest.xml
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/entities/Account.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/Conversation.java
	src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/entities/MucOptions.java
	src/main/java/eu/siacs/conversations/entities/Transferable.java
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/generator/IqGenerator.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
	src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
	src/main/java/eu/siacs/conversations/parser/AbstractParser.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
	src/main/java/eu/siacs/conversations/services/AvatarService.java
	src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
	src/main/java/eu/siacs/conversations/services/NotificationService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
	src/main/java/eu/siacs/conversations/utils/MimeUtils.java
	src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/utils/Xmlns.java
	src/main/java/eu/siacs/conversations/xml/XmlReader.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
	src/main/res/drawable-hdpi/ic_launcher.png
	src/main/res/drawable-hdpi/ic_notification.png
	src/main/res/drawable-mdpi/ic_launcher.png
	src/main/res/drawable-mdpi/ic_notification.png
	src/main/res/drawable-xhdpi/ic_launcher.png
	src/main/res/drawable-xhdpi/ic_notification.png
	src/main/res/drawable-xxhdpi/ic_launcher.png
	src/main/res/drawable-xxhdpi/ic_notification.png
	src/main/res/drawable-xxxhdpi/ic_launcher.png
	src/main/res/drawable-xxxhdpi/ic_notification.png
	src/main/res/layout/account_row.xml
	src/main/res/layout/activity_about.xml
	src/main/res/layout/activity_change_password.xml
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/activity_edit_account.xml
	src/main/res/layout/activity_muc_details.xml
	src/main/res/layout/activity_publish_profile_picture.xml
	src/main/res/layout/activity_verify_otr.xml
	src/main/res/layout/contact.xml
	src/main/res/layout/contact_key.xml
	src/main/res/layout/conversation_list_row.xml
	src/main/res/layout/enter_jid_dialog.xml
	src/main/res/layout/fragment_conversation.xml
	src/main/res/layout/join_conference_dialog.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/layout/message_status.xml
	src/main/res/layout/quickedit.xml
	src/main/res/values-ar-rEG/strings.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-ca/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-el/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fa-rIR/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-id/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-iw/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-ko/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ru/strings.xml
	src/main/res/values-sk/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-v21/themes.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/arrays.xml
	src/main/res/values/colors.xml
	src/main/res/values/dimens.xml
	src/main/res/values/strings.xml
	src/main/res/values/themes.xml
	src/main/res/xml/preferences.xml

5 files changed, 0 insertions, 869 deletions

diff --git a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpApi.java b/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpApi.java
deleted file mode 100644
index 3e18ab0c..00000000
--- a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpApi.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.openpgp.util;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-
-import org.openintents.openpgp.IOpenPgpService;
-import org.openintents.openpgp.OpenPgpError;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class OpenPgpApi {
-
-    public static final String TAG = "OpenPgp API";
-
-    public static final String SERVICE_INTENT = "org.openintents.openpgp.IOpenPgpService";
-
-    /**
-     * Version history
-     * ---------------
-     * <p/>
-     * 3:
-     * - first public stable version
-     * <p/>
-     * 4:
-     * - No changes to existing methods -> backward compatible
-     * - Introduction of ACTION_DECRYPT_METADATA, RESULT_METADATA, EXTRA_ORIGINAL_FILENAME, and OpenPgpMetadata parcel
-     * - Introduction of internal NFC extras: EXTRA_NFC_SIGNED_HASH, EXTRA_NFC_SIG_CREATION_TIMESTAMP
-     * 5:
-     * - OpenPgpSignatureResult: new consts SIGNATURE_KEY_REVOKED and SIGNATURE_KEY_EXPIRED
-     * - OpenPgpSignatureResult: ArrayList<String> userIds
-     */
-    public static final int API_VERSION = 5;
-
-    /**
-     * General extras
-     * --------------
-     *
-     * required extras:
-     * int           EXTRA_API_VERSION           (always required)
-     *
-     * returned extras:
-     * int           RESULT_CODE                 (RESULT_CODE_ERROR, RESULT_CODE_SUCCESS or RESULT_CODE_USER_INTERACTION_REQUIRED)
-     * OpenPgpError  RESULT_ERROR                (if RESULT_CODE == RESULT_CODE_ERROR)
-     * PendingIntent RESULT_INTENT               (if RESULT_CODE == RESULT_CODE_USER_INTERACTION_REQUIRED)
-     */
-
-    /**
-     * Sign only
-     * <p/>
-     * optional extras:
-     * boolean       EXTRA_REQUEST_ASCII_ARMOR   (request ascii armor for output)
-     * String        EXTRA_PASSPHRASE            (key passphrase)
-     */
-    public static final String ACTION_SIGN = "org.openintents.openpgp.action.SIGN";
-
-    /**
-     * Encrypt
-     * <p/>
-     * required extras:
-     * String[]      EXTRA_USER_IDS              (=emails of recipients, if more than one key has a user_id, a PendingIntent is returned via RESULT_INTENT)
-     * or
-     * long[]        EXTRA_KEY_IDS
-     * <p/>
-     * optional extras:
-     * boolean       EXTRA_REQUEST_ASCII_ARMOR   (request ascii armor for output)
-     * String        EXTRA_PASSPHRASE            (key passphrase)
-     * String        EXTRA_ORIGINAL_FILENAME     (original filename to be encrypted as metadata)
-     */
-    public static final String ACTION_ENCRYPT = "org.openintents.openpgp.action.ENCRYPT";
-
-    /**
-     * Sign and encrypt
-     * <p/>
-     * required extras:
-     * String[]      EXTRA_USER_IDS              (=emails of recipients, if more than one key has a user_id, a PendingIntent is returned via RESULT_INTENT)
-     * or
-     * long[]        EXTRA_KEY_IDS
-     * <p/>
-     * optional extras:
-     * boolean       EXTRA_REQUEST_ASCII_ARMOR   (request ascii armor for output)
-     * String        EXTRA_PASSPHRASE            (key passphrase)
-     * String        EXTRA_ORIGINAL_FILENAME     (original filename to be encrypted as metadata)
-     */
-    public static final String ACTION_SIGN_AND_ENCRYPT = "org.openintents.openpgp.action.SIGN_AND_ENCRYPT";
-
-    /**
-     * Decrypts and verifies given input stream. This methods handles encrypted-only, signed-and-encrypted,
-     * and also signed-only input.
-     * <p/>
-     * If OpenPgpSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_KEY_MISSING
-     * in addition a PendingIntent is returned via RESULT_INTENT to download missing keys.
-     * <p/>
-     * optional extras:
-     * boolean       EXTRA_REQUEST_ASCII_ARMOR   (request ascii armor for output)
-     * <p/>
-     * returned extras:
-     * OpenPgpSignatureResult   RESULT_SIGNATURE
-     * OpenPgpDecryptMetadata   RESULT_METADATA
-     */
-    public static final String ACTION_DECRYPT_VERIFY = "org.openintents.openpgp.action.DECRYPT_VERIFY";
-
-    /**
-     * Decrypts the header of an encrypted file to retrieve metadata such as original filename.
-     * <p/>
-     * This does not decrypt the actual content of the file.
-     * <p/>
-     * returned extras:
-     * OpenPgpDecryptMetadata   RESULT_METADATA
-     */
-    public static final String ACTION_DECRYPT_METADATA = "org.openintents.openpgp.action.DECRYPT_METADATA";
-
-    /**
-     * Get key ids based on given user ids (=emails)
-     * <p/>
-     * required extras:
-     * String[]      EXTRA_USER_IDS
-     * <p/>
-     * returned extras:
-     * long[]        RESULT_KEY_IDS
-     */
-    public static final String ACTION_GET_KEY_IDS = "org.openintents.openpgp.action.GET_KEY_IDS";
-
-    /**
-     * This action returns RESULT_CODE_SUCCESS if the OpenPGP Provider already has the key
-     * corresponding to the given key id in its database.
-     * <p/>
-     * It returns RESULT_CODE_USER_INTERACTION_REQUIRED if the Provider does not have the key.
-     * The PendingIntent from RESULT_INTENT can be used to retrieve those from a keyserver.
-     * <p/>
-     * required extras:
-     * long        EXTRA_KEY_ID
-     */
-    public static final String ACTION_GET_KEY = "org.openintents.openpgp.action.GET_KEY";
-
-    /* Intent extras */
-    public static final String EXTRA_API_VERSION = "api_version";
-
-    public static final String EXTRA_ACCOUNT_NAME = "account_name";
-
-    // SIGN, ENCRYPT, SIGN_AND_ENCRYPT, DECRYPT_VERIFY
-    // request ASCII Armor for output
-    // OpenPGP Radix-64, 33 percent overhead compared to binary, see http://tools.ietf.org/html/rfc4880#page-53)
-    public static final String EXTRA_REQUEST_ASCII_ARMOR = "ascii_armor";
-
-    // ENCRYPT, SIGN_AND_ENCRYPT
-    public static final String EXTRA_USER_IDS = "user_ids";
-    public static final String EXTRA_KEY_IDS = "key_ids";
-    // optional extras:
-    public static final String EXTRA_PASSPHRASE = "passphrase";
-    public static final String EXTRA_ORIGINAL_FILENAME = "original_filename";
-
-    // internal NFC states
-    public static final String EXTRA_NFC_SIGNED_HASH = "nfc_signed_hash";
-    public static final String EXTRA_NFC_SIG_CREATION_TIMESTAMP = "nfc_sig_creation_timestamp";
-    public static final String EXTRA_NFC_DECRYPTED_SESSION_KEY = "nfc_decrypted_session_key";
-
-    // GET_KEY
-    public static final String EXTRA_KEY_ID = "key_id";
-    public static final String RESULT_KEY_IDS = "key_ids";
-
-    /* Service Intent returns */
-    public static final String RESULT_CODE = "result_code";
-
-    // get actual error object from RESULT_ERROR
-    public static final int RESULT_CODE_ERROR = 0;
-    // success!
-    public static final int RESULT_CODE_SUCCESS = 1;
-    // get PendingIntent from RESULT_INTENT, start PendingIntent with startIntentSenderForResult,
-    // and execute service method again in onActivityResult
-    public static final int RESULT_CODE_USER_INTERACTION_REQUIRED = 2;
-
-    public static final String RESULT_ERROR = "error";
-    public static final String RESULT_INTENT = "intent";
-
-    // DECRYPT_VERIFY
-    public static final String RESULT_SIGNATURE = "signature";
-    public static final String RESULT_METADATA = "metadata";
-
-    IOpenPgpService mService;
-    Context mContext;
-
-    public OpenPgpApi(Context context, IOpenPgpService service) {
-        this.mContext = context;
-        this.mService = service;
-    }
-
-    public interface IOpenPgpCallback {
-        void onReturn(final Intent result);
-    }
-
-    private class OpenPgpAsyncTask extends AsyncTask<Void, Integer, Intent> {
-        Intent data;
-        InputStream is;
-        OutputStream os;
-        IOpenPgpCallback callback;
-
-        private OpenPgpAsyncTask(Intent data, InputStream is, OutputStream os, IOpenPgpCallback callback) {
-            this.data = data;
-            this.is = is;
-            this.os = os;
-            this.callback = callback;
-        }
-
-        @Override
-        protected Intent doInBackground(Void... unused) {
-            return executeApi(data, is, os);
-        }
-
-        protected void onPostExecute(Intent result) {
-            callback.onReturn(result);
-        }
-
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public void executeApiAsync(Intent data, InputStream is, OutputStream os, IOpenPgpCallback callback) {
-        OpenPgpAsyncTask task = new OpenPgpAsyncTask(data, is, os, callback);
-
-        // don't serialize async tasks!
-        // http://commonsware.com/blog/2012/04/20/asynctask-threading-regression-confirmed.html
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-        } else {
-            task.execute((Void[]) null);
-        }
-    }
-
-    public Intent executeApi(Intent data, InputStream is, OutputStream os) {
-        try {
-            data.putExtra(EXTRA_API_VERSION, OpenPgpApi.API_VERSION);
-
-            Intent result;
-
-            // pipe the input and output
-            ParcelFileDescriptor input = null;
-            if (is != null) {
-                input = ParcelFileDescriptorUtil.pipeFrom(is,
-                        new ParcelFileDescriptorUtil.IThreadListener() {
-
-                            @Override
-                            public void onThreadFinished(Thread thread) {
-                                //Log.d(OpenPgpApi.TAG, "Copy to service finished");
-                            }
-                        }
-                );
-            }
-            ParcelFileDescriptor output = null;
-            if (os != null) {
-                output = ParcelFileDescriptorUtil.pipeTo(os,
-                        new ParcelFileDescriptorUtil.IThreadListener() {
-
-                            @Override
-                            public void onThreadFinished(Thread thread) {
-                                //Log.d(OpenPgpApi.TAG, "Service finished writing!");
-                            }
-                        }
-                );
-            }
-
-            // blocks until result is ready
-            result = mService.execute(data, input, output);
-            // close() is required to halt the TransferThread
-            if (output != null) {
-                output.close();
-            }
-            // TODO: close input?
-
-            // set class loader to current context to allow unparcelling
-            // of OpenPgpError and OpenPgpSignatureResult
-            // http://stackoverflow.com/a/3806769
-            result.setExtrasClassLoader(mContext.getClassLoader());
-
-            return result;
-        } catch (Exception e) {
-            Log.e(OpenPgpApi.TAG, "Exception in executeApi call", e);
-            Intent result = new Intent();
-            result.putExtra(RESULT_CODE, RESULT_CODE_ERROR);
-            result.putExtra(RESULT_ERROR,
-                    new OpenPgpError(OpenPgpError.CLIENT_SIDE_ERROR, e.getMessage()));
-            return result;
-        }
-    }
-
-}
diff --git a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpListPreference.java
deleted file mode 100644
index cf586462..00000000
--- a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.openpgp.util;
-
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.preference.DialogPreference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-import org.openintents.openpgp.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Does not extend ListPreference, but is very similar to it!
- * http://grepcode.com/file_/repository.grepcode.com/java/ext/com.google.android/android/4.4_r1/android/preference/ListPreference.java/?v=source
- */
-public class OpenPgpListPreference extends DialogPreference {
-    private static final String OPENKEYCHAIN_PACKAGE = "org.sufficientlysecure.keychain";
-    private static final String MARKET_INTENT_URI_BASE = "market://details?id=%s";
-    private static final Intent MARKET_INTENT = new Intent(Intent.ACTION_VIEW, Uri.parse(
-            String.format(MARKET_INTENT_URI_BASE, OPENKEYCHAIN_PACKAGE)));
-
-    private ArrayList<OpenPgpProviderEntry> mLegacyList = new ArrayList<OpenPgpProviderEntry>();
-    private ArrayList<OpenPgpProviderEntry> mList = new ArrayList<OpenPgpProviderEntry>();
-
-    private String mSelectedPackage;
-
-    public OpenPgpListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public OpenPgpListPreference(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Public method to add new entries for legacy applications
-     *
-     * @param packageName
-     * @param simpleName
-     * @param icon
-     */
-    public void addLegacyProvider(int position, String packageName, String simpleName, Drawable icon) {
-        mLegacyList.add(position, new OpenPgpProviderEntry(packageName, simpleName, icon));
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(Builder builder) {
-        mList.clear();
-        
-        // add "none"-entry
-        mList.add(0, new OpenPgpProviderEntry("",
-                getContext().getString(R.string.openpgp_list_preference_none),
-                getContext().getResources().getDrawable(R.drawable.ic_action_cancel_launchersize)));
-        
-        // add all additional (legacy) providers
-        mList.addAll(mLegacyList);
-        
-        // search for OpenPGP providers...
-        ArrayList<OpenPgpProviderEntry> providerList = new ArrayList<OpenPgpProviderEntry>();
-        Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT);
-        List<ResolveInfo> resInfo = getContext().getPackageManager().queryIntentServices(intent, 0);
-        if (!resInfo.isEmpty()) {
-            for (ResolveInfo resolveInfo : resInfo) {
-                if (resolveInfo.serviceInfo == null)
-                    continue;
-
-                String packageName = resolveInfo.serviceInfo.packageName;
-                String simpleName = String.valueOf(resolveInfo.serviceInfo.loadLabel(getContext()
-                        .getPackageManager()));
-                Drawable icon = resolveInfo.serviceInfo.loadIcon(getContext().getPackageManager());
-
-                providerList.add(new OpenPgpProviderEntry(packageName, simpleName, icon));
-            }
-        }
-
-        if (providerList.isEmpty()) {
-            // add install links if provider list is empty
-            resInfo = getContext().getPackageManager().queryIntentActivities
-                    (MARKET_INTENT, 0);
-            for (ResolveInfo resolveInfo : resInfo) {
-                Intent marketIntent = new Intent(MARKET_INTENT);
-                marketIntent.setPackage(resolveInfo.activityInfo.packageName);
-                Drawable icon = resolveInfo.activityInfo.loadIcon(getContext().getPackageManager());
-                String marketName = String.valueOf(resolveInfo.activityInfo.applicationInfo
-                        .loadLabel(getContext().getPackageManager()));
-                String simpleName = String.format(getContext().getString(R.string
-                        .openpgp_install_openkeychain_via), marketName);
-                mList.add(new OpenPgpProviderEntry(OPENKEYCHAIN_PACKAGE, simpleName,
-                        icon, marketIntent));
-            }
-        } else {
-            // add provider
-            mList.addAll(providerList);
-        }
-
-        // Init ArrayAdapter with OpenPGP Providers
-        ListAdapter adapter = new ArrayAdapter<OpenPgpProviderEntry>(getContext(),
-                android.R.layout.select_dialog_singlechoice, android.R.id.text1, mList) {
-            public View getView(int position, View convertView, ViewGroup parent) {
-                // User super class to create the View
-                View v = super.getView(position, convertView, parent);
-                TextView tv = (TextView) v.findViewById(android.R.id.text1);
-
-                // Put the image on the TextView
-                tv.setCompoundDrawablesWithIntrinsicBounds(mList.get(position).icon, null,
-                        null, null);
-
-                // Add margin between image and text (support various screen densities)
-                int dp10 = (int) (10 * getContext().getResources().getDisplayMetrics().density + 0.5f);
-                tv.setCompoundDrawablePadding(dp10);
-
-                return v;
-            }
-        };
-
-        builder.setSingleChoiceItems(adapter, getIndexOfProviderList(getValue()),
-                new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        OpenPgpProviderEntry entry = mList.get(which);
-
-                        if (entry.intent != null) {
-                            /*
-                             * Intents are called as activity
-                             *
-                             * Current approach is to assume the user installed the app.
-                             * If he does not, the selected package is not valid.
-                             *
-                             * However  applications should always consider this could happen,
-                             * as the user might remove the currently used OpenPGP app.
-                             */
-                            getContext().startActivity(entry.intent);
-                        }
-
-                        mSelectedPackage = entry.packageName;
-
-                        /*
-                         * Clicking on an item simulates the positive button click, and dismisses
-                         * the dialog.
-                         */
-                        OpenPgpListPreference.this.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-                        dialog.dismiss();
-                    }
-                });
-
-        /*
-         * The typical interaction for list-based dialogs is to have click-on-an-item dismiss the
-         * dialog instead of the user having to press 'Ok'.
-         */
-        builder.setPositiveButton(null, null);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        if (positiveResult && (mSelectedPackage != null)) {
-            if (callChangeListener(mSelectedPackage)) {
-                setValue(mSelectedPackage);
-            }
-        }
-    }
-
-    private int getIndexOfProviderList(String packageName) {
-        for (OpenPgpProviderEntry app : mList) {
-            if (app.packageName.equals(packageName)) {
-                return mList.indexOf(app);
-            }
-        }
-
-        return -1;
-    }
-
-    public void setValue(String packageName) {
-        mSelectedPackage = packageName;
-        persistString(packageName);
-    }
-
-    public String getValue() {
-        return mSelectedPackage;
-    }
-
-    public String getEntry() {
-        return getEntryByValue(mSelectedPackage);
-    }
-
-    @Override
-    protected Object onGetDefaultValue(TypedArray a, int index) {
-        return a.getString(index);
-    }
-
-    @Override
-    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
-        setValue(restoreValue ? getPersistedString(mSelectedPackage) : (String) defaultValue);
-    }
-
-    public String getEntryByValue(String packageName) {
-        for (OpenPgpProviderEntry app : mList) {
-            if (app.packageName.equals(packageName)) {
-                return app.simpleName;
-            }
-        }
-
-        return null;
-    }
-
-    private static class OpenPgpProviderEntry {
-        private String packageName;
-        private String simpleName;
-        private Drawable icon;
-        private Intent intent;
-
-        public OpenPgpProviderEntry(String packageName, String simpleName, Drawable icon) {
-            this.packageName = packageName;
-            this.simpleName = simpleName;
-            this.icon = icon;
-        }
-
-        public OpenPgpProviderEntry(String packageName, String simpleName, Drawable icon, Intent intent) {
-            this(packageName, simpleName, icon);
-            this.intent = intent;
-        }
-
-        @Override
-        public String toString() {
-            return simpleName;
-        }
-    }
-}
diff --git a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
deleted file mode 100644
index 15096d9e..00000000
--- a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.openpgp.util;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-
-import org.openintents.openpgp.IOpenPgpService;
-
-public class OpenPgpServiceConnection {
-
-    // callback interface
-    public interface OnBound {
-        public void onBound(IOpenPgpService service);
-
-        public void onError(Exception e);
-    }
-
-    private Context mApplicationContext;
-
-    private IOpenPgpService mService;
-    private String mProviderPackageName;
-
-    private OnBound mOnBoundListener;
-
-    /**
-     * Create new connection
-     *
-     * @param context
-     * @param providerPackageName specify package name of OpenPGP provider,
-     *                            e.g., "org.sufficientlysecure.keychain"
-     */
-    public OpenPgpServiceConnection(Context context, String providerPackageName) {
-        this.mApplicationContext = context.getApplicationContext();
-        this.mProviderPackageName = providerPackageName;
-    }
-
-    /**
-     * Create new connection with callback
-     *
-     * @param context
-     * @param providerPackageName specify package name of OpenPGP provider,
-     *                            e.g., "org.sufficientlysecure.keychain"
-     * @param onBoundListener     callback, executed when connection to service has been established
-     */
-    public OpenPgpServiceConnection(Context context, String providerPackageName,
-                                    OnBound onBoundListener) {
-        this(context, providerPackageName);
-        this.mOnBoundListener = onBoundListener;
-    }
-
-    public IOpenPgpService getService() {
-        return mService;
-    }
-
-    public boolean isBound() {
-        return (mService != null);
-    }
-
-    private ServiceConnection mServiceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mService = IOpenPgpService.Stub.asInterface(service);
-            if (mOnBoundListener != null) {
-                mOnBoundListener.onBound(mService);
-            }
-        }
-
-        public void onServiceDisconnected(ComponentName name) {
-            mService = null;
-        }
-    };
-
-    /**
-     * If not already bound, bind to service!
-     *
-     * @return
-     */
-    public void bindToService() {
-        // if not already bound...
-        if (mService == null) {
-            try {
-                Intent serviceIntent = new Intent(OpenPgpApi.SERVICE_INTENT);
-                // NOTE: setPackage is very important to restrict the intent to this provider only!
-                serviceIntent.setPackage(mProviderPackageName);
-                boolean connect = mApplicationContext.bindService(serviceIntent, mServiceConnection,
-                        Context.BIND_AUTO_CREATE);
-                if (!connect) {
-                    throw new Exception("bindService() returned false!");
-                }
-            } catch (Exception e) {
-                if (mOnBoundListener != null) {
-                    mOnBoundListener.onError(e);
-                }
-            }
-        } else {
-            // already bound, but also inform client about it with callback
-            if (mOnBoundListener != null) {
-                mOnBoundListener.onBound(mService);
-            }
-        }
-    }
-
-    public void unbindFromService() {
-        mApplicationContext.unbindService(mServiceConnection);
-    }
-
-}
diff --git a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpUtils.java b/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpUtils.java
deleted file mode 100644
index 416b2841..00000000
--- a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/OpenPgpUtils.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.openpgp.util;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-
-public class OpenPgpUtils {
-
-    public static final Pattern PGP_MESSAGE = Pattern.compile(
-            ".*?(-----BEGIN PGP MESSAGE-----.*?-----END PGP MESSAGE-----).*",
-            Pattern.DOTALL);
-
-    public static final Pattern PGP_SIGNED_MESSAGE = Pattern.compile(
-            ".*?(-----BEGIN PGP SIGNED MESSAGE-----.*?-----BEGIN PGP SIGNATURE-----.*?-----END PGP SIGNATURE-----).*",
-            Pattern.DOTALL);
-
-    public static final int PARSE_RESULT_NO_PGP = -1;
-    public static final int PARSE_RESULT_MESSAGE = 0;
-    public static final int PARSE_RESULT_SIGNED_MESSAGE = 1;
-
-    public static int parseMessage(String message) {
-        Matcher matcherSigned = PGP_SIGNED_MESSAGE.matcher(message);
-        Matcher matcherMessage = PGP_MESSAGE.matcher(message);
-
-        if (matcherMessage.matches()) {
-            return PARSE_RESULT_MESSAGE;
-        } else if (matcherSigned.matches()) {
-            return PARSE_RESULT_SIGNED_MESSAGE;
-        } else {
-            return PARSE_RESULT_NO_PGP;
-        }
-    }
-
-    public static boolean isAvailable(Context context) {
-        Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT);
-        List<ResolveInfo> resInfo = context.getPackageManager().queryIntentServices(intent, 0);
-        if (!resInfo.isEmpty()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public static String convertKeyIdToHex(long keyId) {
-        return "0x" + convertKeyIdToHex32bit(keyId >> 32) + convertKeyIdToHex32bit(keyId);
-    }
-
-    private static String convertKeyIdToHex32bit(long keyId) {
-        String hexString = Long.toHexString(keyId & 0xffffffffL).toLowerCase(Locale.ENGLISH);
-        while (hexString.length() < 8) {
-            hexString = "0" + hexString;
-        }
-        return hexString;
-    }
-}
diff --git a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/libs/openpgp-api-lib/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
deleted file mode 100644
index 4fd4b39a..00000000
--- a/libs/openpgp-api-lib/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *               2013 Florian Schmaus <flo@geekplace.eu>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openintents.openpgp.util;
-
-import android.os.ParcelFileDescriptor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Partially based on <a href="http://stackoverflow.com/questions/18212152/">Stackoverflow: Transfer InputStream to another Service (across process boundaries)</a>
- **/
-public class ParcelFileDescriptorUtil {
-
-    public interface IThreadListener {
-        void onThreadFinished(final Thread thread);
-    }
-
-    public static ParcelFileDescriptor pipeFrom(InputStream inputStream, IThreadListener listener)
-            throws IOException {
-        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
-        ParcelFileDescriptor readSide = pipe[0];
-        ParcelFileDescriptor writeSide = pipe[1];
-
-        // start the transfer thread
-        new TransferThread(inputStream, new ParcelFileDescriptor.AutoCloseOutputStream(writeSide),
-                listener)
-                .start();
-
-        return readSide;
-    }
-
-    public static ParcelFileDescriptor pipeTo(OutputStream outputStream, IThreadListener listener)
-            throws IOException {
-        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
-        ParcelFileDescriptor readSide = pipe[0];
-        ParcelFileDescriptor writeSide = pipe[1];
-
-        // start the transfer thread
-        new TransferThread(new ParcelFileDescriptor.AutoCloseInputStream(readSide), outputStream,
-                listener)
-                .start();
-
-        return writeSide;
-    }
-
-    static class TransferThread extends Thread {
-        final InputStream mIn;
-        final OutputStream mOut;
-        final IThreadListener mListener;
-
-        TransferThread(InputStream in, OutputStream out, IThreadListener listener) {
-            super("ParcelFileDescriptor Transfer Thread");
-            mIn = in;
-            mOut = out;
-            mListener = listener;
-            setDaemon(true);
-        }
-
-        @Override
-        public void run() {
-            byte[] buf = new byte[1024];
-            int len;
-
-            try {
-                while ((len = mIn.read(buf)) > 0) {
-                    mOut.write(buf, 0, len);
-                }
-                mOut.flush(); // just to be safe
-            } catch (IOException e) {
-                //Log.e(OpenPgpApi.TAG, "TransferThread" + getId() + ": writing failed", e);
-            } finally {
-                try {
-                    mIn.close();
-                } catch (IOException e) {
-                    //Log.e(OpenPgpApi.TAG, "TransferThread" + getId(), e);
-                }
-                try {
-                    mOut.close();
-                } catch (IOException e) {
-                    //Log.e(OpenPgpApi.TAG, "TransferThread" + getId(), e);
-                }
-            }
-            if (mListener != null) {
-                //Log.d(OpenPgpApi.TAG, "TransferThread " + getId() + " finished!");
-                mListener.onThreadFinished(this);
-            }
-        }
-    }
-}