From 16a93038dda4d51f48a32b12695b1e32e5ca7801 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 31 Aug 2014 20:12:46 +0200
Subject: remove broken(?) cancellation code

---
 .../keychain/pgp/PgpImportExport.java              | 30 ----------------------
 1 file changed, 30 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index f5b2280c9..511086489 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -52,23 +52,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class PgpImportExport {
 
-    // TODO: is this really used?
-    public interface KeychainServiceListener {
-        boolean hasServiceStopped();
-    }
-
     private Context mContext;
     private Progressable mProgressable;
     private AtomicBoolean mCancelled;
 
-    private KeychainServiceListener mKeychainServiceListener;
-
     private ProviderHelper mProviderHelper;
 
-    public PgpImportExport(Context context, Progressable progressable) {
-        this(context, new ProviderHelper(context), progressable);
-    }
-
     public PgpImportExport(Context context, ProviderHelper providerHelper, Progressable progressable) {
         super();
         this.mContext = context;
@@ -84,15 +73,6 @@ public class PgpImportExport {
         mCancelled = cancelled;
     }
 
-    public PgpImportExport(Context context,
-                           Progressable progressable, KeychainServiceListener keychainListener) {
-        super();
-        this.mContext = context;
-        this.mProgressable = progressable;
-        this.mProviderHelper = new ProviderHelper(context);
-        this.mKeychainServiceListener = keychainListener;
-    }
-
     public void updateProgress(int message, int current, int total) {
         if (mProgressable != null) {
             mProgressable.setProgress(message, current, total);
@@ -277,11 +257,6 @@ public class PgpImportExport {
                 // TODO: inform user?
             }
 
-            if (mKeychainServiceListener.hasServiceStopped()) {
-                arOutStream.close();
-                return null;
-            }
-
             arOutStream.close();
         }
 
@@ -306,11 +281,6 @@ public class PgpImportExport {
                 // TODO: inform user?
             }
 
-            if (mKeychainServiceListener.hasServiceStopped()) {
-                arOutStream.close();
-                return null;
-            }
-
             arOutStream.close();
         }
 
-- 
cgit v1.2.3