From 0d0b80f142a986b98e064acbddfad4708b01caf3 Mon Sep 17 00:00:00 2001 From: Levrifon Date: Mon, 16 Feb 2015 16:11:38 +0100 Subject: [PATCH] Added placeholder for application ID --- k9mail/src/main/AndroidManifest.xml | 38 ++++++++--------- k9mail/src/main/java/com/fsck/k9/K9.java | 26 ++++++------ .../com/fsck/k9/activity/ChooseFolder.java | 17 ++++---- .../com/fsck/k9/activity/ChooseIdentity.java | 5 ++- .../com/fsck/k9/activity/EditIdentity.java | 7 ++-- .../fsck/k9/activity/ManageIdentities.java | 3 +- .../com/fsck/k9/activity/MessageCompose.java | 41 ++++++++++--------- .../com/fsck/k9/activity/MessageList.java | 5 ++- .../k9/activity/setup/AccountSetupBasics.java | 7 ++-- .../k9/activity/setup/FolderSettings.java | 4 +- .../k9/controller/MessagingController.java | 19 +++++---- .../com/fsck/k9/provider/EmailProvider.java | 3 +- .../com/fsck/k9/provider/MessageProvider.java | 3 +- .../k9/remotecontrol/K9RemoteControl.java | 32 ++++++++------- .../com/fsck/k9/service/BootReceiver.java | 11 ++--- .../com/fsck/k9/service/CoreReceiver.java | 5 ++- .../java/com/fsck/k9/service/CoreService.java | 4 +- .../k9/service/DatabaseUpgradeService.java | 3 +- .../java/com/fsck/k9/service/MailService.java | 23 ++++++----- .../k9/service/NotificationActionService.java | 9 ++-- .../java/com/fsck/k9/service/PollService.java | 4 +- .../java/com/fsck/k9/service/PushService.java | 6 ++- .../fsck/k9/service/RemoteControlService.java | 11 ++--- .../com/fsck/k9/service/SleepService.java | 8 ++-- 24 files changed, 159 insertions(+), 135 deletions(-) diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml index 16ce08390..5867dc199 100644 --- a/k9mail/src/main/AndroidManifest.xml +++ b/k9mail/src/main/AndroidManifest.xml @@ -29,36 +29,36 @@ - + - + - + - + + android:taskAffinity="${applicationId}.activity.setup.Prefs"/> + android:permission="${applicationId}.permission.REMOTE_CONTROL"> - + - + @@ -383,7 +383,7 @@ + android:permission="${applicationId}.permission.REMOTE_CONTROL"/> + android:readPermission="${applicationId}.permission.READ_ATTACHMENT"/> + android:readPermission="${applicationId}.permission.READ_MESSAGES" + android:writePermission="${applicationId}.permission.DELETE_MESSAGES"/> diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java index 7789e6608..c4b51b4f3 100644 --- a/k9mail/src/main/java/com/fsck/k9/K9.java +++ b/k9mail/src/main/java/com/fsck/k9/K9.java @@ -339,18 +339,18 @@ public class K9 extends Application { public static class Intents { public static class EmailReceived { - public static final String ACTION_EMAIL_RECEIVED = "com.fsck.k9.intent.action.EMAIL_RECEIVED"; - public static final String ACTION_EMAIL_DELETED = "com.fsck.k9.intent.action.EMAIL_DELETED"; - public static final String ACTION_REFRESH_OBSERVER = "com.fsck.k9.intent.action.REFRESH_OBSERVER"; - public static final String EXTRA_ACCOUNT = "com.fsck.k9.intent.extra.ACCOUNT"; - public static final String EXTRA_FOLDER = "com.fsck.k9.intent.extra.FOLDER"; - public static final String EXTRA_SENT_DATE = "com.fsck.k9.intent.extra.SENT_DATE"; - public static final String EXTRA_FROM = "com.fsck.k9.intent.extra.FROM"; - public static final String EXTRA_TO = "com.fsck.k9.intent.extra.TO"; - public static final String EXTRA_CC = "com.fsck.k9.intent.extra.CC"; - public static final String EXTRA_BCC = "com.fsck.k9.intent.extra.BCC"; - public static final String EXTRA_SUBJECT = "com.fsck.k9.intent.extra.SUBJECT"; - public static final String EXTRA_FROM_SELF = "com.fsck.k9.intent.extra.FROM_SELF"; + public static final String ACTION_EMAIL_RECEIVED = BuildConfig.APPLICATION_ID + ".intent.action.EMAIL_RECEIVED"; + public static final String ACTION_EMAIL_DELETED = BuildConfig.APPLICATION_ID + ".intent.action.EMAIL_DELETED"; + public static final String ACTION_REFRESH_OBSERVER = BuildConfig.APPLICATION_ID + ".intent.action.REFRESH_OBSERVER"; + public static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".intent.extra.ACCOUNT"; + public static final String EXTRA_FOLDER = BuildConfig.APPLICATION_ID + ".intent.extra.FOLDER"; + public static final String EXTRA_SENT_DATE = BuildConfig.APPLICATION_ID + ".intent.extra.SENT_DATE"; + public static final String EXTRA_FROM = BuildConfig.APPLICATION_ID + ".intent.extra.FROM"; + public static final String EXTRA_TO = BuildConfig.APPLICATION_ID + ".intent.extra.TO"; + public static final String EXTRA_CC = BuildConfig.APPLICATION_ID + ".intent.extra.CC"; + public static final String EXTRA_BCC = BuildConfig.APPLICATION_ID + ".intent.extra.BCC"; + public static final String EXTRA_SUBJECT = BuildConfig.APPLICATION_ID + ".intent.extra.SUBJECT"; + public static final String EXTRA_FROM_SELF = BuildConfig.APPLICATION_ID + ".intent.extra.FROM_SELF"; } public static class Share { @@ -359,7 +359,7 @@ public class K9 extends Application { * because of different semantics (String array vs. string with comma separated * email addresses) */ - public static final String EXTRA_FROM = "com.fsck.k9.intent.extra.SENDER"; + public static final String EXTRA_FROM = BuildConfig.APPLICATION_ID + ".intent.extra.SENDER"; } } diff --git a/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java b/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java index 08f25ac6f..030feee9e 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java @@ -22,6 +22,7 @@ import android.widget.TextView; import com.fsck.k9.Account; import com.fsck.k9.Account.FolderMode; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.R; @@ -31,14 +32,14 @@ import com.fsck.k9.mail.Folder; public class ChooseFolder extends K9ListActivity { - public static final String EXTRA_ACCOUNT = "com.fsck.k9.ChooseFolder_account"; - public static final String EXTRA_CUR_FOLDER = "com.fsck.k9.ChooseFolder_curfolder"; - public static final String EXTRA_SEL_FOLDER = "com.fsck.k9.ChooseFolder_selfolder"; - public static final String EXTRA_NEW_FOLDER = "com.fsck.k9.ChooseFolder_newfolder"; - public static final String EXTRA_MESSAGE = "com.fsck.k9.ChooseFolder_message"; - public static final String EXTRA_SHOW_CURRENT = "com.fsck.k9.ChooseFolder_showcurrent"; - public static final String EXTRA_SHOW_FOLDER_NONE = "com.fsck.k9.ChooseFolder_showOptionNone"; - public static final String EXTRA_SHOW_DISPLAYABLE_ONLY = "com.fsck.k9.ChooseFolder_showDisplayableOnly"; + public static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".ChooseFolder_account"; + public static final String EXTRA_CUR_FOLDER = BuildConfig.APPLICATION_ID + ".ChooseFolder_curfolder"; + public static final String EXTRA_SEL_FOLDER = BuildConfig.APPLICATION_ID + ".ChooseFolder_selfolder"; + public static final String EXTRA_NEW_FOLDER = BuildConfig.APPLICATION_ID + ".ChooseFolder_newfolder"; + public static final String EXTRA_MESSAGE = BuildConfig.APPLICATION_ID + ".ChooseFolder_message"; + public static final String EXTRA_SHOW_CURRENT = BuildConfig.APPLICATION_ID + ".ChooseFolder_showcurrent"; + public static final String EXTRA_SHOW_FOLDER_NONE = BuildConfig.APPLICATION_ID + ".ChooseFolder_showOptionNone"; + public static final String EXTRA_SHOW_DISPLAYABLE_ONLY = BuildConfig.APPLICATION_ID + ".ChooseFolder_showDisplayableOnly"; String mFolder; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java b/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java index 6795ea0b9..456413027 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java @@ -10,6 +10,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.Toast; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.Identity; import com.fsck.k9.Preferences; import com.fsck.k9.R; @@ -19,8 +20,8 @@ public class ChooseIdentity extends K9ListActivity { Account mAccount; ArrayAdapter adapter; - public static final String EXTRA_ACCOUNT = "com.fsck.k9.ChooseIdentity_account"; - public static final String EXTRA_IDENTITY = "com.fsck.k9.ChooseIdentity_identity"; + public static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".ChooseIdentity_account"; + public static final String EXTRA_IDENTITY = BuildConfig.APPLICATION_ID + ".ChooseIdentity_identity"; protected List identities = null; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java b/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java index bf9eeced8..8050643a2 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java @@ -7,6 +7,7 @@ import android.widget.CompoundButton; import android.widget.EditText; import android.widget.LinearLayout; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.Identity; import com.fsck.k9.Preferences; import com.fsck.k9.R; @@ -14,9 +15,9 @@ import java.util.List; public class EditIdentity extends K9Activity { - public static final String EXTRA_IDENTITY = "com.fsck.k9.EditIdentity_identity"; - public static final String EXTRA_IDENTITY_INDEX = "com.fsck.k9.EditIdentity_identity_index"; - public static final String EXTRA_ACCOUNT = "com.fsck.k9.EditIdentity_account"; + public static final String EXTRA_IDENTITY = BuildConfig.APPLICATION_ID + ".EditIdentity_identity"; + public static final String EXTRA_IDENTITY_INDEX = BuildConfig.APPLICATION_ID + ".EditIdentity_identity_index"; + public static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".EditIdentity_account"; private Account mAccount; private Identity mIdentity; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java b/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java index a808c89b4..2eb539254 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java @@ -11,13 +11,14 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.ListView; import android.widget.Toast; +import com.fsck.k9.BuildConfig; import com.fsck.k9.Identity; import com.fsck.k9.Preferences; import com.fsck.k9.R; public class ManageIdentities extends ChooseIdentity { private boolean mIdentitiesChanged = false; - public static final String EXTRA_IDENTITIES = "com.fsck.k9.EditIdentity_identities"; + public static final String EXTRA_IDENTITIES = BuildConfig.APPLICATION_ID + ".EditIdentity_identities"; private static final int ACTIVITY_EDIT_IDENTITY = 1; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java index 0129b82e1..b93030eec 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java @@ -72,6 +72,7 @@ import android.widget.Toast; import com.fsck.k9.Account; import com.fsck.k9.Account.MessageFormat; import com.fsck.k9.Account.QuoteStyle; +import com.fsck.k9.BuildConfig; import com.fsck.k9.EmailAddressAdapter; import com.fsck.k9.EmailAddressValidator; import com.fsck.k9.FontSizes; @@ -135,41 +136,41 @@ public class MessageCompose extends K9Activity implements OnClickListener, private static final long INVALID_DRAFT_ID = MessagingController.INVALID_MESSAGE_ID; - private static final String ACTION_COMPOSE = "com.fsck.k9.intent.action.COMPOSE"; - private static final String ACTION_REPLY = "com.fsck.k9.intent.action.REPLY"; - private static final String ACTION_REPLY_ALL = "com.fsck.k9.intent.action.REPLY_ALL"; - private static final String ACTION_FORWARD = "com.fsck.k9.intent.action.FORWARD"; - private static final String ACTION_EDIT_DRAFT = "com.fsck.k9.intent.action.EDIT_DRAFT"; + private static final String ACTION_COMPOSE = BuildConfig.APPLICATION_ID + ".intent.action.COMPOSE"; + private static final String ACTION_REPLY = BuildConfig.APPLICATION_ID + ".intent.action.REPLY"; + private static final String ACTION_REPLY_ALL = BuildConfig.APPLICATION_ID + ".intent.action.REPLY_ALL"; + private static final String ACTION_FORWARD = BuildConfig.APPLICATION_ID + ".intent.action.FORWARD"; + private static final String ACTION_EDIT_DRAFT = BuildConfig.APPLICATION_ID + ".intent.action.EDIT_DRAFT"; private static final String EXTRA_ACCOUNT = "account"; private static final String EXTRA_MESSAGE_BODY = "messageBody"; private static final String EXTRA_MESSAGE_REFERENCE = "message_reference"; private static final String STATE_KEY_ATTACHMENTS = - "com.fsck.k9.activity.MessageCompose.attachments"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.attachments"; private static final String STATE_KEY_CC_SHOWN = - "com.fsck.k9.activity.MessageCompose.ccShown"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.ccShown"; private static final String STATE_KEY_BCC_SHOWN = - "com.fsck.k9.activity.MessageCompose.bccShown"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.bccShown"; private static final String STATE_KEY_QUOTED_TEXT_MODE = - "com.fsck.k9.activity.MessageCompose.QuotedTextShown"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.QuotedTextShown"; private static final String STATE_KEY_SOURCE_MESSAGE_PROCED = - "com.fsck.k9.activity.MessageCompose.stateKeySourceMessageProced"; - private static final String STATE_KEY_DRAFT_ID = "com.fsck.k9.activity.MessageCompose.draftId"; - private static final String STATE_KEY_HTML_QUOTE = "com.fsck.k9.activity.MessageCompose.HTMLQuote"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.stateKeySourceMessageProced"; + private static final String STATE_KEY_DRAFT_ID = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.draftId"; + private static final String STATE_KEY_HTML_QUOTE = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.HTMLQuote"; private static final String STATE_IDENTITY_CHANGED = - "com.fsck.k9.activity.MessageCompose.identityChanged"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.identityChanged"; private static final String STATE_IDENTITY = - "com.fsck.k9.activity.MessageCompose.identity"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.identity"; private static final String STATE_PGP_DATA = "pgpData"; - private static final String STATE_IN_REPLY_TO = "com.fsck.k9.activity.MessageCompose.inReplyTo"; - private static final String STATE_REFERENCES = "com.fsck.k9.activity.MessageCompose.references"; - private static final String STATE_KEY_READ_RECEIPT = "com.fsck.k9.activity.MessageCompose.messageReadReceipt"; - private static final String STATE_KEY_DRAFT_NEEDS_SAVING = "com.fsck.k9.activity.MessageCompose.mDraftNeedsSaving"; + private static final String STATE_IN_REPLY_TO = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.inReplyTo"; + private static final String STATE_REFERENCES = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.references"; + private static final String STATE_KEY_READ_RECEIPT = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.messageReadReceipt"; + private static final String STATE_KEY_DRAFT_NEEDS_SAVING = BuildConfig.APPLICATION_ID + ".activity.MessageCompose.mDraftNeedsSaving"; private static final String STATE_KEY_FORCE_PLAIN_TEXT = - "com.fsck.k9.activity.MessageCompose.forcePlainText"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.forcePlainText"; private static final String STATE_KEY_QUOTED_TEXT_FORMAT = - "com.fsck.k9.activity.MessageCompose.quotedTextFormat"; + BuildConfig.APPLICATION_ID + ".activity.MessageCompose.quotedTextFormat"; private static final String STATE_KEY_NUM_ATTACHMENTS_LOADING = "numAttachmentsLoading"; private static final String STATE_KEY_WAITING_FOR_ATTACHMENTS = "waitingForAttachments"; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java index 2d75c1633..d93f1a810 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java @@ -29,6 +29,7 @@ import android.widget.Toast; import com.fsck.k9.Account; import com.fsck.k9.Account.SortType; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.K9.SplitViewMode; import com.fsck.k9.Preferences; @@ -78,8 +79,8 @@ public class MessageList extends K9Activity implements MessageListFragmentListen private static final String EXTRA_MESSAGE_REFERENCE = "message_reference"; // used for remote search - public static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account"; - private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.search_folder"; + public static final String EXTRA_SEARCH_ACCOUNT = BuildConfig.APPLICATION_ID + ".search_account"; + private static final String EXTRA_SEARCH_FOLDER = BuildConfig.APPLICATION_ID + ".search_folder"; private static final String STATE_DISPLAY_MODE = "displayMode"; private static final String STATE_MESSAGE_LIST_WAS_DISPLAYED = "messageListWasDisplayed"; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java index a0c129541..18ea93de3 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -27,6 +27,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.EmailAddressValidator; import com.fsck.k9.K9; import com.fsck.k9.Preferences; @@ -54,12 +55,12 @@ import com.fsck.k9.view.ClientCertificateSpinner.OnClientCertificateChangedListe */ public class AccountSetupBasics extends K9Activity implements OnClickListener, TextWatcher, OnCheckedChangeListener, OnClientCertificateChangedListener { - private final static String EXTRA_ACCOUNT = "com.fsck.k9.AccountSetupBasics.account"; + private final static String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".AccountSetupBasics.account"; private final static int DIALOG_NOTE = 1; private final static String STATE_KEY_PROVIDER = - "com.fsck.k9.AccountSetupBasics.provider"; + BuildConfig.APPLICATION_ID + ".AccountSetupBasics.provider"; private final static String STATE_KEY_CHECKED_INCOMING = - "com.fsck.k9.AccountSetupBasics.checkedIncoming"; + BuildConfig.APPLICATION_ID + ".AccountSetupBasics.checkedIncoming"; private EditText mEmailView; private EditText mPasswordView; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java index 737e2ffc3..4ddb3b05d 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java @@ -22,8 +22,8 @@ import com.fsck.k9.service.MailService; public class FolderSettings extends K9PreferenceActivity { - private static final String EXTRA_FOLDER_NAME = "com.fsck.k9.folderName"; - private static final String EXTRA_ACCOUNT = "com.fsck.k9.account"; + private static final String EXTRA_FOLDER_NAME = BuildConfig.APPLICATION_ID + ".folderName"; + private static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".account"; private static final String PREFERENCE_TOP_CATERGORY = "folder_settings"; private static final String PREFERENCE_DISPLAY_CLASS = "folder_settings_folder_display_mode"; diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java index 8d0dd8f20..0ef3b354d 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -43,6 +43,7 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.AccountStats; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.K9.NotificationHideSubject; import com.fsck.k9.K9.Intents; @@ -140,15 +141,15 @@ public class MessagingController implements Runnable { * So 25k gives good performance and a reasonable data footprint. Sounds good to me. */ - private static final String PENDING_COMMAND_MOVE_OR_COPY = "com.fsck.k9.MessagingController.moveOrCopy"; - private static final String PENDING_COMMAND_MOVE_OR_COPY_BULK = "com.fsck.k9.MessagingController.moveOrCopyBulk"; - private static final String PENDING_COMMAND_MOVE_OR_COPY_BULK_NEW = "com.fsck.k9.MessagingController.moveOrCopyBulkNew"; - private static final String PENDING_COMMAND_EMPTY_TRASH = "com.fsck.k9.MessagingController.emptyTrash"; - private static final String PENDING_COMMAND_SET_FLAG_BULK = "com.fsck.k9.MessagingController.setFlagBulk"; - private static final String PENDING_COMMAND_SET_FLAG = "com.fsck.k9.MessagingController.setFlag"; - private static final String PENDING_COMMAND_APPEND = "com.fsck.k9.MessagingController.append"; - private static final String PENDING_COMMAND_MARK_ALL_AS_READ = "com.fsck.k9.MessagingController.markAllAsRead"; - private static final String PENDING_COMMAND_EXPUNGE = "com.fsck.k9.MessagingController.expunge"; + private static final String PENDING_COMMAND_MOVE_OR_COPY = BuildConfig.APPLICATION_ID + ".MessagingController.moveOrCopy"; + private static final String PENDING_COMMAND_MOVE_OR_COPY_BULK = BuildConfig.APPLICATION_ID + ".MessagingController.moveOrCopyBulk"; + private static final String PENDING_COMMAND_MOVE_OR_COPY_BULK_NEW = BuildConfig.APPLICATION_ID + ".MessagingController.moveOrCopyBulkNew"; + private static final String PENDING_COMMAND_EMPTY_TRASH = BuildConfig.APPLICATION_ID + ".MessagingController.emptyTrash"; + private static final String PENDING_COMMAND_SET_FLAG_BULK = BuildConfig.APPLICATION_ID + ".MessagingController.setFlagBulk"; + private static final String PENDING_COMMAND_SET_FLAG = BuildConfig.APPLICATION_ID + ".MessagingController.setFlag"; + private static final String PENDING_COMMAND_APPEND = BuildConfig.APPLICATION_ID + ".MessagingController.append"; + private static final String PENDING_COMMAND_MARK_ALL_AS_READ = BuildConfig.APPLICATION_ID + ".MessagingController.markAllAsRead"; + private static final String PENDING_COMMAND_EXPUNGE = BuildConfig.APPLICATION_ID + ".MessagingController.expunge"; public static class UidReverseComparator implements Comparator { @Override diff --git a/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java index d599f4ac7..87c9b69fa 100644 --- a/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.Preferences; import com.fsck.k9.cache.EmailProviderCacheCursor; import com.fsck.k9.helper.Utility; @@ -43,7 +44,7 @@ import android.text.TextUtils; public class EmailProvider extends ContentProvider { private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH); - public static final String AUTHORITY = "com.fsck.k9.provider.email"; + public static final String AUTHORITY = BuildConfig.APPLICATION_ID +".provider.email"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY); diff --git a/k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java index 2917eab0b..f6fb010e8 100644 --- a/k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java @@ -21,6 +21,7 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.AccountStats; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.activity.FolderInfoHolder; @@ -940,7 +941,7 @@ public class MessageProvider extends ContentProvider { } } - public static final String AUTHORITY = "com.fsck.k9.messageprovider"; + public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".messageprovider"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY); diff --git a/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java b/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java index 754ba8e25..b5fa15cba 100644 --- a/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java +++ b/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java @@ -5,6 +5,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; +import com.fsck.k9.BuildConfig; + /** * Utillity definitions for Android applications to control the behavior of K-9 Mail. All such applications must declare the following permission: * @@ -24,14 +26,14 @@ public class K9RemoteControl { * Permission that every application sending a broadcast to K-9 for Remote Control purposes should send on every broadcast. * Prevent other applications from intercepting the broadcasts. */ - public final static String K9_REMOTE_CONTROL_PERMISSION = "com.fsck.k9.permission.REMOTE_CONTROL"; + public final static String K9_REMOTE_CONTROL_PERMISSION = BuildConfig.APPLICATION_ID + ".permission.REMOTE_CONTROL"; /** * {@link Intent} Action to be sent to K-9 using {@link ContextWrapper.sendOrderedBroadcast} in order to fetch the list of configured Accounts. * The responseData will contain two String[] with keys K9_ACCOUNT_UUIDS and K9_ACCOUNT_DESCRIPTIONS */ - public final static String K9_REQUEST_ACCOUNTS = "com.fsck.k9.K9RemoteControl.requestAccounts"; - public final static String K9_ACCOUNT_UUIDS = "com.fsck.k9.K9RemoteControl.accountUuids"; - public final static String K9_ACCOUNT_DESCRIPTIONS = "com.fsck.k9.K9RemoteControl.accountDescriptions"; + public final static String K9_REQUEST_ACCOUNTS = BuildConfig.APPLICATION_ID + ".K9RemoteControl.requestAccounts"; + public final static String K9_ACCOUNT_UUIDS = BuildConfig.APPLICATION_ID + ".K9RemoteControl.accountUuids"; + public final static String K9_ACCOUNT_DESCRIPTIONS = BuildConfig.APPLICATION_ID + ".K9RemoteControl.accountDescriptions"; /** * The {@link {@link Intent}} Action to set in order to cause K-9 to check mail. (Not yet implemented) @@ -41,17 +43,17 @@ public class K9RemoteControl { /** * The {@link {@link Intent}} Action to set when remotely changing K-9 Mail settings */ - public final static String K9_SET = "com.fsck.k9.K9RemoteControl.set"; + public final static String K9_SET = BuildConfig.APPLICATION_ID + ".K9RemoteControl.set"; /** * The key of the {@link Intent} Extra to set to hold the UUID of a single Account's settings to change. Used only if K9_ALL_ACCOUNTS * is absent or false. */ - public final static String K9_ACCOUNT_UUID = "com.fsck.k9.K9RemoteControl.accountUuid"; + public final static String K9_ACCOUNT_UUID = BuildConfig.APPLICATION_ID + ".K9RemoteControl.accountUuid"; /** * The key of the {@link Intent} Extra to set to control if the settings will apply to all Accounts, or to the one * specified with K9_ACCOUNT_UUID */ - public final static String K9_ALL_ACCOUNTS = "com.fsck.k9.K9RemoteControl.allAccounts"; + public final static String K9_ALL_ACCOUNTS = BuildConfig.APPLICATION_ID + ".K9RemoteControl.allAccounts"; public final static String K9_ENABLED = "true"; public final static String K9_DISABLED = "false"; @@ -60,17 +62,17 @@ public class K9RemoteControl { * Key for the {@link Intent} Extra for controlling whether notifications will be generated for new unread mail. * Acceptable values are K9_ENABLED and K9_DISABLED */ - public final static String K9_NOTIFICATION_ENABLED = "com.fsck.k9.K9RemoteControl.notificationEnabled"; + public final static String K9_NOTIFICATION_ENABLED = BuildConfig.APPLICATION_ID + ".K9RemoteControl.notificationEnabled"; /* * Key for the {@link Intent} Extra for controlling whether K-9 will sound the ringtone for new unread mail. * Acceptable values are K9_ENABLED and K9_DISABLED */ - public final static String K9_RING_ENABLED = "com.fsck.k9.K9RemoteControl.ringEnabled"; + public final static String K9_RING_ENABLED = BuildConfig.APPLICATION_ID + ".K9RemoteControl.ringEnabled"; /* * Key for the {@link Intent} Extra for controlling whether K-9 will activate the vibrator for new unread mail. * Acceptable values are K9_ENABLED and K9_DISABLED */ - public final static String K9_VIBRATE_ENABLED = "com.fsck.k9.K9RemoteControl.vibrateEnabled"; + public final static String K9_VIBRATE_ENABLED = BuildConfig.APPLICATION_ID + ".K9RemoteControl.vibrateEnabled"; public final static String K9_FOLDERS_NONE = "NONE"; public final static String K9_FOLDERS_ALL = "ALL"; @@ -82,27 +84,27 @@ public class K9RemoteControl { * Acceptable values are K9_FOLDERS_ALL, K9_FOLDERS_FIRST_CLASS, K9_FOLDERS_FIRST_AND_SECOND_CLASS, * K9_FOLDERS_NOT_SECOND_CLASS, K9_FOLDERS_NONE */ - public final static String K9_PUSH_CLASSES = "com.fsck.k9.K9RemoteControl.pushClasses"; + public final static String K9_PUSH_CLASSES = BuildConfig.APPLICATION_ID + ".K9RemoteControl.pushClasses"; /** * Key for the {@link Intent} Extra to set for controlling which folders to be synchronized with Poll. * Acceptable values are K9_FOLDERS_ALL, K9_FOLDERS_FIRST_CLASS, K9_FOLDERS_FIRST_AND_SECOND_CLASS, * K9_FOLDERS_NOT_SECOND_CLASS, K9_FOLDERS_NONE */ - public final static String K9_POLL_CLASSES = "com.fsck.k9.K9RemoteControl.pollClasses"; + public final static String K9_POLL_CLASSES = BuildConfig.APPLICATION_ID + ".K9RemoteControl.pollClasses"; public final static String[] K9_POLL_FREQUENCIES = { "-1", "1", "5", "10", "15", "30", "60", "120", "180", "360", "720", "1440"}; /** * Key for the {@link Intent} Extra to set with the desired poll frequency. The value is a String representing a number of minutes. * Acceptable values are available in K9_POLL_FREQUENCIES */ - public final static String K9_POLL_FREQUENCY = "com.fsck.k9.K9RemoteControl.pollFrequency"; + public final static String K9_POLL_FREQUENCY = BuildConfig.APPLICATION_ID + ".K9RemoteControl.pollFrequency"; /** * Key for the {@link Intent} Extra to set for controlling K-9's global "Background sync" setting. * Acceptable values are K9_BACKGROUND_OPERATIONS_ALWAYS, K9_BACKGROUND_OPERATIONS_NEVER * K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC */ - public final static String K9_BACKGROUND_OPERATIONS = "com.fsck.k9.K9RemoteControl.backgroundOperations"; + public final static String K9_BACKGROUND_OPERATIONS = BuildConfig.APPLICATION_ID + ".K9RemoteControl.backgroundOperations"; public final static String K9_BACKGROUND_OPERATIONS_ALWAYS = "ALWAYS"; public final static String K9_BACKGROUND_OPERATIONS_NEVER = "NEVER"; public final static String K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC = "WHEN_CHECKED_AUTO_SYNC"; @@ -111,7 +113,7 @@ public class K9RemoteControl { * Key for the {@link Intent} Extra to set for controlling which display theme K-9 will use. Acceptable values are * K9_THEME_LIGHT, K9_THEME_DARK */ - public final static String K9_THEME = "com.fsck.k9.K9RemoteControl.theme"; + public final static String K9_THEME = BuildConfig.APPLICATION_ID + ".K9RemoteControl.theme"; public final static String K9_THEME_LIGHT = "LIGHT"; public final static String K9_THEME_DARK = "DARK"; diff --git a/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java index dec7cb1ef..e856eeb6b 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java @@ -11,16 +11,17 @@ import android.net.ConnectivityManager; import android.net.Uri; import android.util.Log; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; public class BootReceiver extends CoreReceiver { - public static final String FIRE_INTENT = "com.fsck.k9.service.BroadcastReceiver.fireIntent"; - public static final String SCHEDULE_INTENT = "com.fsck.k9.service.BroadcastReceiver.scheduleIntent"; - public static final String CANCEL_INTENT = "com.fsck.k9.service.BroadcastReceiver.cancelIntent"; + public static final String FIRE_INTENT = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.fireIntent"; + public static final String SCHEDULE_INTENT = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.scheduleIntent"; + public static final String CANCEL_INTENT = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.cancelIntent"; - public static final String ALARMED_INTENT = "com.fsck.k9.service.BroadcastReceiver.pendingIntent"; - public static final String AT_TIME = "com.fsck.k9.service.BroadcastReceiver.atTime"; + public static final String ALARMED_INTENT = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.pendingIntent"; + public static final String AT_TIME = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.atTime"; @Override public Integer receive(Context context, Intent intent, Integer tmpWakeLockId) { diff --git a/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java index 50b899f2f..c7195e1e1 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java @@ -10,15 +10,16 @@ import android.content.Intent; import android.os.PowerManager; import android.util.Log; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.mail.power.TracingPowerManager; import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; public class CoreReceiver extends BroadcastReceiver { - public static final String WAKE_LOCK_RELEASE = "com.fsck.k9.service.CoreReceiver.wakeLockRelease"; + public static final String WAKE_LOCK_RELEASE = BuildConfig.APPLICATION_ID + ".service.CoreReceiver.wakeLockRelease"; - public static final String WAKE_LOCK_ID = "com.fsck.k9.service.CoreReceiver.wakeLockId"; + public static final String WAKE_LOCK_ID = BuildConfig.APPLICATION_ID + ".service.CoreReceiver.wakeLockId"; private static ConcurrentHashMap wakeLocks = new ConcurrentHashMap(); private static AtomicInteger wakeLockSeq = new AtomicInteger(0); diff --git a/k9mail/src/main/java/com/fsck/k9/service/CoreService.java b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java index 0ed8a496c..54e53887c 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java @@ -12,6 +12,8 @@ import android.content.Intent; import android.os.IBinder; import android.os.PowerManager; import android.util.Log; + +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.mail.power.TracingPowerManager; @@ -57,7 +59,7 @@ import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; */ public abstract class CoreService extends Service { - public static final String WAKE_LOCK_ID = "com.fsck.k9.service.CoreService.wakeLockId"; + public static final String WAKE_LOCK_ID = BuildConfig.APPLICATION_ID + ".service.CoreService.wakeLockId"; private static ConcurrentHashMap sWakeLocks = new ConcurrentHashMap(); diff --git a/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java index fd89659e8..4fc5dd86d 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java @@ -12,6 +12,7 @@ import android.support.v4.content.LocalBroadcastManager; import android.util.Log; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.activity.UpgradeDatabases; @@ -69,7 +70,7 @@ public class DatabaseUpgradeService extends Service { * Action used to start this service. */ private static final String ACTION_START_SERVICE = - "com.fsck.k9.service.DatabaseUpgradeService.startService"; + BuildConfig.APPLICATION_ID + ".service.DatabaseUpgradeService.startService"; private static final String WAKELOCK_TAG = "DatabaseUpgradeService"; private static final long WAKELOCK_TIMEOUT = 10 * 60 * 1000; // 10 minutes diff --git a/k9mail/src/main/java/com/fsck/k9/service/MailService.java b/k9mail/src/main/java/com/fsck/k9/service/MailService.java index 6a1fde5b0..971c11781 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/MailService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/MailService.java @@ -12,6 +12,7 @@ import android.os.IBinder; import android.util.Log; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.Account.FolderMode; @@ -20,14 +21,14 @@ import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.Pusher; public class MailService extends CoreService { - private static final String ACTION_CHECK_MAIL = "com.fsck.k9.intent.action.MAIL_SERVICE_WAKEUP"; - private static final String ACTION_RESET = "com.fsck.k9.intent.action.MAIL_SERVICE_RESET"; - private static final String ACTION_RESCHEDULE_POLL = "com.fsck.k9.intent.action.MAIL_SERVICE_RESCHEDULE_POLL"; - private static final String ACTION_CANCEL = "com.fsck.k9.intent.action.MAIL_SERVICE_CANCEL"; - private static final String ACTION_REFRESH_PUSHERS = "com.fsck.k9.intent.action.MAIL_SERVICE_REFRESH_PUSHERS"; - private static final String ACTION_RESTART_PUSHERS = "com.fsck.k9.intent.action.MAIL_SERVICE_RESTART_PUSHERS"; - private static final String CONNECTIVITY_CHANGE = "com.fsck.k9.intent.action.MAIL_SERVICE_CONNECTIVITY_CHANGE"; - private static final String CANCEL_CONNECTIVITY_NOTICE = "com.fsck.k9.intent.action.MAIL_SERVICE_CANCEL_CONNECTIVITY_NOTICE"; + private static final String ACTION_CHECK_MAIL = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_WAKEUP"; + private static final String ACTION_RESET = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_RESET"; + private static final String ACTION_RESCHEDULE_POLL = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_RESCHEDULE_POLL"; + private static final String ACTION_CANCEL = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_CANCEL"; + private static final String ACTION_REFRESH_PUSHERS = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_REFRESH_PUSHERS"; + private static final String ACTION_RESTART_PUSHERS = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_RESTART_PUSHERS"; + private static final String CONNECTIVITY_CHANGE = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_CONNECTIVITY_CHANGE"; + private static final String CANCEL_CONNECTIVITY_NOTICE = BuildConfig.APPLICATION_ID + ".intent.action.MAIL_SERVICE_CANCEL_CONNECTIVITY_NOTICE"; private static long nextCheck = -1; private static boolean pushingRequested = false; @@ -164,7 +165,7 @@ public class MailService extends CoreService { private void cancel() { Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService"); + i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID +".service.MailService"); i.setAction(ACTION_CHECK_MAIL); BootReceiver.cancelIntent(this, i); } @@ -305,7 +306,7 @@ public class MailService extends CoreService { } Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService"); + i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID +".service.MailService"); i.setAction(ACTION_CHECK_MAIL); BootReceiver.scheduleIntent(MailService.this, nextTime, i); } @@ -411,7 +412,7 @@ public class MailService extends CoreService { if (K9.DEBUG) Log.d(K9.LOG_TAG, "Next pusher refresh scheduled for " + new Date(nextTime)); Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService"); + i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID +".service.MailService"); i.setAction(ACTION_REFRESH_PUSHERS); BootReceiver.scheduleIntent(MailService.this, nextTime, i); } diff --git a/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java b/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java index 50f14bc15..c0a0b7769 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.activity.MessageCompose; @@ -19,10 +20,10 @@ import android.content.Intent; import android.util.Log; public class NotificationActionService extends CoreService { - private final static String REPLY_ACTION = "com.fsck.k9.service.NotificationActionService.REPLY_ACTION"; - private final static String READ_ALL_ACTION = "com.fsck.k9.service.NotificationActionService.READ_ALL_ACTION"; - private final static String DELETE_ALL_ACTION = "com.fsck.k9.service.NotificationActionService.DELETE_ALL_ACTION"; - private final static String ACKNOWLEDGE_ACTION = "com.fsck.k9.service.NotificationActionService.ACKNOWLEDGE_ACTION"; + private final static String REPLY_ACTION = BuildConfig.APPLICATION_ID + ".service.NotificationActionService.REPLY_ACTION"; + private final static String READ_ALL_ACTION = BuildConfig.APPLICATION_ID + ".service.NotificationActionService.READ_ALL_ACTION"; + private final static String DELETE_ALL_ACTION = BuildConfig.APPLICATION_ID + ".service.NotificationActionService.DELETE_ALL_ACTION"; + private final static String ACKNOWLEDGE_ACTION = BuildConfig.APPLICATION_ID + ".service.NotificationActionService.ACKNOWLEDGE_ACTION"; private final static String EXTRA_ACCOUNT = "account"; private final static String EXTRA_MESSAGE = "message"; diff --git a/k9mail/src/main/java/com/fsck/k9/service/PollService.java b/k9mail/src/main/java/com/fsck/k9/service/PollService.java index f47c4e3b8..6af6ba076 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/PollService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/PollService.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; public class PollService extends CoreService { - private static String START_SERVICE = "com.fsck.k9.service.PollService.startService"; - private static String STOP_SERVICE = "com.fsck.k9.service.PollService.stopService"; + private static String START_SERVICE = BuildConfig.APPLICATION_ID + ".service.PollService.startService"; + private static String STOP_SERVICE = BuildConfig.APPLICATION_ID + ".service.PollService.stopService"; private Listener mListener = new Listener(); diff --git a/k9mail/src/main/java/com/fsck/k9/service/PushService.java b/k9mail/src/main/java/com/fsck/k9/service/PushService.java index 19de1ecf0..4f13c372a 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/PushService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/PushService.java @@ -4,11 +4,13 @@ import android.content.Context; import android.content.Intent; import android.os.IBinder; import android.util.Log; + +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; public class PushService extends CoreService { - private static String START_SERVICE = "com.fsck.k9.service.PushService.startService"; - private static String STOP_SERVICE = "com.fsck.k9.service.PushService.stopService"; + private static String START_SERVICE = BuildConfig.APPLICATION_ID + ".service.PushService.startService"; + private static String STOP_SERVICE = BuildConfig.APPLICATION_ID + ".service.PushService.stopService"; public static void startService(Context context) { Intent i = new Intent(); diff --git a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java index e942f4d23..dcec96b6c 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java @@ -1,6 +1,7 @@ package com.fsck.k9.service; import com.fsck.k9.Account; +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.remotecontrol.K9RemoteControl; import com.fsck.k9.Preferences; @@ -20,10 +21,10 @@ import android.widget.Toast; import java.util.List; public class RemoteControlService extends CoreService { - private final static String RESCHEDULE_ACTION = "com.fsck.k9.service.RemoteControlService.RESCHEDULE_ACTION"; - private final static String PUSH_RESTART_ACTION = "com.fsck.k9.service.RemoteControlService.PUSH_RESTART_ACTION"; + private final static String RESCHEDULE_ACTION = BuildConfig.APPLICATION_ID + ".service.RemoteControlService.RESCHEDULE_ACTION"; + private final static String PUSH_RESTART_ACTION = BuildConfig.APPLICATION_ID + ".service.RemoteControlService.PUSH_RESTART_ACTION"; - private final static String SET_ACTION = "com.fsck.k9.service.RemoteControlService.SET_ACTION"; + private final static String SET_ACTION = BuildConfig.APPLICATION_ID + ".service.RemoteControlService.SET_ACTION"; public static void set(Context context, Intent i, Integer wakeLockId) { // Intent i = new Intent(); @@ -135,14 +136,14 @@ public class RemoteControlService extends CoreService { if (needsReschedule) { Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.RemoteControlService"); + i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID + ".service.RemoteControlService"); i.setAction(RESCHEDULE_ACTION); long nextTime = System.currentTimeMillis() + 10000; BootReceiver.scheduleIntent(RemoteControlService.this, nextTime, i); } if (needsPushRestart) { Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.RemoteControlService"); + i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID + ".service.RemoteControlService"); i.setAction(PUSH_RESTART_ACTION); long nextTime = System.currentTimeMillis() + 10000; BootReceiver.scheduleIntent(RemoteControlService.this, nextTime, i); diff --git a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java index 937f97dc3..2d909eb20 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java @@ -3,6 +3,8 @@ package com.fsck.k9.service; import android.content.Context; import android.content.Intent; import android.util.Log; + +import com.fsck.k9.BuildConfig; import com.fsck.k9.K9; import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; @@ -13,8 +15,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class SleepService extends CoreService { - private static String ALARM_FIRED = "com.fsck.k9.service.SleepService.ALARM_FIRED"; - private static String LATCH_ID = "com.fsck.k9.service.SleepService.LATCH_ID_EXTRA"; + private static String ALARM_FIRED = BuildConfig.APPLICATION_ID + ".service.SleepService.ALARM_FIRED"; + private static String LATCH_ID = BuildConfig.APPLICATION_ID + ".SleepService.LATCH_ID_EXTRA"; private static ConcurrentHashMap sleepData = new ConcurrentHashMap(); @@ -32,7 +34,7 @@ public class SleepService extends CoreService { sleepData.put(id, sleepDatum); Intent i = new Intent(); - i.setClassName(context.getPackageName(), "com.fsck.k9.service.SleepService"); + i.setClassName(context.getPackageName(), BuildConfig.APPLICATION_ID + ".service.SleepService"); i.putExtra(LATCH_ID, id); i.setAction(ALARM_FIRED + "." + id); long startTime = System.currentTimeMillis();