From c93670f3c6af3bc27b531a2501fc82e9a759ddc0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 26 Sep 2015 03:20:39 +0200
Subject: export: externalize upload into its own operation

---
 .../keychain/ui/UploadKeyActivity.java                | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java')

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 0415128a2..acd30ed24 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -17,6 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -29,10 +30,10 @@ import android.widget.Spinner;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.operations.results.ExportResult;
+import org.sufficientlysecure.keychain.operations.results.UploadResult;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
-import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
+import org.sufficientlysecure.keychain.service.UploadKeyringParcel;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
 import org.sufficientlysecure.keychain.util.Log;
@@ -42,7 +43,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
  * Sends the selected public key to a keyserver
  */
 public class UploadKeyActivity extends BaseActivity
-        implements CryptoOperationHelper.Callback<ExportKeyringParcel, ExportResult> {
+        implements CryptoOperationHelper.Callback<UploadKeyringParcel, UploadResult> {
     private View mUploadButton;
     private Spinner mKeyServerSpinner;
 
@@ -51,7 +52,7 @@ public class UploadKeyActivity extends BaseActivity
     // CryptoOperationHelper.Callback vars
     private String mKeyserver;
     private Uri mUnifiedKeyringUri;
-    private CryptoOperationHelper<ExportKeyringParcel, ExportResult> mUploadOpHelper;
+    private CryptoOperationHelper<UploadKeyringParcel, UploadResult> mUploadOpHelper;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -107,7 +108,7 @@ public class UploadKeyActivity extends BaseActivity
         String server = (String) mKeyServerSpinner.getSelectedItem();
         mKeyserver = server;
 
-        mUploadOpHelper = new CryptoOperationHelper(1, this, this, R.string.progress_uploading);
+        mUploadOpHelper = new CryptoOperationHelper<>(1, this, this, R.string.progress_uploading);
         mUploadOpHelper.cryptoOperation();
     }
 
@@ -125,12 +126,12 @@ public class UploadKeyActivity extends BaseActivity
     }
 
     @Override
-    public ExportKeyringParcel createOperationInput() {
-        return new ExportKeyringParcel(mKeyserver, mUnifiedKeyringUri);
+    public UploadKeyringParcel createOperationInput() {
+        return new UploadKeyringParcel(mKeyserver, mUnifiedKeyringUri);
     }
 
     @Override
-    public void onCryptoOperationSuccess(ExportResult result) {
+    public void onCryptoOperationSuccess(UploadResult result) {
         result.createNotify(this).show();
     }
 
@@ -140,7 +141,7 @@ public class UploadKeyActivity extends BaseActivity
     }
 
     @Override
-    public void onCryptoOperationError(ExportResult result) {
+    public void onCryptoOperationError(UploadResult result) {
         result.createNotify(this).show();
     }
 
-- 
cgit v1.2.3