encrypted export WIP

10 files changed, 397 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index c966d688a..1ef8b2eb3 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -441,6 +441,14 @@
             android:label="@string/title_key_server_preference"
             android:windowSoftInputMode="stateHidden" />
         <activity
+            android:name=".ui.BackupActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_backup">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.MainActivity" />
+        </activity>
+        <activity
             android:name=".ui.CertifyKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_certify_key">
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
new file mode 100644
index 000000000..5535ad875
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupActivity.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ * Copyright (C) 2011 Senecaso
+ *
+ * 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.sufficientlysecure.keychain.ui;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.base.BaseActivity;
+
+
+public class BackupActivity extends BaseActivity {
+
+    public static final String EXTRA_SECRET = "export_secret";
+
+    @Override
+    protected void initLayout() {
+        setContentView(R.layout.drawer_backup_activity);
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeDisplayFragment.java
new file mode 100644
index 000000000..d1636525e
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeDisplayFragment.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2015 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.ui;
+
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.sufficientlysecure.keychain.R;
+
+
+public class BackupCodeDisplayFragment extends Fragment {
+
+    public static final String ARG_BACKUP_CODE = "backup_code";
+
+    private String mBackupCode;
+
+    private TextView vBackupCode;
+    private Button vOkButton;
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.drawer_backup_fragment, container, false);
+
+        vBackupCode = (TextView) view.findViewById(R.id.backup_code);
+        vOkButton = (Button) view.findViewById(R.id.button_ok);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (savedInstanceState == null) {
+            mBackupCode = generateRandomCode();
+        } else {
+            mBackupCode = savedInstanceState.getString(ARG_BACKUP_CODE);
+        }
+
+        vBackupCode.setText(mBackupCode);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putString(ARG_BACKUP_CODE, mBackupCode);
+    }
+
+    @NonNull
+    private static String generateRandomCode() {
+
+        Random r = new SecureRandom();
+
+        // simple generation of a 20 character backup code
+        StringBuilder code = new StringBuilder(24);
+        for (int i = 0; i < 20; i++) {
+            if ((i % 5) == 4) {
+                code.append('-');
+            }
+            code.append('a' + r.nextInt(26));
+        }
+
+        return code.toString();
+
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java
index a3ea8ad9a..b48dfa749 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java
@@ -36,6 +36,7 @@ import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -43,7 +44,8 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.util.ExportHelper;
 
-public class BackupFragment extends Fragment {
+
+public class BackupCodeEntryFragment extends Fragment {
 
     // This ids for multiple key export.
     private ArrayList<Long> mIdsForRepeatAskPassphrase;
@@ -68,7 +70,9 @@ public class BackupFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.backup_fragment, container, false);
+        View view = inflater.inflate(R.layout.drawer_backup_fragment, container, false);
+
+        TextView backupCode = (TextView) view.findViewById(R.id.backup_code);
 
         View backupAll = view.findViewById(R.id.backup_all);
         View backupPublicKeys = view.findViewById(R.id.backup_public_keys);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerBackupFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerBackupFragment.java
new file mode 100644
index 000000000..cf47dfc94
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerBackupFragment.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2015 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.ui;
+
+
+import java.util.ArrayList;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+
+public class DrawerBackupFragment extends Fragment {
+
+    // This ids for multiple key export.
+    private ArrayList<Long> mIdsForRepeatAskPassphrase;
+    // This index for remembering the number of master key.
+    private int mIndex;
+
+    static final int REQUEST_REPEAT_PASSPHRASE = 1;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.drawer_backup_fragment, container, false);
+
+        View backupAll = view.findViewById(R.id.backup_all);
+        View backupPublicKeys = view.findViewById(R.id.backup_public_keys);
+
+        backupAll.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exportToFile(true);
+            }
+        });
+
+        backupPublicKeys.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exportToFile(false);
+            }
+        });
+
+        return view;
+    }
+
+    private void exportToFile(boolean includeSecretKeys) {
+        FragmentActivity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        if (!includeSecretKeys) {
+            startBackup(false);
+            return;
+        }
+
+        new AsyncTask<ContentResolver,Void,ArrayList<Long>>() {
+            @Override
+            protected ArrayList<Long> doInBackground(ContentResolver... resolver) {
+                ArrayList<Long> askPassphraseIds = new ArrayList<>();
+                Cursor cursor = resolver[0].query(
+                        KeyRings.buildUnifiedKeyRingsUri(), new String[] {
+                                KeyRings.MASTER_KEY_ID,
+                                KeyRings.HAS_SECRET,
+                        }, KeyRings.HAS_SECRET + " != 0", null, null);
+                try {
+                    if (cursor != null) {
+                        while (cursor.moveToNext()) {
+                            SecretKeyType secretKeyType = SecretKeyType.fromNum(cursor.getInt(1));
+                            switch (secretKeyType) {
+                                // all of these make no sense to ask
+                                case PASSPHRASE_EMPTY:
+                                case GNU_DUMMY:
+                                case DIVERT_TO_CARD:
+                                case UNAVAILABLE:
+                                    continue;
+                                default: {
+                                    long keyId = cursor.getLong(0);
+                                    askPassphraseIds.add(keyId);
+                                }
+                            }
+                        }
+                    }
+                } finally {
+                    if (cursor != null) {
+                        cursor.close();
+                    }
+                }
+                return askPassphraseIds;
+            }
+
+            @Override
+            protected void onPostExecute(ArrayList<Long> askPassphraseIds) {
+                super.onPostExecute(askPassphraseIds);
+                FragmentActivity activity = getActivity();
+                if (activity == null) {
+                    return;
+                }
+
+                mIdsForRepeatAskPassphrase = askPassphraseIds;
+                mIndex = 0;
+
+                if (mIdsForRepeatAskPassphrase.size() != 0) {
+                    startPassphraseActivity();
+                    return;
+                }
+
+                startBackup(true);
+            }
+
+        }.execute(activity.getContentResolver());
+
+    }
+
+    private void startPassphraseActivity() {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        Intent intent = new Intent(activity, PassphraseDialogActivity.class);
+        long masterKeyId = mIdsForRepeatAskPassphrase.get(mIndex++);
+        intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, masterKeyId);
+        startActivityForResult(intent, REQUEST_REPEAT_PASSPHRASE);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_REPEAT_PASSPHRASE) {
+            if (resultCode != Activity.RESULT_OK) {
+                return;
+            }
+            if (mIndex < mIdsForRepeatAskPassphrase.size()) {
+                startPassphraseActivity();
+                return;
+            }
+
+            startBackup(true);
+        }
+    }
+
+    private void startBackup(boolean exportSecret) {
+
+        Intent intent = new Intent(getActivity(), BackupActivity.class);
+        intent.putExtra(BackupActivity.EXTRA_SECRET, exportSecret);
+        startActivity(intent);
+
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 6f5d98afd..a5bd84d7e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -204,7 +204,7 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac
     private void onBackupSelected() {
         mToolbar.setTitle(R.string.nav_backup);
         mDrawer.setSelectionByIdentifier(ID_APPS, false);
-        Fragment frag = new BackupFragment();
+        Fragment frag = new DrawerBackupFragment();
         setFragment(frag, true);
     }
 
@@ -265,7 +265,7 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac
         } else if (frag instanceof AppsListFragment) {
             mToolbar.setTitle(R.string.nav_apps);
             mDrawer.setSelection(mDrawer.getPositionFromIdentifier(ID_APPS), false);
-        } else if (frag instanceof BackupFragment) {
+        } else if (frag instanceof DrawerBackupFragment) {
             mToolbar.setTitle(R.string.nav_backup);
             mDrawer.setSelection(mDrawer.getPositionFromIdentifier(ID_BACKUP), false);
         }
