minor cleanup in UploadKeyActivity
This commit is contained in:
parent
0793300b73
commit
e6fe353469
|
@ -23,7 +23,6 @@ import java.util.ArrayList;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
|
|
||||||
|
@ -40,7 +39,8 @@ import org.sufficientlysecure.keychain.util.Preferences;
|
||||||
*/
|
*/
|
||||||
public class UploadKeyActivity extends BaseActivity
|
public class UploadKeyActivity extends BaseActivity
|
||||||
implements CryptoOperationHelper.Callback<UploadKeyringParcel, UploadResult> {
|
implements CryptoOperationHelper.Callback<UploadKeyringParcel, UploadResult> {
|
||||||
private View mUploadButton;
|
public static final String EXTRA_KEY_IDS = "extra_key_ids";
|
||||||
|
|
||||||
private Spinner mKeyServerSpinner;
|
private Spinner mKeyServerSpinner;
|
||||||
|
|
||||||
// CryptoOperationHelper.Callback vars
|
// CryptoOperationHelper.Callback vars
|
||||||
|
@ -51,7 +51,7 @@ public class UploadKeyActivity extends BaseActivity
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
mUploadButton = findViewById(R.id.upload_key_action_upload);
|
View uploadButton = findViewById(R.id.upload_key_action_upload);
|
||||||
mKeyServerSpinner = findViewById(R.id.upload_key_keyserver);
|
mKeyServerSpinner = findViewById(R.id.upload_key_keyserver);
|
||||||
|
|
||||||
MultiUserIdsFragment mMultiUserIdsFragment = (MultiUserIdsFragment)
|
MultiUserIdsFragment mMultiUserIdsFragment = (MultiUserIdsFragment)
|
||||||
|
@ -66,15 +66,10 @@ public class UploadKeyActivity extends BaseActivity
|
||||||
if (adapter.getCount() > 0) {
|
if (adapter.getCount() > 0) {
|
||||||
mKeyServerSpinner.setSelection(0);
|
mKeyServerSpinner.setSelection(0);
|
||||||
} else {
|
} else {
|
||||||
mUploadButton.setEnabled(false);
|
uploadButton.setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
mUploadButton.setOnClickListener(new OnClickListener() {
|
uploadButton.setOnClickListener(v -> uploadKey());
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
uploadKey();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String[] getKeyserversArray() {
|
private String[] getKeyserversArray() {
|
||||||
|
@ -113,8 +108,7 @@ public class UploadKeyActivity extends BaseActivity
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UploadKeyringParcel createOperationInput() {
|
public UploadKeyringParcel createOperationInput() {
|
||||||
long[] masterKeyIds = getIntent().getLongArrayExtra(MultiUserIdsFragment.EXTRA_KEY_IDS);
|
long[] masterKeyIds = getIntent().getLongArrayExtra(EXTRA_KEY_IDS);
|
||||||
|
|
||||||
return UploadKeyringParcel.createWithKeyId(mKeyserver, masterKeyIds[0]);
|
return UploadKeyringParcel.createWithKeyId(mKeyserver, masterKeyIds[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ import org.sufficientlysecure.keychain.pgp.SshPublicKey;
|
||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
||||||
import org.sufficientlysecure.keychain.provider.KeyRepository;
|
import org.sufficientlysecure.keychain.provider.KeyRepository;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
|
||||||
import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
|
import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
|
||||||
import org.sufficientlysecure.keychain.ui.ViewKeyAdvActivity.ViewKeyAdvViewModel;
|
import org.sufficientlysecure.keychain.ui.ViewKeyAdvActivity.ViewKeyAdvViewModel;
|
||||||
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
|
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
|
||||||
|
@ -335,8 +334,7 @@ public class ViewKeyAdvShareFragment extends Fragment {
|
||||||
|
|
||||||
private void uploadToKeyserver() {
|
private void uploadToKeyserver() {
|
||||||
Intent uploadIntent = new Intent(getActivity(), UploadKeyActivity.class);
|
Intent uploadIntent = new Intent(getActivity(), UploadKeyActivity.class);
|
||||||
uploadIntent.setData(KeyRings.buildUnifiedKeyRingUri(unifiedKeyInfo.master_key_id()));
|
uploadIntent.putExtra(UploadKeyActivity.EXTRA_KEY_IDS, new long[] { unifiedKeyInfo.master_key_id() });
|
||||||
uploadIntent.putExtra(MultiUserIdsFragment.EXTRA_KEY_IDS, new long[]{ unifiedKeyInfo.master_key_id() });
|
|
||||||
startActivityForResult(uploadIntent, 0);
|
startActivityForResult(uploadIntent, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue