Cleanup, fix advanced sharing

11 files changed, 100 insertions, 237 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
index 5f77a3224..8f383cd3a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
@@ -55,7 +55,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
-import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
+import org.sufficientlysecure.keychain.service.BackupKeyringParcel;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.InputData;
@@ -72,7 +72,7 @@ import org.sufficientlysecure.keychain.util.Log;
  * For the export operation, the input consists of a set of key ids and
  * either the name of a file or an output uri to write to.
  */
-public class ExportOperation extends BaseOperation<ExportKeyringParcel> {
+public class BackupOperation extends BaseOperation<BackupKeyringParcel> {
 
     private static final String[] PROJECTION = new String[] {
             KeyRings.MASTER_KEY_ID,
@@ -85,18 +85,18 @@ public class ExportOperation extends BaseOperation<ExportKeyringParcel> {
     private static final int INDEX_SECKEY_DATA = 2;
     private static final int INDEX_HAS_ANY_SECRET = 3;
 
-    public ExportOperation(Context context, ProviderHelper providerHelper, Progressable
+    public BackupOperation(Context context, ProviderHelper providerHelper, Progressable
             progressable) {
         super(context, providerHelper, progressable);
     }
 
-    public ExportOperation(Context context, ProviderHelper providerHelper,
+    public BackupOperation(Context context, ProviderHelper providerHelper,
                            Progressable progressable, AtomicBoolean cancelled) {
         super(context, providerHelper, progressable, cancelled);
     }
 
     @NonNull
-    public ExportResult execute(@NonNull ExportKeyringParcel exportInput, @Nullable CryptoInputParcel cryptoInput) {
+    public ExportResult execute(@NonNull BackupKeyringParcel exportInput, @Nullable CryptoInputParcel cryptoInput) {
 
         OperationLog log = new OperationLog();
         if (exportInput.mMasterKeyIds != null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java
index 9b0e5573e..3d9626934 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ExportKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/BackupKeyringParcel.java
@@ -23,11 +23,10 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import org.sufficientlysecure.keychain.util.Passphrase;
 
 
-public class ExportKeyringParcel implements Parcelable {
+public class BackupKeyringParcel implements Parcelable {
     public Uri mCanonicalizedPublicKeyringUri;
     public Passphrase mSymmetricPassphrase;
 
@@ -35,15 +34,15 @@ public class ExportKeyringParcel implements Parcelable {
     public long mMasterKeyIds[];
     public Uri mOutputUri;
 
-    public ExportKeyringParcel(Passphrase symmetricPassphrase,
-            long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
+    public BackupKeyringParcel(Passphrase symmetricPassphrase,
+                               long[] masterKeyIds, boolean exportSecret, Uri outputUri) {
         mSymmetricPassphrase = symmetricPassphrase;
         mMasterKeyIds = masterKeyIds;
         mExportSecret = exportSecret;
         mOutputUri = outputUri;
     }
 
-    protected ExportKeyringParcel(Parcel in) {
+    protected BackupKeyringParcel(Parcel in) {
         mCanonicalizedPublicKeyringUri = (Uri) in.readValue(Uri.class.getClassLoader());
         mExportSecret = in.readByte() != 0x00;
         mOutputUri = (Uri) in.readValue(Uri.class.getClassLoader());
@@ -65,15 +64,15 @@ public class ExportKeyringParcel implements Parcelable {
         dest.writeParcelable(mSymmetricPassphrase, 0);
     }
 
-    public static final Parcelable.Creator<ExportKeyringParcel> CREATOR = new Parcelable.Creator<ExportKeyringParcel>() {
+    public static final Parcelable.Creator<BackupKeyringParcel> CREATOR = new Parcelable.Creator<BackupKeyringParcel>() {
         @Override
-        public ExportKeyringParcel createFromParcel(Parcel in) {
-            return new ExportKeyringParcel(in);
+        public BackupKeyringParcel createFromParcel(Parcel in) {
+            return new BackupKeyringParcel(in);
         }
 
         @Override
-        public ExportKeyringParcel[] newArray(int size) {
-            return new ExportKeyringParcel[size];
+        public BackupKeyringParcel[] newArray(int size) {
+            return new BackupKeyringParcel[size];
         }
     };
 }
\ No newline at end of file
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
index 981a76203..ee953b060 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
@@ -33,7 +33,7 @@ import org.sufficientlysecure.keychain.operations.CertifyOperation;
 import org.sufficientlysecure.keychain.operations.ConsolidateOperation;
 import org.sufficientlysecure.keychain.operations.DeleteOperation;
 import org.sufficientlysecure.keychain.operations.EditKeyOperation;
-import org.sufficientlysecure.keychain.operations.ExportOperation;
+import org.sufficientlysecure.keychain.operations.BackupOperation;
 import org.sufficientlysecure.keychain.operations.ImportOperation;
 import org.sufficientlysecure.keychain.operations.KeybaseVerificationOperation;
 import org.sufficientlysecure.keychain.operations.InputDataOperation;
@@ -125,8 +125,8 @@ public class KeychainService extends Service implements Progressable {
                     op = new PromoteKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
                 } else if (inputParcel instanceof ImportKeyringParcel) {
                     op = new ImportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
-                } else if (inputParcel instanceof ExportKeyringParcel) {
-                    op = new ExportOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
+                } else if (inputParcel instanceof BackupKeyringParcel) {
+                    op = new BackupOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
                 } else if (inputParcel instanceof UploadKeyringParcel) {
                     op = new UploadOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
                 } else if (inputParcel instanceof ConsolidateInputParcel) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
index 09447ec32..87f9052a7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
@@ -52,7 +52,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.ExportResult;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
-import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
+import org.sufficientlysecure.keychain.service.BackupKeyringParcel;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener;
@@ -61,7 +61,7 @@ import org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator;
 import org.sufficientlysecure.keychain.util.FileHelper;
 import org.sufficientlysecure.keychain.util.Passphrase;
 
-public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringParcel, ExportResult>
+public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringParcel, ExportResult>
         implements OnBackStackChangedListener {
 
     public static final String ARG_BACKUP_CODE = "backup_code";
@@ -499,8 +499,8 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
 
     @Nullable
     @Override
-    public ExportKeyringParcel createOperationInput() {
-        return new ExportKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri);
+    public BackupKeyringParcel createOperationInput() {
+        return new BackupKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 48edbcbd6..cbc7b88bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -19,7 +19,6 @@
 package org.sufficientlysecure.keychain.ui;
 
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -86,7 +85,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
 import org.sufficientlysecure.keychain.util.ContactHelper;
-import org.sufficientlysecure.keychain.util.ExportHelper;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.NfcHelper;
 import org.sufficientlysecure.keychain.util.Preferences;
@@ -397,8 +395,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
         MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
         editKey.setVisible(mIsSecret);
 
-        MenuItem exportKey = menu.findItem(R.id.menu_key_view_backup);
-        exportKey.setVisible(mIsSecret);
+        MenuItem backupKey = menu.findItem(R.id.menu_key_view_backup);
+        backupKey.setVisible(mIsSecret);
 
         MenuItem addLinked = menu.findItem(R.id.menu_key_view_add_linked_identity);
         addLinked.setVisible(mIsSecret
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
index edd9feec9..bba6a6dc1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
@@ -41,13 +41,11 @@ import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.ContactHelper;
-import org.sufficientlysecure.keychain.util.ExportHelper;
 import org.sufficientlysecure.keychain.util.Log;
 
 public class ViewKeyAdvActivity extends BaseActivity implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
-    ExportHelper mExportHelper;
     ProviderHelper mProviderHelper;
 
     protected Uri mDataUri;
@@ -75,7 +73,6 @@ public class ViewKeyAdvActivity extends BaseActivity implements
             }
         });
 
-        mExportHelper = new ExportHelper(this);
         mProviderHelper = new ProviderHelper(this);
 
         mViewPager = (ViewPager) findViewById(R.id.pager);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
index dcb92bd75..c5e575e32 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
@@ -52,6 +52,7 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
@@ -63,7 +64,6 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
-import org.sufficientlysecure.keychain.util.ExportHelper;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.NfcHelper;
 
@@ -84,7 +84,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
     private Uri mDataUri;
 
     private byte[] mFingerprint;
-    private long mMasterKeyId;
+    private String mUserId;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
@@ -107,7 +107,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         View vFingerprintShareButton = view.findViewById(R.id.view_key_action_fingerprint_share);
         View vFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard);
         View vKeyShareButton = view.findViewById(R.id.view_key_action_key_share);
-        View vKeySaveButton = view.findViewById(R.id.view_key_action_key_export);
         View vKeyNfcButton = view.findViewById(R.id.view_key_action_key_nfc);
         View vKeyClipboardButton = view.findViewById(R.id.view_key_action_key_clipboard);
         ImageButton vKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger);
@@ -118,35 +117,25 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         vFingerprintShareButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                share(true, false);
+                shareFingerprint(false);
             }
         });
         vFingerprintClipboardButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                share(true, true);
+                shareFingerprint(true);
             }
         });
         vKeyShareButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                share(false, false);
-            }
-        });
-        // Show save only on Android >= 4.4 (Document Provider)
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            vKeySaveButton.setVisibility(View.GONE);
-        }
-        vKeySaveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                exportToFile();
+                shareKey(false);
             }
         });
         vKeyClipboardButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                share(false, true);
+                shareKey(true);
             }
         });
 