diff --git a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
new file mode 100644
index 000000000..3bd7fd7af
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:paddingTop="10dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:layout_gravity="center_horizontal"
+        android:text="Your key backup will be encrypted with this code:"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:padding="10dp"
+        android:layout_margin="20dp"
+        android:id="@+id/backup_code"
+        tools:text="abcde-fghij-klmno-pqrst"
+        style="?android:textAppearanceLarge"
+        />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="10dp"
+        android:text="Ok, I wrote it down!"
+        android:id="@+id/button_ok"
+        style="?buttonStyle"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/drawer_backup_activity.xml b/OpenKeychain/src/main/res/layout/drawer_backup_activity.xml
new file mode 100644
index 000000000..f34cb2faf
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/drawer_backup_activity.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone_white" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/content_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <fragment
+                android:id="@+id/backup_fragment"
+                android:name="org.sufficientlysecure.keychain.ui.BackupCodeDisplayFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/backup_fragment.xml b/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml
index 96fba954b..96fba954b 100644
--- a/OpenKeychain/src/main/res/layout/backup_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f12be176e..81743213f 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="title_export_keys">"Backup Keys"</string>
     <string name="title_key_not_found">"Key Not Found"</string>
     <string name="title_send_key">"Upload to Keyserver"</string>
+    <string name="title_backup">"Backup Key"</string>
     <string name="title_certify_key">"Confirm Key"</string>
     <string name="title_key_details">"Key Details"</string>
     <string name="title_help">"Help"</string>