tls-psk: use unified KeyTransferInteractor, display list of keys

2017-05-30 13:34:03 +02:00
parent 9b3dd27ffd
commit 747feaa100
10 changed files with 758 additions and 474 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/loader/SecretKeyLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/loader/SecretKeyLoader.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ *
+ * 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.transfer.loader;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v4.content.AsyncTaskLoader;
+import android.util.Log;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.ui.transfer.loader.SecretKeyLoader.SecretKeyItem;
+
+
+public class SecretKeyLoader extends AsyncTaskLoader<List<SecretKeyItem>> {
+    public static final String[] PROJECTION = new String[] {
+            KeyRings.MASTER_KEY_ID,
+            KeyRings.CREATION,
+            KeyRings.NAME,
+            KeyRings.EMAIL,
+            KeyRings.HAS_ANY_SECRET
+    };
+    private static final int INDEX_KEY_ID = 0;
+    private static final int INDEX_CREATION = 1;
+    private static final int INDEX_NAME = 2;
+    private static final int INDEX_EMAIL = 3;
+
+
+    private final ContentResolver contentResolver;
+
+    private List<SecretKeyItem> cachedResult;
+
+
+    public SecretKeyLoader(Context context, ContentResolver contentResolver) {
+        super(context);
+
+        this.contentResolver = contentResolver;
+    }
+
+    @Override
+    public List<SecretKeyItem> loadInBackground() {
+        String where = KeyRings.HAS_ANY_SECRET + " = 1";
+        Cursor cursor = contentResolver.query(KeyRings.buildUnifiedKeyRingsUri(), PROJECTION, where, null, null);
+        if (cursor == null) {
+            Log.e(Constants.TAG, "Error loading key items!");
+            return null;
+        }
+
+        try {
+            ArrayList<SecretKeyItem> secretKeyItems = new ArrayList<>();
+            while (cursor.moveToNext()) {
+                SecretKeyItem secretKeyItem = new SecretKeyItem(cursor);
+                secretKeyItems.add(secretKeyItem);
+            }
+
+            return Collections.unmodifiableList(secretKeyItems);
+        } finally {
+            cursor.close();
+        }
+    }
+
+    @Override
+    public void deliverResult(List<SecretKeyItem> keySubkeyStatus) {
+        cachedResult = keySubkeyStatus;
+
+        if (isStarted()) {
+            super.deliverResult(keySubkeyStatus);
+        }
+    }
+
+    @Override
+    protected void onStartLoading() {
+        if (cachedResult != null) {
+            deliverResult(cachedResult);
+        }
+
+        if (takeContentChanged() || cachedResult == null) {
+            forceLoad();
+        }
+    }
+
+    public static class SecretKeyItem {
+        final int position;
+        public final long masterKeyId;
+        public final long creationMillis;
+        public final String name;
+        public final String email;
+
+        SecretKeyItem(Cursor cursor) {
+            position = cursor.getPosition();
+
+            masterKeyId = cursor.getLong(INDEX_KEY_ID);
+            creationMillis = cursor.getLong(INDEX_CREATION) * 1000;
+
+            name = cursor.getString(INDEX_NAME);
+            email = cursor.getString(INDEX_EMAIL);
+        }
+    }
+}
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
@@ -18,33 +18,61 @@
 package org.sufficientlysecure.keychain.ui.transfer.presenter;


+import java.io.IOException;
+import java.util.List;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
 import android.support.annotation.RequiresApi;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
+import android.support.v7.widget.RecyclerView.Adapter;
+import android.view.LayoutInflater;

-import org.sufficientlysecure.keychain.network.KeyTransferClientInteractor;
-import org.sufficientlysecure.keychain.network.KeyTransferClientInteractor.KeyTransferClientCallback;
-import org.sufficientlysecure.keychain.network.KeyTransferServerInteractor;
-import org.sufficientlysecure.keychain.network.KeyTransferServerInteractor.KeyTransferServerCallback;
+import org.sufficientlysecure.keychain.network.KeyTransferInteractor;
+import org.sufficientlysecure.keychain.network.KeyTransferInteractor.KeyTransferCallback;
+import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
+import org.sufficientlysecure.keychain.provider.KeyRepository;
+import org.sufficientlysecure.keychain.provider.KeyRepository.NotFoundException;
+import org.sufficientlysecure.keychain.ui.transfer.loader.SecretKeyLoader.SecretKeyItem;
+import org.sufficientlysecure.keychain.ui.transfer.view.TransferSecretKeyList.OnClickTransferKeyListener;
+import org.sufficientlysecure.keychain.ui.transfer.view.TransferSecretKeyList.TransferKeyAdapter;
 import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;


