cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up CertifyKeyFragment

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-02 14:56:14 +02:00
parent dca5dfe3aa
commit 8ee65f9b04
1 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
View File

@@ -28,9 +28,9 @@ import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.ImageView; import android.widget.ImageView;
@@ -52,75 +52,73 @@ import org.sufficientlysecure.keychain.ui.widget.KeySpinner;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
public class CertifyKeyFragment public class CertifyKeyFragment extends CachingCryptoOperationFragment<CertifyActionsParcel, CertifyResult> {
extends CachingCryptoOperationFragment<CertifyActionsParcel, CertifyResult> { private KeyRepository keyRepository;
private CheckBox mUploadKeyCheckbox; private CheckBox uploadKeyCheckbox;
private KeySpinner certifyKeySpinner;
private MultiUserIdsFragment multiUserIdsFragment;
private KeySpinner mCertifyKeySpinner; @Override
public void onCreate(Bundle savedInstanceState) {
private MultiUserIdsFragment mMultiUserIdsFragment; super.onCreate(savedInstanceState);
keyRepository = KeyRepository.create(requireContext());
}
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
Activity activity = requireActivity();
GenericViewModel viewModel = ViewModelProviders.of(this).get(GenericViewModel.class); GenericViewModel viewModel = ViewModelProviders.of(this).get(GenericViewModel.class);
LiveData<List<UnifiedKeyInfo>> liveData = viewModel.getGenericLiveData(requireContext(), () -> { LiveData<List<UnifiedKeyInfo>> liveData = viewModel.getGenericLiveData(
KeyRepository keyRepository = KeyRepository.create(requireContext()); requireContext(), keyRepository::getAllUnifiedKeyInfoWithSecret);
return keyRepository.getAllUnifiedKeyInfoWithSecret(); liveData.observe(this, certifyKeySpinner::setData);
});
liveData.observe(this, mCertifyKeySpinner::setData);
if (savedInstanceState == null) { if (savedInstanceState == null) {
// preselect certify key id if given // preselect certify key id if given
long certifyKeyId = getActivity().getIntent() long certifyKeyId = activity.getIntent()
.getLongExtra(CertifyKeyActivity.EXTRA_CERTIFY_KEY_ID, Constants.key.none); .getLongExtra(CertifyKeyActivity.EXTRA_CERTIFY_KEY_ID, Constants.key.none);
if (certifyKeyId != Constants.key.none) { if (certifyKeyId != Constants.key.none) {
KeyRepository keyRepository = KeyRepository.create(getContext());
UnifiedKeyInfo unifiedKeyInfo = keyRepository.getUnifiedKeyInfo(certifyKeyId); UnifiedKeyInfo unifiedKeyInfo = keyRepository.getUnifiedKeyInfo(certifyKeyId);
if (unifiedKeyInfo != null && unifiedKeyInfo.can_certify()) { if (unifiedKeyInfo != null && unifiedKeyInfo.can_certify()) {
mCertifyKeySpinner.setPreSelectedKeyId(certifyKeyId); certifyKeySpinner.setPreSelectedKeyId(certifyKeyId);
} }
} }
} }
OperationResult result = getActivity().getIntent().getParcelableExtra(CertifyKeyActivity.EXTRA_RESULT); OperationResult result = activity.getIntent().getParcelableExtra(CertifyKeyActivity.EXTRA_RESULT);
if (result != null) { if (result != null) {
// display result from import // display result from import
result.createNotify(getActivity()).show(); result.createNotify(activity).show();
} }
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.certify_key_fragment, null); View view = inflater.inflate(R.layout.certify_key_fragment, superContainer, false);
mCertifyKeySpinner = view.findViewById(R.id.certify_key_spinner); certifyKeySpinner = view.findViewById(R.id.certify_key_spinner);
mUploadKeyCheckbox = view.findViewById(R.id.sign_key_upload_checkbox); uploadKeyCheckbox = view.findViewById(R.id.sign_key_upload_checkbox);
mMultiUserIdsFragment = (MultiUserIdsFragment) multiUserIdsFragment = (MultiUserIdsFragment)
getChildFragmentManager().findFragmentById(R.id.multi_user_ids_fragment); getChildFragmentManager().findFragmentById(R.id.multi_user_ids_fragment);
mCertifyKeySpinner.setShowNone(R.string.choice_select_cert); certifyKeySpinner.setShowNone(R.string.choice_select_cert);
// make certify image gray, like action icons // make certify image gray, like action icons
ImageView vActionCertifyImage = ImageView vActionCertifyImage =
view.findViewById(R.id.certify_key_action_certify_image); view.findViewById(R.id.certify_key_action_certify_image);
vActionCertifyImage.setColorFilter(FormattingUtils.getColorFromAttr(getActivity(), R.attr.colorTertiaryText), vActionCertifyImage.setColorFilter(FormattingUtils.getColorFromAttr(requireActivity(), R.attr.colorTertiaryText),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
View vCertifyButton = view.findViewById(R.id.certify_key_certify_button); View vCertifyButton = view.findViewById(R.id.certify_key_certify_button);
vCertifyButton.setOnClickListener(new OnClickListener() { vCertifyButton.setOnClickListener(v -> {
long selectedKeyId = certifyKeySpinner.getSelectedKeyId();
@Override if (selectedKeyId == Constants.key.none) {
public void onClick(View v) { Notify.create(getActivity(), getString(R.string.select_key_to_certify),
long selectedKeyId = mCertifyKeySpinner.getSelectedKeyId(); Notify.Style.ERROR).show();
if (selectedKeyId == Constants.key.none) { } else {
Notify.create(getActivity(), getString(R.string.select_key_to_certify), cryptoOperation(CryptoInputParcel.createCryptoInputParcel(new Date()));
Notify.Style.ERROR).show();
} else {
cryptoOperation(CryptoInputParcel.createCryptoInputParcel(new Date()));
}
} }
}); });
@@ -129,22 +127,20 @@ public class CertifyKeyFragment
@Override @Override
public CertifyActionsParcel createOperationInput() { public CertifyActionsParcel createOperationInput() {
// Bail out if there is not at least one user id selected // Bail out if there is not at least one user id selected
ArrayList<CertifyAction> certifyActions = mMultiUserIdsFragment.getSelectedCertifyActions(); ArrayList<CertifyAction> certifyActions = multiUserIdsFragment.getSelectedCertifyActions();
if (certifyActions.isEmpty()) { if (certifyActions.isEmpty()) {
Notify.create(getActivity(), "No identities selected!", Notify.create(getActivity(), "No identities selected!", Notify.Style.ERROR).show();
Notify.Style.ERROR).show();
return null; return null;
} }
long selectedKeyId = mCertifyKeySpinner.getSelectedKeyId(); long selectedKeyId = certifyKeySpinner.getSelectedKeyId();
// fill values for this action // fill values for this action
CertifyActionsParcel.Builder actionsParcel = CertifyActionsParcel.builder(selectedKeyId); CertifyActionsParcel.Builder actionsParcel = CertifyActionsParcel.builder(selectedKeyId);
actionsParcel.addActions(certifyActions); actionsParcel.addActions(certifyActions);
if (mUploadKeyCheckbox.isChecked()) { if (uploadKeyCheckbox.isChecked()) {
actionsParcel.setParcelableKeyServer(Preferences.getPreferences(getActivity()).getPreferredKeyserver()); actionsParcel.setParcelableKeyServer(Preferences.getPreferences(getActivity()).getPreferredKeyserver());
} }
@@ -157,7 +153,7 @@ public class CertifyKeyFragment
@Override @Override
public void onQueuedOperationSuccess(CertifyResult result) { public void onQueuedOperationSuccess(CertifyResult result) {
// protected by Queueing*Fragment // protected by Queueing*Fragment
Activity activity = getActivity(); Activity activity = requireActivity();
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(CertifyResult.EXTRA_RESULT, result); intent.putExtra(CertifyResult.EXTRA_RESULT, result);