From e6fe35346921e820245880d5b3c7d24add6c5f53 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sun, 24 Jun 2018 13:07:44 +0200
Subject: [PATCH] minor cleanup in UploadKeyActivity

---
 .../keychain/ui/UploadKeyActivity.java         | 18 ++++++------------
 .../keychain/ui/ViewKeyAdvShareFragment.java   |  4 +---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index ba1c7f043..b3c8f6397 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
@@ -40,7 +39,8 @@ import org.sufficientlysecure.keychain.util.Preferences;
  */
 public class UploadKeyActivity extends BaseActivity
         implements CryptoOperationHelper.Callback<UploadKeyringParcel, UploadResult> {
-    private View mUploadButton;
+    public static final String EXTRA_KEY_IDS = "extra_key_ids";
+
     private Spinner mKeyServerSpinner;
 
     // CryptoOperationHelper.Callback vars
@@ -51,7 +51,7 @@ public class UploadKeyActivity extends BaseActivity
     protected void onCreate(Bundle 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);
 
         MultiUserIdsFragment mMultiUserIdsFragment = (MultiUserIdsFragment)
@@ -66,15 +66,10 @@ public class UploadKeyActivity extends BaseActivity
         if (adapter.getCount() > 0) {
             mKeyServerSpinner.setSelection(0);
         } else {
-            mUploadButton.setEnabled(false);
+            uploadButton.setEnabled(false);
         }
 
-        mUploadButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                uploadKey();
-            }
-        });
+        uploadButton.setOnClickListener(v -> uploadKey());
     }
 
     private String[] getKeyserversArray() {
@@ -113,8 +108,7 @@ public class UploadKeyActivity extends BaseActivity
 
     @Override
     public UploadKeyringParcel createOperationInput() {
-        long[] masterKeyIds = getIntent().getLongArrayExtra(MultiUserIdsFragment.EXTRA_KEY_IDS);
-
+        long[] masterKeyIds = getIntent().getLongArrayExtra(EXTRA_KEY_IDS);
         return UploadKeyringParcel.createWithKeyId(mKeyserver, masterKeyIds[0]);
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
index 9ab1970c1..89b6b2cfd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
@@ -60,7 +60,6 @@ import org.sufficientlysecure.keychain.pgp.SshPublicKey;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.provider.KeyRepository;
-import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
 import org.sufficientlysecure.keychain.ui.ViewKeyAdvActivity.ViewKeyAdvViewModel;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
@@ -335,8 +334,7 @@ public class ViewKeyAdvShareFragment extends Fragment {
 
     private void uploadToKeyserver() {
         Intent uploadIntent = new Intent(getActivity(), UploadKeyActivity.class);
-        uploadIntent.setData(KeyRings.buildUnifiedKeyRingUri(unifiedKeyInfo.master_key_id()));
-        uploadIntent.putExtra(MultiUserIdsFragment.EXTRA_KEY_IDS, new long[]{ unifiedKeyInfo.master_key_id() });
+        uploadIntent.putExtra(UploadKeyActivity.EXTRA_KEY_IDS, new long[] { unifiedKeyInfo.master_key_id() });
         startActivityForResult(uploadIntent, 0);
     }