diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 751e1d2ca..04407e3b6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -77,8 +77,7 @@ import java.util.ArrayList; public class KeyListFragment extends RecyclerFragment implements SearchView.OnQueryTextListener, - LoaderManager.LoaderCallbacks, FabContainer, - CryptoOperationHelper.Callback { + LoaderManager.LoaderCallbacks, FabContainer { static final int REQUEST_ACTION = 1; private static final int REQUEST_DELETE = 2; @@ -515,7 +514,35 @@ public class KeyListFragment extends RecyclerFragment // search config mKeyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver(); - mImportOpHelper = new CryptoOperationHelper<>(1, this, this, R.string.progress_updating); + CryptoOperationHelper.Callback callback + = new CryptoOperationHelper.Callback() { + + @Override + public ImportKeyringParcel createOperationInput() { + return new ImportKeyringParcel(mKeyList, mKeyserver); + } + + @Override + public void onCryptoOperationSuccess(ImportKeyResult result) { + result.createNotify(getActivity()).show(); + } + + @Override + public void onCryptoOperationCancelled() { + } + + @Override + public void onCryptoOperationError(ImportKeyResult result) { + result.createNotify(getActivity()).show(); + } + + @Override + public boolean onCryptoSetProgress(String msg, int progress, int max) { + return false; + } + }; + + mImportOpHelper = new CryptoOperationHelper<>(1, this, callback, R.string.progress_updating); mImportOpHelper.setProgressCancellable(true); mImportOpHelper.cryptoOperation(); } @@ -536,7 +563,6 @@ public class KeyListFragment extends RecyclerFragment @Override public void onCryptoOperationCancelled() { - } @Override @@ -570,7 +596,6 @@ public class KeyListFragment extends RecyclerFragment @Override public void onCryptoOperationCancelled() { - } @Override @@ -651,29 +676,4 @@ public class KeyListFragment extends RecyclerFragment anim.start(); } - // CryptoOperationHelper.Callback methods - @Override - public ImportKeyringParcel createOperationInput() { - return new ImportKeyringParcel(mKeyList, mKeyserver); - } - - @Override - public void onCryptoOperationSuccess(ImportKeyResult result) { - result.createNotify(getActivity()).show(); - } - - @Override - public void onCryptoOperationCancelled() { - - } - - @Override - public void onCryptoOperationError(ImportKeyResult result) { - result.createNotify(getActivity()).show(); - } - - @Override - public boolean onCryptoSetProgress(String msg, int progress, int max) { - return false; - } }