From 58b8479612f497a7d561260569226f640f4b912b Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 19 May 2010 18:17:06 +0000 Subject: [PATCH] Code refactoring: - Created "controller" and "mail.filter" package - Moved a lot of classes to new/other packages - Removed unused classes: NoSuchProviderException, MessageDateComparator --- src/com/fsck/k9/Account.java | 1 + src/com/fsck/k9/K9.java | 2 ++ src/com/fsck/k9/activity/Accounts.java | 2 ++ src/com/fsck/k9/activity/ActivityListener.java | 2 +- src/com/fsck/k9/activity/ChooseFolder.java | 2 ++ src/com/fsck/k9/activity/ChooseIdentity.java | 1 - .../k9/{ => activity}/ColorPickerDialog.java | 4 +++- src/com/fsck/k9/activity/EditIdentity.java | 1 - src/com/fsck/k9/activity/FolderList.java | 2 ++ src/com/fsck/k9/{ => activity}/K9Activity.java | 4 ++-- .../fsck/k9/{ => activity}/K9ListActivity.java | 4 ++-- .../k9/{ => activity}/K9PreferenceActivity.java | 3 ++- src/com/fsck/k9/activity/MessageCompose.java | 3 +++ src/com/fsck/k9/activity/MessageList.java | 5 ++++- src/com/fsck/k9/activity/MessageView.java | 2 ++ .../fsck/k9/activity/setup/AccountSettings.java | 3 ++- .../activity/setup/AccountSetupAccountType.java | 2 +- .../k9/activity/setup/AccountSetupBasics.java | 2 ++ .../setup/AccountSetupCheckSettings.java | 2 ++ .../activity/setup/AccountSetupComposition.java | 2 +- .../k9/activity/setup/AccountSetupIncoming.java | 2 ++ .../k9/activity/setup/AccountSetupNames.java | 2 ++ .../k9/activity/setup/AccountSetupOptions.java | 1 + .../k9/activity/setup/AccountSetupOutgoing.java | 2 ++ .../fsck/k9/activity/setup/FolderSettings.java | 1 + .../k9/activity/setup/FontSizeSettings.java | 1 + src/com/fsck/k9/activity/setup/Prefs.java | 2 +- .../MessageDateComparator.java | 3 ++- .../MessageRemovalListener.java | 4 +++- .../MessageRetrievalListener.java | 4 +++- .../{ => controller}/MessagingController.java | 15 ++++++++++++--- .../MessagingControllerPushReceiver.java | 4 +++- .../k9/{ => controller}/MessagingListener.java | 5 ++++- src/com/fsck/k9/{ => helper}/Utility.java | 4 ++-- src/com/fsck/k9/mail/Address.java | 2 +- src/com/fsck/k9/mail/Folder.java | 1 + .../fsck/k9/mail/NoSuchProviderException.java | 17 ----------------- .../{codec/binary => mail/filter}/Base64.java | 2 +- .../filter}/Base64OutputStream.java | 2 +- .../CountingOutputStream.java | 2 +- .../EOLConvertingOutputStream.java | 2 +- .../filter}/FixedLengthInputStream.java | 2 +- .../LineWrapOutputStream.java | 2 +- .../{ => mail/filter}/PeekableInputStream.java | 2 +- .../{transport => filter}/SmtpDataStuffing.java | 2 +- .../StatusOutputStream.java | 2 +- .../k9/mail/internet/BinaryTempFileBody.java | 2 +- src/com/fsck/k9/mail/internet/MimeHeader.java | 2 +- .../fsck/k9/mail/store/ImapResponseParser.java | 4 ++-- src/com/fsck/k9/mail/store/ImapStore.java | 11 ++++++----- src/com/fsck/k9/mail/store/LocalStore.java | 6 ++++-- src/com/fsck/k9/mail/store/Pop3Store.java | 3 ++- src/com/fsck/k9/mail/store/WebDavStore.java | 5 +++-- .../fsck/k9/mail/transport/SmtpTransport.java | 7 +++++-- .../fsck/k9/mail/transport/WebDavTransport.java | 2 +- src/com/fsck/k9/preferences/Storage.java | 2 +- src/com/fsck/k9/service/MailService.java | 2 +- src/com/fsck/k9/service/PollService.java | 2 ++ 58 files changed, 115 insertions(+), 70 deletions(-) rename src/com/fsck/k9/{ => activity}/ColorPickerDialog.java (99%) rename src/com/fsck/k9/{ => activity}/K9Activity.java (98%) rename src/com/fsck/k9/{ => activity}/K9ListActivity.java (92%) rename src/com/fsck/k9/{ => activity}/K9PreferenceActivity.java (83%) rename src/com/fsck/k9/{mail => controller}/MessageDateComparator.java (89%) rename src/com/fsck/k9/{mail => controller}/MessageRemovalListener.java (58%) rename src/com/fsck/k9/{mail => controller}/MessageRetrievalListener.java (78%) rename src/com/fsck/k9/{ => controller}/MessagingController.java (99%) rename src/com/fsck/k9/{ => controller}/MessagingControllerPushReceiver.java (98%) rename src/com/fsck/k9/{ => controller}/MessagingListener.java (97%) rename src/com/fsck/k9/{ => helper}/Utility.java (98%) delete mode 100644 src/com/fsck/k9/mail/NoSuchProviderException.java rename src/com/fsck/k9/{codec/binary => mail/filter}/Base64.java (99%) rename src/com/fsck/k9/{codec/binary => mail/filter}/Base64OutputStream.java (99%) rename src/com/fsck/k9/mail/{transport => filter}/CountingOutputStream.java (93%) rename src/com/fsck/k9/mail/{transport => filter}/EOLConvertingOutputStream.java (96%) rename src/com/fsck/k9/{ => mail/filter}/FixedLengthInputStream.java (98%) rename src/com/fsck/k9/mail/{transport => filter}/LineWrapOutputStream.java (98%) rename src/com/fsck/k9/{ => mail/filter}/PeekableInputStream.java (98%) rename src/com/fsck/k9/mail/{transport => filter}/SmtpDataStuffing.java (96%) rename src/com/fsck/k9/mail/{transport => filter}/StatusOutputStream.java (94%) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index 61b8ffa04..cd4bde32a 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -7,6 +7,7 @@ import android.net.ConnectivityManager; import android.net.Uri; import android.util.Log; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.MessagingException; diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index 8cd0bfe86..2e8aaccb0 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -14,6 +14,8 @@ import android.util.Log; import android.webkit.WebSettings; import com.fsck.k9.activity.MessageCompose; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java index 979322be5..553c82ea3 100644 --- a/src/com/fsck/k9/activity/Accounts.java +++ b/src/com/fsck/k9/activity/Accounts.java @@ -23,6 +23,8 @@ import com.fsck.k9.*; import com.fsck.k9.activity.setup.AccountSettings; import com.fsck.k9.activity.setup.AccountSetupBasics; import com.fsck.k9.activity.setup.Prefs; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.mail.Flag; import java.util.ArrayList; diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java index e60e13784..8f4bb0c22 100644 --- a/src/com/fsck/k9/activity/ActivityListener.java +++ b/src/com/fsck/k9/activity/ActivityListener.java @@ -6,8 +6,8 @@ import android.content.Context; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.MessagingListener; import com.fsck.k9.R; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.service.MailService; public class ActivityListener extends MessagingListener diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java index e59a6d130..a418211a7 100644 --- a/src/com/fsck/k9/activity/ChooseFolder.java +++ b/src/com/fsck/k9/activity/ChooseFolder.java @@ -12,6 +12,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; import com.fsck.k9.*; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.MessagingException; import java.util.ArrayList; diff --git a/src/com/fsck/k9/activity/ChooseIdentity.java b/src/com/fsck/k9/activity/ChooseIdentity.java index 95f43248e..5cf370a77 100644 --- a/src/com/fsck/k9/activity/ChooseIdentity.java +++ b/src/com/fsck/k9/activity/ChooseIdentity.java @@ -12,7 +12,6 @@ import android.widget.ListView; import android.widget.Toast; import com.fsck.k9.Account; import com.fsck.k9.Identity; -import com.fsck.k9.K9ListActivity; import com.fsck.k9.Preferences; import com.fsck.k9.R; import java.util.List; diff --git a/src/com/fsck/k9/ColorPickerDialog.java b/src/com/fsck/k9/activity/ColorPickerDialog.java similarity index 99% rename from src/com/fsck/k9/ColorPickerDialog.java rename to src/com/fsck/k9/activity/ColorPickerDialog.java index 43bc6e01c..67bb4a4a0 100644 --- a/src/com/fsck/k9/ColorPickerDialog.java +++ b/src/com/fsck/k9/activity/ColorPickerDialog.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package com.fsck.k9; +package com.fsck.k9.activity; +import com.fsck.k9.R; +import com.fsck.k9.R.string; import android.os.Bundle; import android.app.Dialog; diff --git a/src/com/fsck/k9/activity/EditIdentity.java b/src/com/fsck/k9/activity/EditIdentity.java index e8d1cc6d0..b3e85eccf 100644 --- a/src/com/fsck/k9/activity/EditIdentity.java +++ b/src/com/fsck/k9/activity/EditIdentity.java @@ -9,7 +9,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import com.fsck.k9.Account; import com.fsck.k9.Identity; -import com.fsck.k9.K9Activity; import com.fsck.k9.Preferences; import com.fsck.k9.R; import java.util.List; diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java index b4c60b5fa..e7e9013d1 100644 --- a/src/com/fsck/k9/activity/FolderList.java +++ b/src/com/fsck/k9/activity/FolderList.java @@ -23,6 +23,8 @@ import com.fsck.k9.*; import com.fsck.k9.Account.FolderMode; import com.fsck.k9.activity.setup.AccountSettings; import com.fsck.k9.activity.setup.FolderSettings; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Flag; diff --git a/src/com/fsck/k9/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java similarity index 98% rename from src/com/fsck/k9/K9Activity.java rename to src/com/fsck/k9/activity/K9Activity.java index 1fbec28d1..eca300dee 100644 --- a/src/com/fsck/k9/K9Activity.java +++ b/src/com/fsck/k9/activity/K9Activity.java @@ -1,4 +1,4 @@ -package com.fsck.k9; +package com.fsck.k9.activity; import android.app.Activity; @@ -9,7 +9,7 @@ import android.view.View; import android.view.GestureDetector.SimpleOnGestureListener; import android.widget.ScrollView; -import com.fsck.k9.activity.DateFormatter; +import com.fsck.k9.K9; public class K9Activity extends Activity diff --git a/src/com/fsck/k9/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java similarity index 92% rename from src/com/fsck/k9/K9ListActivity.java rename to src/com/fsck/k9/activity/K9ListActivity.java index 2ca59cead..e5ca27ee0 100644 --- a/src/com/fsck/k9/K9ListActivity.java +++ b/src/com/fsck/k9/activity/K9ListActivity.java @@ -1,8 +1,8 @@ -package com.fsck.k9; +package com.fsck.k9.activity; import android.app.ListActivity; import android.os.Bundle; -import com.fsck.k9.activity.DateFormatter; +import com.fsck.k9.K9; public class K9ListActivity extends ListActivity diff --git a/src/com/fsck/k9/K9PreferenceActivity.java b/src/com/fsck/k9/activity/K9PreferenceActivity.java similarity index 83% rename from src/com/fsck/k9/K9PreferenceActivity.java rename to src/com/fsck/k9/activity/K9PreferenceActivity.java index f247e8d5d..b90903777 100644 --- a/src/com/fsck/k9/K9PreferenceActivity.java +++ b/src/com/fsck/k9/activity/K9PreferenceActivity.java @@ -1,5 +1,6 @@ -package com.fsck.k9; +package com.fsck.k9.activity; +import com.fsck.k9.K9; import android.os.Bundle; import android.preference.PreferenceActivity; diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 44deddc47..39c34828a 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -23,6 +23,9 @@ import android.view.Window; import android.widget.AutoCompleteTextView.Validator; import android.widget.*; import com.fsck.k9.*; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.internet.*; diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 3c8a53db6..7922330a4 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -23,10 +23,13 @@ import android.widget.*; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.CompoundButton.OnCheckedChangeListener; import com.fsck.k9.*; -import com.fsck.k9.MessagingController.SORT_TYPE; import com.fsck.k9.activity.setup.Prefs; import com.fsck.k9.activity.setup.AccountSettings; import com.fsck.k9.activity.setup.FolderSettings; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; +import com.fsck.k9.controller.MessagingController.SORT_TYPE; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.store.LocalStore; diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 023209c57..e7649246b 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -26,6 +26,8 @@ import android.view.animation.TranslateAnimation; import android.webkit.*; import android.widget.*; import com.fsck.k9.*; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.internet.MimeUtility; diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index 22bf67440..ccadf43f4 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -12,10 +12,11 @@ import com.fsck.k9.*; import com.fsck.k9.Account.FolderMode; import com.fsck.k9.activity.ChooseFolder; import com.fsck.k9.activity.ChooseIdentity; +import com.fsck.k9.activity.ColorPickerDialog; +import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.activity.ManageIdentities; import com.fsck.k9.mail.Store; import com.fsck.k9.service.MailService; -import com.fsck.k9.ColorPickerDialog; public class AccountSettings extends K9PreferenceActivity { diff --git a/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java b/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java index 987f91091..175977c41 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java @@ -11,9 +11,9 @@ import android.widget.Button; import android.widget.Toast; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.K9Activity; import com.fsck.k9.Preferences; import com.fsck.k9.R; +import com.fsck.k9.activity.K9Activity; import java.net.URI; /** diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java index 9f4f57f20..1afdb06c9 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -21,6 +21,8 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import com.fsck.k9.*; +import com.fsck.k9.activity.K9Activity; +import com.fsck.k9.helper.Utility; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java index a891c1b2b..8e8408de8 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java @@ -15,6 +15,8 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; import com.fsck.k9.*; +import com.fsck.k9.activity.K9Activity; +import com.fsck.k9.controller.MessagingController; import com.fsck.k9.mail.AuthenticationFailedException; import com.fsck.k9.mail.CertificateValidationException; import com.fsck.k9.mail.Store; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupComposition.java b/src/com/fsck/k9/activity/setup/AccountSetupComposition.java index e5f1a9ddd..933e35999 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupComposition.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupComposition.java @@ -11,9 +11,9 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.RadioButton; import com.fsck.k9.Account; -import com.fsck.k9.K9Activity; import com.fsck.k9.Preferences; import com.fsck.k9.R; +import com.fsck.k9.activity.K9Activity; public class AccountSetupComposition extends K9Activity { diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java index cf0515464..4c8afbd8f 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java @@ -14,6 +14,8 @@ import android.widget.*; import com.fsck.k9.*; import com.fsck.k9.activity.ChooseFolder; +import com.fsck.k9.activity.K9Activity; +import com.fsck.k9.helper.Utility; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupNames.java b/src/com/fsck/k9/activity/setup/AccountSetupNames.java index af68d9edf..5791d85a7 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupNames.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupNames.java @@ -13,6 +13,8 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.EditText; import com.fsck.k9.*; +import com.fsck.k9.activity.K9Activity; +import com.fsck.k9.helper.Utility; public class AccountSetupNames extends K9Activity implements OnClickListener { diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOptions.java b/src/com/fsck/k9/activity/setup/AccountSetupOptions.java index 7fa4c014a..b8dbb9f6b 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupOptions.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupOptions.java @@ -11,6 +11,7 @@ import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.Spinner; import com.fsck.k9.*; +import com.fsck.k9.activity.K9Activity; import com.fsck.k9.mail.Store; public class AccountSetupOptions extends K9Activity implements OnClickListener diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java index cb86a8298..0aed92d60 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java @@ -14,6 +14,8 @@ import android.view.ViewGroup; import android.widget.*; import android.widget.CompoundButton.OnCheckedChangeListener; import com.fsck.k9.*; +import com.fsck.k9.activity.K9Activity; +import com.fsck.k9.helper.Utility; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/src/com/fsck/k9/activity/setup/FolderSettings.java index 9ebb6c5dc..5d5f2632c 100644 --- a/src/com/fsck/k9/activity/setup/FolderSettings.java +++ b/src/com/fsck/k9/activity/setup/FolderSettings.java @@ -10,6 +10,7 @@ import android.preference.Preference; import android.util.Log; import android.view.KeyEvent; import com.fsck.k9.*; +import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.mail.Folder.FolderClass; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Store; diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/src/com/fsck/k9/activity/setup/FontSizeSettings.java index 59042108b..12b9060da 100644 --- a/src/com/fsck/k9/activity/setup/FontSizeSettings.java +++ b/src/com/fsck/k9/activity/setup/FontSizeSettings.java @@ -9,6 +9,7 @@ import android.os.Bundle; import android.preference.*; import android.view.KeyEvent; import com.fsck.k9.*; +import com.fsck.k9.activity.K9PreferenceActivity; /** * Activity to configure the font size of the information displayed in the diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index 25949e7f5..834e0fe3a 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -10,10 +10,10 @@ import android.preference.ListPreference; import android.preference.Preference; import android.view.KeyEvent; import com.fsck.k9.K9; -import com.fsck.k9.K9PreferenceActivity; import com.fsck.k9.Preferences; import com.fsck.k9.R; import com.fsck.k9.activity.DateFormatter; +import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.service.MailService; public class Prefs extends K9PreferenceActivity diff --git a/src/com/fsck/k9/mail/MessageDateComparator.java b/src/com/fsck/k9/controller/MessageDateComparator.java similarity index 89% rename from src/com/fsck/k9/mail/MessageDateComparator.java rename to src/com/fsck/k9/controller/MessageDateComparator.java index c6adcc25b..6b652bfea 100644 --- a/src/com/fsck/k9/mail/MessageDateComparator.java +++ b/src/com/fsck/k9/controller/MessageDateComparator.java @@ -1,7 +1,8 @@ -package com.fsck.k9.mail; +package com.fsck.k9.controller; import java.util.Comparator; +import com.fsck.k9.mail.Message; public class MessageDateComparator implements Comparator { diff --git a/src/com/fsck/k9/mail/MessageRemovalListener.java b/src/com/fsck/k9/controller/MessageRemovalListener.java similarity index 58% rename from src/com/fsck/k9/mail/MessageRemovalListener.java rename to src/com/fsck/k9/controller/MessageRemovalListener.java index 39744a605..efb018cfe 100644 --- a/src/com/fsck/k9/mail/MessageRemovalListener.java +++ b/src/com/fsck/k9/controller/MessageRemovalListener.java @@ -1,4 +1,6 @@ -package com.fsck.k9.mail; +package com.fsck.k9.controller; + +import com.fsck.k9.mail.Message; public interface MessageRemovalListener { diff --git a/src/com/fsck/k9/mail/MessageRetrievalListener.java b/src/com/fsck/k9/controller/MessageRetrievalListener.java similarity index 78% rename from src/com/fsck/k9/mail/MessageRetrievalListener.java rename to src/com/fsck/k9/controller/MessageRetrievalListener.java index 1dd332398..2b75f54f7 100644 --- a/src/com/fsck/k9/mail/MessageRetrievalListener.java +++ b/src/com/fsck/k9/controller/MessageRetrievalListener.java @@ -1,5 +1,7 @@ -package com.fsck.k9.mail; +package com.fsck.k9.controller; + +import com.fsck.k9.mail.Message; public interface MessageRetrievalListener { diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java similarity index 99% rename from src/com/fsck/k9/MessagingController.java rename to src/com/fsck/k9/controller/MessagingController.java index ce565ecfe..f21e3d864 100644 --- a/src/com/fsck/k9/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -1,5 +1,5 @@ -package com.fsck.k9; +package com.fsck.k9.controller; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -37,8 +37,19 @@ import android.os.PowerManager.WakeLock; import android.text.TextUtils; import android.util.Log; +import com.fsck.k9.Account; +import com.fsck.k9.AccountStats; +import com.fsck.k9.K9; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.SearchSpecification; +import com.fsck.k9.Account.FolderMode; +import com.fsck.k9.Account.Searchable; +import com.fsck.k9.R.drawable; +import com.fsck.k9.R.string; import com.fsck.k9.activity.FolderList; import com.fsck.k9.activity.MessageList; +import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Address; @@ -46,8 +57,6 @@ import com.fsck.k9.mail.FetchProfile; import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; -import com.fsck.k9.mail.MessageRemovalListener; -import com.fsck.k9.mail.MessageRetrievalListener; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.PushReceiver; diff --git a/src/com/fsck/k9/MessagingControllerPushReceiver.java b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java similarity index 98% rename from src/com/fsck/k9/MessagingControllerPushReceiver.java rename to src/com/fsck/k9/controller/MessagingControllerPushReceiver.java index a2eb831de..d361e2fe2 100644 --- a/src/com/fsck/k9/MessagingControllerPushReceiver.java +++ b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java @@ -1,4 +1,4 @@ -package com.fsck.k9; +package com.fsck.k9.controller; import android.app.Application; import android.content.Context; @@ -6,6 +6,8 @@ import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.util.Log; +import com.fsck.k9.Account; +import com.fsck.k9.K9; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Folder; diff --git a/src/com/fsck/k9/MessagingListener.java b/src/com/fsck/k9/controller/MessagingListener.java similarity index 97% rename from src/com/fsck/k9/MessagingListener.java rename to src/com/fsck/k9/controller/MessagingListener.java index c3f01c4d1..5d1d8c627 100644 --- a/src/com/fsck/k9/MessagingListener.java +++ b/src/com/fsck/k9/controller/MessagingListener.java @@ -1,7 +1,10 @@ -package com.fsck.k9; +package com.fsck.k9.controller; import android.content.Context; +import com.fsck.k9.Account; +import com.fsck.k9.AccountStats; +import com.fsck.k9.BaseAccount; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Part; diff --git a/src/com/fsck/k9/Utility.java b/src/com/fsck/k9/helper/Utility.java similarity index 98% rename from src/com/fsck/k9/Utility.java rename to src/com/fsck/k9/helper/Utility.java index 8010216fd..b4f815cbf 100644 --- a/src/com/fsck/k9/Utility.java +++ b/src/com/fsck/k9/helper/Utility.java @@ -1,10 +1,10 @@ -package com.fsck.k9; +package com.fsck.k9.helper; import android.text.Editable; import android.widget.EditText; import android.widget.TextView; -import com.fsck.k9.codec.binary.Base64; +import com.fsck.k9.mail.filter.Base64; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java index 245c22ebb..54455f1ce 100644 --- a/src/com/fsck/k9/mail/Address.java +++ b/src/com/fsck/k9/mail/Address.java @@ -5,7 +5,7 @@ import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.Utility; +import com.fsck.k9.helper.Utility; import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.field.address.AddressList; import org.apache.james.mime4j.field.address.Mailbox; diff --git a/src/com/fsck/k9/mail/Folder.java b/src/com/fsck/k9/mail/Folder.java index 83d185cf9..c707cd8f4 100644 --- a/src/com/fsck/k9/mail/Folder.java +++ b/src/com/fsck/k9/mail/Folder.java @@ -2,6 +2,7 @@ package com.fsck.k9.mail; import com.fsck.k9.Account; import com.fsck.k9.Preferences; +import com.fsck.k9.controller.MessageRetrievalListener; public abstract class Folder diff --git a/src/com/fsck/k9/mail/NoSuchProviderException.java b/src/com/fsck/k9/mail/NoSuchProviderException.java deleted file mode 100644 index 54f0c7ef7..000000000 --- a/src/com/fsck/k9/mail/NoSuchProviderException.java +++ /dev/null @@ -1,17 +0,0 @@ - -package com.fsck.k9.mail; - -public class NoSuchProviderException extends MessagingException -{ - public static final long serialVersionUID = -1; - - public NoSuchProviderException(String message) - { - super(message); - } - - public NoSuchProviderException(String message, Throwable throwable) - { - super(message, throwable); - } -} diff --git a/src/com/fsck/k9/codec/binary/Base64.java b/src/com/fsck/k9/mail/filter/Base64.java similarity index 99% rename from src/com/fsck/k9/codec/binary/Base64.java rename to src/com/fsck/k9/mail/filter/Base64.java index d90d59c3d..a88742cfb 100644 --- a/src/com/fsck/k9/codec/binary/Base64.java +++ b/src/com/fsck/k9/mail/filter/Base64.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.fsck.k9.codec.binary; +package com.fsck.k9.mail.filter; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; diff --git a/src/com/fsck/k9/codec/binary/Base64OutputStream.java b/src/com/fsck/k9/mail/filter/Base64OutputStream.java similarity index 99% rename from src/com/fsck/k9/codec/binary/Base64OutputStream.java rename to src/com/fsck/k9/mail/filter/Base64OutputStream.java index 5841099b2..34007d168 100644 --- a/src/com/fsck/k9/codec/binary/Base64OutputStream.java +++ b/src/com/fsck/k9/mail/filter/Base64OutputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.fsck.k9.codec.binary; +package com.fsck.k9.mail.filter; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/src/com/fsck/k9/mail/transport/CountingOutputStream.java b/src/com/fsck/k9/mail/filter/CountingOutputStream.java similarity index 93% rename from src/com/fsck/k9/mail/transport/CountingOutputStream.java rename to src/com/fsck/k9/mail/filter/CountingOutputStream.java index c81d3be7d..4b6df027d 100644 --- a/src/com/fsck/k9/mail/transport/CountingOutputStream.java +++ b/src/com/fsck/k9/mail/filter/CountingOutputStream.java @@ -1,4 +1,4 @@ -package com.fsck.k9.mail.transport; +package com.fsck.k9.mail.filter; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java b/src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java similarity index 96% rename from src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java rename to src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java index 1fba2c245..dc6733ca7 100644 --- a/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java +++ b/src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java @@ -1,4 +1,4 @@ -package com.fsck.k9.mail.transport; +package com.fsck.k9.mail.filter; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/src/com/fsck/k9/FixedLengthInputStream.java b/src/com/fsck/k9/mail/filter/FixedLengthInputStream.java similarity index 98% rename from src/com/fsck/k9/FixedLengthInputStream.java rename to src/com/fsck/k9/mail/filter/FixedLengthInputStream.java index c53189251..9c5c0db40 100644 --- a/src/com/fsck/k9/FixedLengthInputStream.java +++ b/src/com/fsck/k9/mail/filter/FixedLengthInputStream.java @@ -1,5 +1,5 @@ -package com.fsck.k9; +package com.fsck.k9.mail.filter; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/mail/transport/LineWrapOutputStream.java b/src/com/fsck/k9/mail/filter/LineWrapOutputStream.java similarity index 98% rename from src/com/fsck/k9/mail/transport/LineWrapOutputStream.java rename to src/com/fsck/k9/mail/filter/LineWrapOutputStream.java index 83e94caab..f4a59ebbd 100644 --- a/src/com/fsck/k9/mail/transport/LineWrapOutputStream.java +++ b/src/com/fsck/k9/mail/filter/LineWrapOutputStream.java @@ -1,4 +1,4 @@ -package com.fsck.k9.mail.transport; +package com.fsck.k9.mail.filter; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/src/com/fsck/k9/PeekableInputStream.java b/src/com/fsck/k9/mail/filter/PeekableInputStream.java similarity index 98% rename from src/com/fsck/k9/PeekableInputStream.java rename to src/com/fsck/k9/mail/filter/PeekableInputStream.java index cbb979a07..479b42a28 100644 --- a/src/com/fsck/k9/PeekableInputStream.java +++ b/src/com/fsck/k9/mail/filter/PeekableInputStream.java @@ -1,5 +1,5 @@ -package com.fsck.k9; +package com.fsck.k9.mail.filter; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/mail/transport/SmtpDataStuffing.java b/src/com/fsck/k9/mail/filter/SmtpDataStuffing.java similarity index 96% rename from src/com/fsck/k9/mail/transport/SmtpDataStuffing.java rename to src/com/fsck/k9/mail/filter/SmtpDataStuffing.java index 1495f5b1a..c212082a8 100644 --- a/src/com/fsck/k9/mail/transport/SmtpDataStuffing.java +++ b/src/com/fsck/k9/mail/filter/SmtpDataStuffing.java @@ -1,4 +1,4 @@ -package com.fsck.k9.mail.transport; +package com.fsck.k9.mail.filter; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/src/com/fsck/k9/mail/transport/StatusOutputStream.java b/src/com/fsck/k9/mail/filter/StatusOutputStream.java similarity index 94% rename from src/com/fsck/k9/mail/transport/StatusOutputStream.java rename to src/com/fsck/k9/mail/filter/StatusOutputStream.java index 7e384eecc..a3c95f118 100644 --- a/src/com/fsck/k9/mail/transport/StatusOutputStream.java +++ b/src/com/fsck/k9/mail/filter/StatusOutputStream.java @@ -1,4 +1,4 @@ -package com.fsck.k9.mail.transport; +package com.fsck.k9.mail.filter; import android.util.Config; import android.util.Log; diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java index e2c52bc58..cbef03092 100644 --- a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java +++ b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java @@ -1,8 +1,8 @@ package com.fsck.k9.mail.internet; -import com.fsck.k9.codec.binary.Base64OutputStream; import com.fsck.k9.mail.Body; import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.filter.Base64OutputStream; import org.apache.commons.io.IOUtils; import java.io.*; diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java index 8537f66fc..0fdbff0f1 100644 --- a/src/com/fsck/k9/mail/internet/MimeHeader.java +++ b/src/com/fsck/k9/mail/internet/MimeHeader.java @@ -1,7 +1,7 @@ package com.fsck.k9.mail.internet; -import com.fsck.k9.Utility; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.MessagingException; import org.apache.james.mime4j.codec.EncoderUtil; diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java index 91f0a68c5..9fe7f967a 100644 --- a/src/com/fsck/k9/mail/store/ImapResponseParser.java +++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java @@ -2,9 +2,9 @@ package com.fsck.k9.mail.store; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.FixedLengthInputStream; -import com.fsck.k9.PeekableInputStream; import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.filter.FixedLengthInputStream; +import com.fsck.k9.mail.filter.PeekableInputStream; import java.io.IOException; import java.io.InputStream; import java.text.ParseException; diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java index fef5d88ac..2f9a64eb5 100644 --- a/src/com/fsck/k9/mail/store/ImapStore.java +++ b/src/com/fsck/k9/mail/store/ImapStore.java @@ -7,18 +7,19 @@ import android.net.NetworkInfo; import android.os.PowerManager; import android.util.Log; import com.fsck.k9.Account; -import com.fsck.k9.FixedLengthInputStream; import com.fsck.k9.K9; -import com.fsck.k9.PeekableInputStream; -import com.fsck.k9.Utility; +import com.fsck.k9.controller.MessageRetrievalListener; +import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.*; +import com.fsck.k9.mail.filter.CountingOutputStream; +import com.fsck.k9.mail.filter.EOLConvertingOutputStream; +import com.fsck.k9.mail.filter.FixedLengthInputStream; +import com.fsck.k9.mail.filter.PeekableInputStream; import com.fsck.k9.mail.internet.*; import com.fsck.k9.mail.store.ImapResponseParser.ImapList; import com.fsck.k9.mail.store.ImapResponseParser.ImapResponse; -import com.fsck.k9.mail.transport.CountingOutputStream; -import com.fsck.k9.mail.transport.EOLConvertingOutputStream; import com.jcraft.jzlib.JZlib; import com.jcraft.jzlib.ZInputStream; import com.jcraft.jzlib.ZOutputStream; diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index 58f95043a..144c704f8 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -13,10 +13,12 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.Preferences; -import com.fsck.k9.Utility; -import com.fsck.k9.codec.binary.Base64OutputStream; +import com.fsck.k9.controller.MessageRemovalListener; +import com.fsck.k9.controller.MessageRetrievalListener; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.filter.Base64OutputStream; import com.fsck.k9.mail.internet.*; import com.fsck.k9.provider.AttachmentProvider; import org.apache.commons.io.IOUtils; diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java index 91391d916..c7cc3c0db 100644 --- a/src/com/fsck/k9/mail/store/Pop3Store.java +++ b/src/com/fsck/k9/mail/store/Pop3Store.java @@ -6,7 +6,8 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.Utility; +import com.fsck.k9.controller.MessageRetrievalListener; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Folder.OpenMode; import com.fsck.k9.mail.internet.MimeMessage; diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index 849bc0c27..fe7b47bae 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -4,11 +4,12 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.Utility; +import com.fsck.k9.controller.MessageRetrievalListener; +import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Folder.OpenMode; +import com.fsck.k9.mail.filter.EOLConvertingOutputStream; import com.fsck.k9.mail.internet.MimeMessage; -import com.fsck.k9.mail.transport.EOLConvertingOutputStream; import com.fsck.k9.mail.transport.TrustedSocketFactory; import org.apache.http.*; import org.apache.http.auth.AuthScope; diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java index 6c912aee8..9642e7fa8 100644 --- a/src/com/fsck/k9/mail/transport/SmtpTransport.java +++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java @@ -3,10 +3,13 @@ package com.fsck.k9.mail.transport; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.PeekableInputStream; -import com.fsck.k9.codec.binary.Base64; import com.fsck.k9.mail.*; import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.filter.Base64; +import com.fsck.k9.mail.filter.EOLConvertingOutputStream; +import com.fsck.k9.mail.filter.LineWrapOutputStream; +import com.fsck.k9.mail.filter.PeekableInputStream; +import com.fsck.k9.mail.filter.SmtpDataStuffing; import com.fsck.k9.mail.store.TrustManagerFactory; import javax.net.ssl.SSLContext; diff --git a/src/com/fsck/k9/mail/transport/WebDavTransport.java b/src/com/fsck/k9/mail/transport/WebDavTransport.java index 282dcc412..0d78ab353 100644 --- a/src/com/fsck/k9/mail/transport/WebDavTransport.java +++ b/src/com/fsck/k9/mail/transport/WebDavTransport.java @@ -5,10 +5,10 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.PeekableInputStream; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Transport; +import com.fsck.k9.mail.filter.PeekableInputStream; import com.fsck.k9.mail.store.WebDavStore; import java.io.OutputStream; diff --git a/src/com/fsck/k9/preferences/Storage.java b/src/com/fsck/k9/preferences/Storage.java index e41dafbd4..057df302f 100644 --- a/src/com/fsck/k9/preferences/Storage.java +++ b/src/com/fsck/k9/preferences/Storage.java @@ -8,7 +8,7 @@ import android.database.sqlite.SQLiteDatabase; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.Utility; +import com.fsck.k9.helper.Utility; import java.net.URI; import java.net.URLEncoder; diff --git a/src/com/fsck/k9/service/MailService.java b/src/com/fsck/k9/service/MailService.java index a2469aa3a..e4828c26f 100644 --- a/src/com/fsck/k9/service/MailService.java +++ b/src/com/fsck/k9/service/MailService.java @@ -18,10 +18,10 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; -import com.fsck.k9.MessagingController; import com.fsck.k9.Preferences; import com.fsck.k9.R; import com.fsck.k9.Account.FolderMode; +import com.fsck.k9.controller.MessagingController; import com.fsck.k9.helper.AutoSyncHelper; import com.fsck.k9.mail.Pusher; diff --git a/src/com/fsck/k9/service/PollService.java b/src/com/fsck/k9/service/PollService.java index 9501c443c..a5c128724 100644 --- a/src/com/fsck/k9/service/PollService.java +++ b/src/com/fsck/k9/service/PollService.java @@ -7,6 +7,8 @@ import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.util.Log; import com.fsck.k9.*; +import com.fsck.k9.controller.MessagingController; +import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;