diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 20:16:05 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 20:16:05 +0200 |
| commit | 2cc265390c8710a4a8b250ad84df2466a705336f (patch) | |
| tree | 84c3e5cff92add330edde8f8859444ed517797d6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java | |
| parent | c2965290497e12d65d0a8412c8f29d7134a05c95 (diff) | |
| parent | 50c33ef3223c77ca8c36285ef379fd80ab2e77e8 (diff) | |
| download | open-keychain-2cc265390c8710a4a8b250ad84df2466a705336f.tar.gz open-keychain-2cc265390c8710a4a8b250ad84df2466a705336f.tar.bz2 open-keychain-2cc265390c8710a4a8b250ad84df2466a705336f.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java index b21b1375e..edc05e28d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java @@ -17,24 +17,16 @@ package org.sufficientlysecure.keychain.ui; -import android.app.Dialog; import android.app.ProgressDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Message; import android.os.Messenger; -import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentActivity; -import android.util.Log; -import android.view.ContextThemeWrapper; -import android.view.KeyEvent; -import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.OperationResults.ConsolidateResult; /** * We can not directly create a dialog on the application context. |