diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-24 06:30:47 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-27 01:21:52 +0530 |
| commit | 0012db1f6d5e7a80ea22b6f4577d70d13ec6fc96 (patch) | |
| tree | 6e5d1970a86066a93e19e075cfa8e456a41fba1f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog | |
| parent | 2f110344ed37e62320d2ff30ffad6c24315ff179 (diff) | |
| download | open-keychain-0012db1f6d5e7a80ea22b6f4577d70d13ec6fc96.tar.gz open-keychain-0012db1f6d5e7a80ea22b6f4577d70d13ec6fc96.tar.bz2 open-keychain-0012db1f6d5e7a80ea22b6f4577d70d13ec6fc96.zip | |
deleted KeychainService
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog')
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java index 9d31c8547..0797cf596 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java @@ -18,7 +18,6 @@ package org.sufficientlysecure.keychain.ui.dialog; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; @@ -38,10 +37,8 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.service.KeychainService; import org.sufficientlysecure.keychain.service.ServiceProgressHandler; import org.sufficientlysecure.keychain.service.input.DeleteKeyringParcel; -import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.util.Log; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java index 52a90b323..7eb9397a8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java @@ -34,7 +34,7 @@ import android.view.View.OnClickListener; import android.widget.Button; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.service.KeychainService; +import org.sufficientlysecure.keychain.service.KeychainNewService; /** * meant to be used @@ -181,9 +181,9 @@ public class ProgressDialogFragment extends DialogFragment { // send a cancel message. note that this message will be handled by // KeychainService.onStartCommand, which runs in this thread, // not the service one, and will not queue up a command. - Intent serviceIntent = new Intent(getActivity(), KeychainService.class); + Intent serviceIntent = new Intent(getActivity(), KeychainNewService.class); - serviceIntent.setAction(KeychainService.ACTION_CANCEL); + serviceIntent.setAction(KeychainNewService.ACTION_CANCEL); getActivity().startService(serviceIntent); // Set the progress bar accordingly |