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 030feee9e..08f25ac6f 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java @@ -22,7 +22,6 @@ 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; @@ -32,14 +31,14 @@ import com.fsck.k9.mail.Folder; public class ChooseFolder extends K9ListActivity { - 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"; + 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"; 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 456413027..6795ea0b9 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java @@ -10,7 +10,6 @@ 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; @@ -20,8 +19,8 @@ public class ChooseIdentity extends K9ListActivity { Account mAccount; ArrayAdapter adapter; - public static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".ChooseIdentity_account"; - public static final String EXTRA_IDENTITY = BuildConfig.APPLICATION_ID + ".ChooseIdentity_identity"; + public static final String EXTRA_ACCOUNT = "com.fsck.k9.ChooseIdentity_account"; + public static final String EXTRA_IDENTITY = "com.fsck.k9.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 8050643a2..bf9eeced8 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java @@ -7,7 +7,6 @@ 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; @@ -15,9 +14,9 @@ import java.util.List; public class EditIdentity extends K9Activity { - 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"; + 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"; 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 2eb539254..41d3d3e34 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java @@ -11,14 +11,12 @@ 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 = 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 b93030eec..0129b82e1 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java @@ -72,7 +72,6 @@ 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; @@ -136,41 +135,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 = 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 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 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 = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.attachments"; + "com.fsck.k9.activity.MessageCompose.attachments"; private static final String STATE_KEY_CC_SHOWN = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.ccShown"; + "com.fsck.k9.activity.MessageCompose.ccShown"; private static final String STATE_KEY_BCC_SHOWN = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.bccShown"; + "com.fsck.k9.activity.MessageCompose.bccShown"; private static final String STATE_KEY_QUOTED_TEXT_MODE = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.QuotedTextShown"; + "com.fsck.k9.activity.MessageCompose.QuotedTextShown"; private static final String STATE_KEY_SOURCE_MESSAGE_PROCED = - 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"; + "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"; private static final String STATE_IDENTITY_CHANGED = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.identityChanged"; + "com.fsck.k9.activity.MessageCompose.identityChanged"; private static final String STATE_IDENTITY = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.identity"; + "com.fsck.k9.activity.MessageCompose.identity"; private static final String STATE_PGP_DATA = "pgpData"; - 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_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_KEY_FORCE_PLAIN_TEXT = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.forcePlainText"; + "com.fsck.k9.activity.MessageCompose.forcePlainText"; private static final String STATE_KEY_QUOTED_TEXT_FORMAT = - BuildConfig.APPLICATION_ID + ".activity.MessageCompose.quotedTextFormat"; + "com.fsck.k9.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 d93f1a810..2d75c1633 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java @@ -29,7 +29,6 @@ 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; @@ -79,8 +78,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 = BuildConfig.APPLICATION_ID + ".search_account"; - private static final String EXTRA_SEARCH_FOLDER = BuildConfig.APPLICATION_ID + ".search_folder"; + public static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account"; + private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.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 18ea93de3..a0c129541 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,7 +27,6 @@ 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; @@ -55,12 +54,12 @@ import com.fsck.k9.view.ClientCertificateSpinner.OnClientCertificateChangedListe */ public class AccountSetupBasics extends K9Activity implements OnClickListener, TextWatcher, OnCheckedChangeListener, OnClientCertificateChangedListener { - private final static String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".AccountSetupBasics.account"; + private final static String EXTRA_ACCOUNT = "com.fsck.k9.AccountSetupBasics.account"; private final static int DIALOG_NOTE = 1; private final static String STATE_KEY_PROVIDER = - BuildConfig.APPLICATION_ID + ".AccountSetupBasics.provider"; + "com.fsck.k9.AccountSetupBasics.provider"; private final static String STATE_KEY_CHECKED_INCOMING = - BuildConfig.APPLICATION_ID + ".AccountSetupBasics.checkedIncoming"; + "com.fsck.k9.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 4ddb3b05d..737e2ffc3 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 = BuildConfig.APPLICATION_ID + ".folderName"; - private static final String EXTRA_ACCOUNT = BuildConfig.APPLICATION_ID + ".account"; + 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 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 0ef3b354d..8d0dd8f20 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -43,7 +43,6 @@ 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; @@ -141,15 +140,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 = 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"; + 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"; public static class UidReverseComparator implements Comparator { @Override 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 e856eeb6b..dec7cb1ef 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java @@ -11,17 +11,16 @@ 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 = 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 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 ALARMED_INTENT = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.pendingIntent"; - public static final String AT_TIME = BuildConfig.APPLICATION_ID + ".service.BroadcastReceiver.atTime"; + public static final String ALARMED_INTENT = "com.fsck.k9.service.BroadcastReceiver.pendingIntent"; + public static final String AT_TIME = "com.fsck.k9.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 c7195e1e1..50b899f2f 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java @@ -10,16 +10,15 @@ 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 = BuildConfig.APPLICATION_ID + ".service.CoreReceiver.wakeLockRelease"; + public static final String WAKE_LOCK_RELEASE = "com.fsck.k9.service.CoreReceiver.wakeLockRelease"; - public static final String WAKE_LOCK_ID = BuildConfig.APPLICATION_ID + ".service.CoreReceiver.wakeLockId"; + public static final String WAKE_LOCK_ID = "com.fsck.k9.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 54e53887c..0ed8a496c 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/CoreService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java @@ -12,8 +12,6 @@ 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; @@ -59,7 +57,7 @@ import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock; */ public abstract class CoreService extends Service { - public static final String WAKE_LOCK_ID = BuildConfig.APPLICATION_ID + ".service.CoreService.wakeLockId"; + public static final String WAKE_LOCK_ID = "com.fsck.k9.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 4fc5dd86d..fd89659e8 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java @@ -12,7 +12,6 @@ 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; @@ -70,7 +69,7 @@ public class DatabaseUpgradeService extends Service { * Action used to start this service. */ private static final String ACTION_START_SERVICE = - BuildConfig.APPLICATION_ID + ".service.DatabaseUpgradeService.startService"; + "com.fsck.k9.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 971c11781..6a1fde5b0 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/MailService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/MailService.java @@ -12,7 +12,6 @@ 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; @@ -21,14 +20,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 = 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 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 long nextCheck = -1; private static boolean pushingRequested = false; @@ -165,7 +164,7 @@ public class MailService extends CoreService { private void cancel() { Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID +".service.MailService"); + i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService"); i.setAction(ACTION_CHECK_MAIL); BootReceiver.cancelIntent(this, i); } @@ -306,7 +305,7 @@ public class MailService extends CoreService { } Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID +".service.MailService"); + i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService"); i.setAction(ACTION_CHECK_MAIL); BootReceiver.scheduleIntent(MailService.this, nextTime, i); } @@ -412,7 +411,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(), BuildConfig.APPLICATION_ID +".service.MailService"); + i.setClassName(getApplication().getPackageName(), "com.fsck.k9.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 c0a0b7769..50f14bc15 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java @@ -5,7 +5,6 @@ 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; @@ -20,10 +19,10 @@ import android.content.Intent; import android.util.Log; public class NotificationActionService extends CoreService { - 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 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 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 6af6ba076..f47c4e3b8 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 = BuildConfig.APPLICATION_ID + ".service.PollService.startService"; - private static String STOP_SERVICE = BuildConfig.APPLICATION_ID + ".service.PollService.stopService"; + private static String START_SERVICE = "com.fsck.k9.service.PollService.startService"; + private static String STOP_SERVICE = "com.fsck.k9.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 4f13c372a..19de1ecf0 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/PushService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/PushService.java @@ -4,13 +4,11 @@ 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 = BuildConfig.APPLICATION_ID + ".service.PushService.startService"; - private static String STOP_SERVICE = BuildConfig.APPLICATION_ID + ".service.PushService.stopService"; + private static String START_SERVICE = "com.fsck.k9.service.PushService.startService"; + private static String STOP_SERVICE = "com.fsck.k9.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 dcec96b6c..e942f4d23 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java @@ -1,7 +1,6 @@ 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; @@ -21,10 +20,10 @@ import android.widget.Toast; import java.util.List; public class RemoteControlService extends CoreService { - 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 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 SET_ACTION = BuildConfig.APPLICATION_ID + ".service.RemoteControlService.SET_ACTION"; + private final static String SET_ACTION = "com.fsck.k9.service.RemoteControlService.SET_ACTION"; public static void set(Context context, Intent i, Integer wakeLockId) { // Intent i = new Intent(); @@ -136,14 +135,14 @@ public class RemoteControlService extends CoreService { if (needsReschedule) { Intent i = new Intent(); - i.setClassName(getApplication().getPackageName(), BuildConfig.APPLICATION_ID + ".service.RemoteControlService"); + i.setClassName(getApplication().getPackageName(), "com.fsck.k9.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(), BuildConfig.APPLICATION_ID + ".service.RemoteControlService"); + i.setClassName(getApplication().getPackageName(), "com.fsck.k9.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 2d909eb20..937f97dc3 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java @@ -3,8 +3,6 @@ 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; @@ -15,8 +13,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class SleepService extends CoreService { - 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 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 ConcurrentHashMap sleepData = new ConcurrentHashMap(); @@ -34,7 +32,7 @@ public class SleepService extends CoreService { sleepData.put(id, sleepDatum); Intent i = new Intent(); - i.setClassName(context.getPackageName(), BuildConfig.APPLICATION_ID + ".service.SleepService"); + i.setClassName(context.getPackageName(), "com.fsck.k9.service.SleepService"); i.putExtra(LATCH_ID, id); i.setAction(ALARM_FIRED + "." + id); long startTime = System.currentTimeMillis();