@RequiresApi(api = VERSION_CODES.LOLLIPOP)
-public class TransferPresenter implements KeyTransferServerCallback, KeyTransferClientCallback {
+public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<List<SecretKeyItem>>,
+        OnClickTransferKeyListener {
    private final Context context;
    private final TransferMvpView view;
+    private final LoaderManager loaderManager;
+    private final int loaderId;

-    private KeyTransferServerInteractor keyTransferServerInteractor;
-    private KeyTransferClientInteractor keyTransferClientInteractor;
+    private KeyTransferInteractor keyTransferClientInteractor;
+    private KeyTransferInteractor keyTransferServerInteractor;
+    private final TransferKeyAdapter secretKeyAdapter;

-    public TransferPresenter(Context context, TransferMvpView view) {
+    public TransferPresenter(Context context, LoaderManager loaderManager, int loaderId, TransferMvpView view) {
        this.context = context;
        this.view = view;
+        this.loaderManager = loaderManager;
+        this.loaderId = loaderId;
+
+        secretKeyAdapter = new TransferKeyAdapter(context, LayoutInflater.from(context), this);
+        view.setSecretKeyAdapter(secretKeyAdapter);
    }

-    public void onDestroy() {
+    public void onStart() {
+        loaderManager.restartLoader(loaderId, null, this);
+
+        startServer();
+    }
+
+    public void onStop() {
        clearConnections();
    }

@@ -55,13 +83,13 @@ public class TransferPresenter implements KeyTransferServerCallback, KeyTransfer
    }

    public void onQrCodeScanned(String qrCodeContent) {
-        keyTransferClientInteractor = new KeyTransferClientInteractor();
+        keyTransferClientInteractor = new KeyTransferInteractor();
        keyTransferClientInteractor.connectToServer(qrCodeContent, this);
    }

    private void clearConnections() {
        if (keyTransferServerInteractor != null) {
-            keyTransferServerInteractor.stopServer();
+            keyTransferServerInteractor.closeConnection();
            keyTransferServerInteractor = null;
        }
        if (keyTransferClientInteractor != null) {
@@ -71,7 +99,7 @@ public class TransferPresenter implements KeyTransferServerCallback, KeyTransfer
    }

    public void startServer() {
-        keyTransferServerInteractor = new KeyTransferServerInteractor();
+        keyTransferServerInteractor = new KeyTransferInteractor();
        keyTransferServerInteractor.startServer(this);
    }

@@ -92,12 +120,43 @@ public class TransferPresenter implements KeyTransferServerCallback, KeyTransfer
        startServer();
    }

-    public interface TransferMvpView {
-        void showConnectionEstablished(String hostname);
-        void showWaitingForConnection();
+    @Override
+    public Loader<List<SecretKeyItem>> onCreateLoader(int id, Bundle args) {
+        return secretKeyAdapter.createLoader(context);
+    }

-        void setQrImage(Bitmap qrCode);
+    @Override
+    public void onLoadFinished(Loader<List<SecretKeyItem>> loader, List<SecretKeyItem> data) {
+        secretKeyAdapter.setData(data);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<List<SecretKeyItem>> loader) {
+        secretKeyAdapter.setData(null);
+    }
+
+    @Override
+    public void onClickTransferKey(long masterKeyId) {
+        try {
+            byte[] armoredSecretKey =
+                    KeyRepository.createDatabaseInteractor(context).getSecretKeyRingAsArmoredData(masterKeyId);
+            if (keyTransferClientInteractor != null) {
+                keyTransferClientInteractor.sendData(armoredSecretKey);
+            } else if (keyTransferServerInteractor != null) {
+                keyTransferServerInteractor.sendData(armoredSecretKey);
+            }
+        } catch (IOException | NotFoundException | PgpGeneralException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public interface TransferMvpView {
+        void showWaitingForConnection();
+        void showConnectionEstablished(String hostname);

        void scanQrCode();
+        void setQrImage(Bitmap qrCode);
+
+        void setSecretKeyAdapter(Adapter adapter);
    }
 }
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
@@ -26,6 +26,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.Adapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -47,12 +49,14 @@ public class TransferFragment extends Fragment implements TransferMvpView {
    public static final int VIEW_WAITING = 0;
    public static final int VIEW_CONNECTED = 1;
    public static final int REQUEST_CODE_SCAN = 1;
+    public static final int LOADER_ID = 1;


    private ImageView vQrCodeImage;
    private TransferPresenter presenter;
    private ViewAnimator vTransferAnimator;
    private TextView vConnectionStatusText;
+    private RecyclerView vTransferKeyList;


    @Override
@@ -62,6 +66,7 @@ public class TransferFragment extends Fragment implements TransferMvpView {
        vTransferAnimator = (ViewAnimator) view.findViewById(R.id.transfer_animator);

        vConnectionStatusText = (TextView) view.findViewById(R.id.connection_status);
+        vTransferKeyList = (RecyclerView) view.findViewById(R.id.transfer_key_list);

        vQrCodeImage = (ImageView) view.findViewById(R.id.qr_code_image);

@@ -82,22 +87,21 @@ public class TransferFragment extends Fragment implements TransferMvpView {
    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);

-        presenter = new TransferPresenter(getContext(), this);
+        presenter = new TransferPresenter(getContext(), getLoaderManager(), LOADER_ID, this);
    }

    @Override
    public void onStart() {
        super.onStart();

-        presenter.startServer();
+        presenter.onStart();
    }

-
    @Override
    public void onStop() {
        super.onStop();

-        presenter.onDestroy();
+        presenter.onStop();
    }

    @Override
@@ -132,6 +136,11 @@ public class TransferFragment extends Fragment implements TransferMvpView {
        startActivityForResult(intent, REQUEST_CODE_SCAN);
    }

+    @Override
+    public void setSecretKeyAdapter(Adapter adapter) {
+        vTransferKeyList.setAdapter(adapter);
+    }
+
    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
        switch (requestCode) {
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java
@@ -0,0 +1,144 @@
+package org.sufficientlysecure.keychain.ui.transfer.view;
+
+
+import java.util.List;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v4.content.Loader;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.format.DateUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.transfer.loader.SecretKeyLoader;
+import org.sufficientlysecure.keychain.ui.transfer.loader.SecretKeyLoader.SecretKeyItem;
+import org.sufficientlysecure.keychain.ui.util.recyclerview.DividerItemDecoration;
+
+
+public class TransferSecretKeyList extends RecyclerView {
+    private OnClickTransferKeyListener onClickTransferKeyListener;
+
+    public TransferSecretKeyList(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public TransferSecretKeyList(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public TransferSecretKeyList(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context);
+    }
+
+    private void init(Context context) {
+        setLayoutManager(new LinearLayoutManager(context));
+        addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL_LIST));
+    }
+
+    public static class TransferKeyAdapter extends RecyclerView.Adapter<TransferKeyViewHolder> {
+        private final Context context;
+        private final LayoutInflater layoutInflater;
+        private final OnClickTransferKeyListener onClickTransferKeyListener;
+
+        private List<SecretKeyItem> data;
+
+
+        public TransferKeyAdapter(Context context, LayoutInflater layoutInflater,
+                OnClickTransferKeyListener onClickTransferKeyListener) {
+            this.context = context;
+            this.layoutInflater = layoutInflater;
+            this.onClickTransferKeyListener = onClickTransferKeyListener;
+        }
+
+        @Override
+        public TransferKeyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            return new TransferKeyViewHolder(layoutInflater.inflate(R.layout.key_transfer_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(TransferKeyViewHolder holder, int position) {
+            SecretKeyItem item = data.get(position);
+            holder.bind(context, item, onClickTransferKeyListener);
+        }
+
+        @Override
+        public int getItemCount() {
+            return data != null ? data.size() : 0;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return data.get(position).masterKeyId;
+        }
+
+        public void setData(List<SecretKeyItem> data) {
+            this.data = data;
+            notifyDataSetChanged();
+        }
+
+        public Loader<List<SecretKeyItem>> createLoader(Context context) {
+            return new SecretKeyLoader(context, context.getContentResolver());
+        }
+    }
+
+    static class TransferKeyViewHolder extends RecyclerView.ViewHolder {
+        private final TextView vName;
+        private final TextView vEmail;
+        private final TextView vCreation;
+        private final View vSendButton;
+
+        public TransferKeyViewHolder(View itemView) {
+            super(itemView);
+
+            vName = (TextView) itemView.findViewById(R.id.key_list_item_name);
+            vEmail = (TextView) itemView.findViewById(R.id.key_list_item_email);
+            vCreation = (TextView) itemView.findViewById(R.id.key_list_item_creation);
+
+            vSendButton = itemView.findViewById(R.id.button_transfer);
+        }
+
+        private void bind(Context context, final SecretKeyItem item, final OnClickTransferKeyListener onClickTransferKeyListener) {
+            if (item.name != null) {
+                vName.setText(item.name);
+                vName.setVisibility(View.VISIBLE);
+            } else {
+                vName.setVisibility(View.GONE);
+            }
+            if (item.email != null) {
+                vEmail.setText(item.email);
+                vEmail.setVisibility(View.VISIBLE);
+            } else {
+                vEmail.setVisibility(View.GONE);
+            }
+
+            String dateTime = DateUtils.formatDateTime(context, item.creationMillis,
+                    DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME |
+                            DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_ABBREV_MONTH);
+            vCreation.setText(context.getString(R.string.label_key_created, dateTime));
+
+            if (onClickTransferKeyListener != null) {
+                vSendButton.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        onClickTransferKeyListener.onClickTransferKey(item.masterKeyId);
+                    }
+                });
+            } else {
+                vSendButton.setOnClickListener(null);
+            }
+        }
+    }
+
+    public interface OnClickTransferKeyListener {
+        void onClickTransferKey(long masterKeyId);
+    }
+}