Rename for consistency

1 files changed, 0 insertions, 262 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java
deleted file mode 100644
index db62d53c5..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java
+++ /dev/null
@@ -1,262 +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.ui;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Message;
-import android.os.Messenger;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.spongycastle.util.encoders.Hex;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
-import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
-import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
-import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
-import org.sufficientlysecure.keychain.service.KeychainIntentService;
-import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
-import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
-import org.sufficientlysecure.keychain.ui.CreateKeyActivity.NfcListenerFragment;
-import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-import org.sufficientlysecure.keychain.util.Preferences;
-
-
-public class CreateKeyYubiImportFragment extends Fragment implements NfcListenerFragment {
-
-    private static final String ARG_FINGERPRINT = "fingerprint";
-    public static final String ARG_AID = "aid";
-    public static final String ARG_USER_ID = "user_ids";
-
-    CreateKeyActivity mCreateKeyActivity;
-
-    private byte[] mNfcFingerprints;
-    private long mNfcMasterKeyId;
-    private byte[] mNfcAid;
-    private String mNfcUserId;
-    private String mNfcFingerprint;
-    private ImportKeysListFragment mListFragment;
-    private TextView vSerNo;
-    private TextView vUserId;
-
-    public static Fragment createInstance(byte[] scannedFingerprints, byte[] nfcAid, String userId) {
-
-        CreateKeyYubiImportFragment frag = new CreateKeyYubiImportFragment();
-
-        Bundle args = new Bundle();
-        args.putByteArray(ARG_FINGERPRINT, scannedFingerprints);
-        args.putByteArray(ARG_AID, nfcAid);
-        args.putString(ARG_USER_ID, userId);
-        frag.setArguments(args);
-
-        return frag;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle args = savedInstanceState != null ? savedInstanceState : getArguments();
-
-        mNfcFingerprints = args.getByteArray(ARG_FINGERPRINT);
-        mNfcAid = args.getByteArray(ARG_AID);
-        mNfcUserId = args.getString(ARG_USER_ID);
-
-        mNfcMasterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mNfcFingerprints);
-        mNfcFingerprint = KeyFormattingUtils.convertFingerprintToHex(mNfcFingerprints);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.create_yubikey_import_fragment, container, false);
-
-        vSerNo = (TextView) view.findViewById(R.id.yubikey_serno);
-        vUserId = (TextView) view.findViewById(R.id.yubikey_userid);
-
-        {
-            View mBackButton = view.findViewById(R.id.create_key_back_button);
-            mBackButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (getFragmentManager().getBackStackEntryCount() == 0) {
-                        getActivity().setResult(Activity.RESULT_CANCELED);
-                        getActivity().finish();
-                    } else {
-                        mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT);
-                    }
-                }
-            });
-
-            View mNextButton = view.findViewById(R.id.create_key_next_button);
-            mNextButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    importKey();
-                }
-            });
-        }
-
-        mListFragment = ImportKeysListFragment.newInstance(null, null,
-                "0x" + mNfcFingerprint, true, null);
-
-        view.findViewById(R.id.button_search).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                refreshSearch();
-            }
-        });
-
-        setData();
-
-        getFragmentManager().beginTransaction()
-                .replace(R.id.yubikey_import_fragment, mListFragment, "yubikey_import")
-                .commit();
-
-        return view;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle args) {
-        super.onSaveInstanceState(args);
-
-        args.putByteArray(ARG_FINGERPRINT, mNfcFingerprints);
-        args.putByteArray(ARG_AID, mNfcAid);
-        args.putString(ARG_USER_ID, mNfcUserId);
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        mCreateKeyActivity = (CreateKeyActivity) getActivity();
-    }
-
-    public void setData() {
-        String serno = Hex.toHexString(mNfcAid, 10, 4);
-        vSerNo.setText(getString(R.string.yubikey_serno, serno));
-
-        if (!mNfcUserId.isEmpty()) {
-            vUserId.setText(getString(R.string.yubikey_key_holder, mNfcUserId));
-        } else {
-            vUserId.setText(getString(R.string.yubikey_key_holder_unset));
-        }
-    }
-
-    public void refreshSearch() {
-        mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint,
-                Preferences.getPreferences(getActivity()).getCloudSearchPrefs()));
-    }
-
-    public void importKey() {
-
-        // Message is received after decrypting is done in KeychainIntentService
-        ServiceProgressHandler saveHandler = new ServiceProgressHandler(
-                getActivity(),
-                getString(R.string.progress_importing),
-                ProgressDialog.STYLE_HORIZONTAL,
-                ProgressDialogFragment.ServiceType.KEYCHAIN_INTENT
-        ) {
-            public void handleMessage(Message message) {
-                // handle messages by standard KeychainIntentServiceHandler first
-                super.handleMessage(message);
-
-                if (message.arg1 == MessageStatus.OKAY.ordinal()) {
-                    // get returned data bundle
-                    Bundle returnData = message.getData();
-
-                    ImportKeyResult result =
-                            returnData.getParcelable(DecryptVerifyResult.EXTRA_RESULT);
-
-                    if (!result.success()) {
-                        result.createNotify(getActivity()).show();
-                        return;
-                    }
-
-                    Intent intent = new Intent(getActivity(), ViewKeyActivity.class);
-                    intent.setData(KeyRings.buildGenericKeyRingUri(mNfcMasterKeyId));
-                    intent.putExtra(ViewKeyActivity.EXTRA_DISPLAY_RESULT, result);
-                    intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-                    intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-                    intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mNfcFingerprints);
-                    startActivity(intent);
-                    getActivity().finish();
-
-                }
-
-            }
-        };
-
-        // Send all information needed to service to decrypt in other thread
-        Intent intent = new Intent(getActivity(), KeychainIntentService.class);
-
-        // fill values for this action
-        Bundle data = new Bundle();
-
-        intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
-
-        String hexFp = KeyFormattingUtils.convertFingerprintToHex(mNfcFingerprints);
-        ArrayList<ParcelableKeyRing> keyList = new ArrayList<>();
-        keyList.add(new ParcelableKeyRing(hexFp, null, null));
-        data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, keyList);
-
-        {
-            Preferences prefs = Preferences.getPreferences(getActivity());
-            Preferences.CloudSearchPrefs cloudPrefs =
-                    new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver());
-            data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver);
-        }
-
-        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
-
-        // Create a new Messenger for the communication back
-        Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
-
-        saveHandler.showProgressDialog(getActivity());
-
-        // start service with intent
-        getActivity().startService(intent);
-
-    }
-
-    @Override
-    public void onNfcPerform() throws IOException {
-
-        mNfcFingerprints = mCreateKeyActivity.nfcGetFingerprints();
-        mNfcAid = mCreateKeyActivity.nfcGetAid();
-        mNfcUserId = mCreateKeyActivity.nfcGetUserId();
-
-        mNfcMasterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mNfcFingerprints);
-        mNfcFingerprint = KeyFormattingUtils.convertFingerprintToHex(mNfcFingerprints);
-
-        setData();
-        refreshSearch();
-
-    }
-}