@@ -178,11 +167,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         return root;
     }
 
-    private void exportToFile() {
-        new ExportHelper(getActivity()).showExportKeysDialog(
-                mMasterKeyId, Constants.Path.APP_DIR_FILE, false);
-    }
-
     private void startSafeSlinger(Uri dataUri) {
         long keyId = 0;
         try {
@@ -197,7 +181,7 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         startActivityForResult(safeSlingerIntent, 0);
     }
 
-    private void share(boolean fingerprintOnly, boolean toClipboard) {
+    private void shareKey(boolean toClipboard) {
         Activity activity = getActivity();
         if (activity == null || mFingerprint == null) {
             return;
@@ -205,18 +189,8 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         ProviderHelper providerHelper = new ProviderHelper(activity);
 
         try {
-            String content;
-            if (fingerprintOnly) {
-                String fingerprint = KeyFormattingUtils.convertFingerprintToHex(mFingerprint);
-                if (!toClipboard) {
-                    content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
-                } else {
-                    content = fingerprint;
-                }
-            } else {
-                content = providerHelper.getKeyRingAsArmoredString(
-                        KeychainContract.KeyRingData.buildPublicKeyRingUri(mDataUri));
-            }
+            String content = providerHelper.getKeyRingAsArmoredString(
+                    KeychainContract.KeyRingData.buildPublicKeyRingUri(mDataUri));
 
             if (toClipboard) {
                 ClipboardManager clipMan = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -228,29 +202,26 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
                 ClipData clip = ClipData.newPlainText(Constants.CLIPBOARD_LABEL, content);
                 clipMan.setPrimaryClip(clip);
 
-                Notify.create(activity, fingerprintOnly ? R.string.fingerprint_copied_to_clipboard
-                        : R.string.key_copied_to_clipboard, Notify.Style.OK).show();
-                return;
-            }
-
-            // Android will fail with android.os.TransactionTooLargeException if key is too big
-            // see http://www.lonestarprod.com/?p=34
-            if (content.length() >= 86389) {
-                Notify.create(activity, R.string.key_too_big_for_sharing, Notify.Style.ERROR).show();
+                Notify.create(activity, R.string.key_copied_to_clipboard, Notify.Style.OK).show();
                 return;
             }
 
             // let user choose application
             Intent sendIntent = new Intent(Intent.ACTION_SEND);
-            sendIntent.putExtra(Intent.EXTRA_TEXT, content);
             sendIntent.setType("text/plain");
 
-            // Bluetooth Share will convert text/plain sent via EXTRA_TEXT to HTML
-            // Add replacement extra to send a text/plain file instead.
+            // NOTE: Don't use Intent.EXTRA_TEXT to send the key
+            // better send it via a Uri!
+            // example: Bluetooth Share will convert text/plain sent via Intent.EXTRA_TEXT to HTML
             try {
                 TemporaryFileProvider shareFileProv = new TemporaryFileProvider();
-                Uri contentUri = TemporaryFileProvider.createFile(activity,
-                        KeyFormattingUtils.convertFingerprintToHex(mFingerprint) + Constants.FILE_EXTENSION_ASC);
+
+                String filename = KeyFormattingUtils.convertFingerprintToHex(mFingerprint);
+                KeyRing.UserId mainUserId = KeyRing.splitUserId(mUserId);
+                if (mainUserId.name != null) {
+                    filename = mainUserId.name;
+                }
+                Uri contentUri = TemporaryFileProvider.createFile(activity, filename + Constants.FILE_EXTENSION_ASC);
 
                 BufferedWriter contentWriter = new BufferedWriter(new OutputStreamWriter(
                         new ParcelFileDescriptor.AutoCloseOutputStream(
@@ -260,18 +231,15 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
 
                 sendIntent.putExtra(Intent.EXTRA_STREAM, contentUri);
             } catch (FileNotFoundException e) {
-                Log.e(Constants.TAG, "error creating temporary Bluetooth key share file!", e);
+                Log.e(Constants.TAG, "Error creating temporary key share file!", e);
                 // no need for a snackbar because one sharing option doesn't work
                 // Notify.create(getActivity(), R.string.error_temp_file, Notify.Style.ERROR).show();
             }
 
-
-            String title = getString(fingerprintOnly
-                    ? R.string.title_share_fingerprint_with : R.string.title_share_key);
+            String title = getString(R.string.title_share_key);
             Intent shareChooser = Intent.createChooser(sendIntent, title);
 
             startActivity(shareChooser);
-
         } catch (PgpGeneralException | IOException e) {
             Log.e(Constants.TAG, "error processing key!", e);
             Notify.create(activity, R.string.error_key_processing, Notify.Style.ERROR).show();
@@ -281,6 +249,45 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         }
     }
 
+    private void shareFingerprint(boolean toClipboard) {
+        Activity activity = getActivity();
+        if (activity == null || mFingerprint == null) {
+            return;
+        }
+
+        String content;
+        String fingerprint = KeyFormattingUtils.convertFingerprintToHex(mFingerprint);
+        if (!toClipboard) {
+            content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
+        } else {
+            content = fingerprint;
+        }
+
+        if (toClipboard) {
+            ClipboardManager clipMan = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
+            if (clipMan == null) {
+                Notify.create(activity, R.string.error_clipboard_copy, Style.ERROR);
+                return;
+            }
+
+            ClipData clip = ClipData.newPlainText(Constants.CLIPBOARD_LABEL, content);
+            clipMan.setPrimaryClip(clip);
+
+            Notify.create(activity, R.string.fingerprint_copied_to_clipboard, Notify.Style.OK).show();
+            return;
+        }
+
+        // let user choose application
+        Intent sendIntent = new Intent(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT, content);
+        sendIntent.setType("text/plain");
+
+        String title = getString(R.string.title_share_fingerprint_with);
+        Intent shareChooser = Intent.createChooser(sendIntent, title);
+
+        startActivity(shareChooser);
+    }
+
     private void showQrCodeDialog() {
         Intent qrCodeIntent = new Intent(getActivity(), QrCodeViewActivity.class);
 
@@ -322,11 +329,12 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         mNfcHelper.initNfc(mDataUri);
     }
 
-    static final String[] UNIFIED_PROJECTION = new String[] {
-            KeyRings._ID, KeyRings.FINGERPRINT
+    static final String[] UNIFIED_PROJECTION = new String[]{
+            KeyRings._ID, KeyRings.FINGERPRINT, KeyRings.USER_ID
     };
 
     static final int INDEX_UNIFIED_FINGERPRINT = 1;
+    static final int INDEX_UNIFIED_USER_ID = 2;
 
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         setContentShown(false);
@@ -355,6 +363,8 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
                     byte[] fingerprintBlob = data.getBlob(INDEX_UNIFIED_FINGERPRINT);
                     setFingerprint(fingerprintBlob);
 
+                    mUserId = data.getString(INDEX_UNIFIED_USER_ID);
+
                     break;
                 }
             }
@@ -371,10 +381,11 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         mFingerprint = null;
     }
 
-    /** Load QR Code asynchronously and with a fade in animation */
+    /**
+     * Load QR Code asynchronously and with a fade in animation
+     */
     private void setFingerprint(byte[] fingerprintBlob) {
         mFingerprint = fingerprintBlob;
-        mMasterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(fingerprintBlob);
 
         final String fingerprint = KeyFormattingUtils.convertFingerprintToHex(fingerprintBlob);
         mFingerprintView.setText(KeyFormattingUtils.colorizeFingerprint(fingerprint));
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
deleted file mode 100644
index cc90c173f..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.util;
-
-
-import java.io.File;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.support.v4.app.FragmentActivity;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.operations.results.ExportResult;
-import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
-import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
-
-public class ExportHelper
-        implements CryptoOperationHelper.Callback <ExportKeyringParcel, ExportResult> {
-    protected File mExportFile;
-
-    FragmentActivity mActivity;
-
-    private boolean mExportSecret;
-    private long[] mMasterKeyIds;
-
-    public ExportHelper(FragmentActivity activity) {
-        super();
-        this.mActivity = activity;
-    }
-
-    /** Show dialog where to export keys */
-    public void showExportKeysDialog(final Long masterKeyId, final File exportFile,
-                                     final boolean exportSecret) {
-        mExportFile = exportFile;
-
-        String title;
-        if (masterKeyId == null) {
-            // export all keys
-            title = mActivity.getString(R.string.title_export_keys);
-        } else {
-            // export only key specified at data uri
-            title = mActivity.getString(R.string.title_export_key);
-        }
-
-        String message;
-        if (exportSecret) {
-            message = mActivity.getString(masterKeyId == null
-                    ? R.string.specify_backup_dest_secret
-                    : R.string.specify_backup_dest_secret_single);
-        } else {
-            message = mActivity.getString(masterKeyId == null
-                    ? R.string.specify_backup_dest
-                    : R.string.specify_backup_dest_single);
-        }
-
-        // TODO: for valodim
-//        FileHelper.saveDocumentDialog(new FileHelper.FileDialogCallback() {
-//            @Override
-//            public void onFileSelected(File file, boolean checked) {
-//                mExportFile = file;
-//                exportKeys(masterKeyId == null ? null : new long[] { masterKeyId }, exportSecret);
-//            }
-//        }, mActivity.getSupportFragmentManager(), title, message, exportFile, null);
-    }
-
-    // TODO: If ExportHelper requires pending data (see CryptoOPerationHelper), activities using
-    // TODO: this class should be able to call mExportOpHelper.handleActivity
-
-    /**
-     * Export keys
-     */
-    public void exportKeys(long[] masterKeyIds, boolean exportSecret) {
-        Log.d(Constants.TAG, "exportKeys started");
-        mExportSecret = exportSecret;
-        mMasterKeyIds = masterKeyIds; // if masterKeyIds is null it means export all
-
-        CryptoOperationHelper<ExportKeyringParcel, ExportResult> exportOpHelper =
-                new CryptoOperationHelper<>(1, mActivity, this, R.string.progress_exporting);
-        exportOpHelper.cryptoOperation();
-    }
-
-    @Override
-    public ExportKeyringParcel createOperationInput() {
-        return new ExportKeyringParcel(null, mMasterKeyIds, mExportSecret, Uri.fromFile(mExportFile));
-    }
-
-    @Override
-    final public void onCryptoOperationSuccess(ExportResult result) {
-        // trigger scan of the created 'media' file so it shows up on MTP
-        // http://stackoverflow.com/questions/13737261/nexus-4-not-showing-files-via-mtp
-        mActivity.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(mExportFile)));
-        result.createNotify(mActivity).show();
-    }
-
-    @Override
-    public void onCryptoOperationCancelled() {
-
-    }
-
-    @Override
-    public void onCryptoOperationError(ExportResult result) {
-        result.createNotify(mActivity).show();
-    }
-
-    @Override
-    public boolean onCryptoSetProgress(String msg, int progress, int max) {
-        return false;
-    }
-}
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index d82506e74..c08d66cc1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -126,23 +126,6 @@
                 android:background="?android:attr/listDivider" />
 
             <ImageButton
-                android:id="@+id/view_key_action_key_export"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_save_grey_24dp"
-                android:layout_gravity="center_vertical"
-                android:background="?android:selectableItemBackground" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
                 android:id="@+id/view_key_action_key_nfc"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f1154645d..55f64c25e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -293,7 +293,8 @@
     <string name="no_filemanager_installed">"No compatible file manager installed."</string>
     <string name="passphrases_do_not_match">"The passwords didn't match."</string>
     <string name="passphrase_must_not_be_empty">"Please enter a password."</string>
-    <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
+    <string name="passphrase_for_symmetric_encryption">"Enter password"</string>
+    <string name="passphrase_for_backup">"Enter backup code"</string>
     <string name="passphrase_for">"Enter password for '%s'"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
@@ -337,7 +338,6 @@
     <string name="key_copied_to_clipboard">"Key has been copied to the clipboard!"</string>
     <string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string>
     <string name="select_key_to_certify">"Please select a key to be used for confirmation!"</string>
-    <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string>
     <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string>
 
     <!--
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
index 0f6afc234..29ba2bd19 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
@@ -56,7 +56,7 @@ import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow;
 import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
-import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
+import org.sufficientlysecure.keychain.service.BackupKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
@@ -151,7 +151,7 @@ public class ExportTest {
 
     @Test
     public void testExportAllLocalStripped() throws Exception {
-        ExportOperation op = new ExportOperation(RuntimeEnvironment.application,
+        BackupOperation op = new BackupOperation(RuntimeEnvironment.application,
                 new ProviderHelper(RuntimeEnvironment.application), null);
 
         // make sure there is a local cert (so the later checks that there are none are meaningful)
@@ -251,10 +251,10 @@ public class ExportTest {
         Application spyApplication = spy(RuntimeEnvironment.application);
         when(spyApplication.getContentResolver()).thenReturn(mockResolver);
 
-        ExportOperation op = new ExportOperation(spyApplication,
+        BackupOperation op = new BackupOperation(spyApplication,
                 new ProviderHelper(RuntimeEnvironment.application), null);
 
-        ExportKeyringParcel parcel = new ExportKeyringParcel(null,
+        BackupKeyringParcel parcel = new BackupKeyringParcel(null,
                 new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri);
 
         ExportResult result = op.execute(parcel, null);
@@ -310,10 +310,10 @@ public class ExportTest {
         Passphrase passphrase = new Passphrase("abcde");
 
         { // export encrypted
-            ExportOperation op = new ExportOperation(spyApplication,
+            BackupOperation op = new BackupOperation(spyApplication,
                     new ProviderHelper(RuntimeEnvironment.application), null);
 
-            ExportKeyringParcel parcel = new ExportKeyringParcel(passphrase,
+            BackupKeyringParcel parcel = new BackupKeyringParcel(passphrase,
                     new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri);
 
             ExportResult result = op.execute(parcel, null);