Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-04 20:13:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(tracking): Remove hardcoded references to tracking plugin ids

Browse source 
- Adds a helper in the package manager to get the id of a plugin
This commit is contained in:
Juan Tejada 2016-06-06 17:18:54 -07:00
parent 6d7dec3b0e
commit 544d27bca8
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/flux/tasks/send-draft-task.es6
View file

@ -13,14 +13,7 @@ import MultiSendToIndividualTask from './multi-send-to-individual-task';
import MultiSendSessionCloseTask from './multi-send-session-close-task'; import MultiSendSessionCloseTask from './multi-send-session-close-task';
import SyncbackMetadataTask from './syncback-metadata-task'; import SyncbackMetadataTask from './syncback-metadata-task';
import NotifyPluginsOfSendTask from './notify-plugins-of-send-task'; import NotifyPluginsOfSendTask from './notify-plugins-of-send-task';
let OPEN_TRACKING_ID = null;
let LINK_TRACKING_ID = null;
try {
OPEN_TRACKING_ID = require('../../../internal_packages/open-tracking/lib/open-tracking-constants').PLUGIN_ID;
LINK_TRACKING_ID = require('../../../internal_packages/link-tracking/lib/link-tracking-constants').PLUGIN_ID;
} catch (err) {
console.log(err)
}
// TODO // TODO
// Refactor this to consolidate error handling across all Sending tasks // Refactor this to consolidate error handling across all Sending tasks
@ -67,9 +60,11 @@ export default class SendDraftTask extends BaseDraftTask {
} }
sendMessage = () => { sendMessage = () => {
const openTrackingId = NylasEnv.packages.pluginIdFor('open-tracking')
const linkTrackingId = NylasEnv.packages.pluginIdFor('link-tracking')
const shouldMultiSend = ( const shouldMultiSend = (
this.multiSend && OPEN_TRACKING_ID && LINK_TRACKING_ID && this.multiSend && openTrackingId && linkTrackingId &&
(this.draft.metadataForPluginId(OPEN_TRACKING_ID) || this.draft.metadataForPluginId(LINK_TRACKING_ID)) && (this.draft.metadataForPluginId(openTrackingId) || this.draft.metadataForPluginId(linkTrackingId)) &&
AccountStore.accountForId(this.draft.accountId).provider !== "eas" AccountStore.accountForId(this.draft.accountId).provider !== "eas"
) )
if (shouldMultiSend) { if (shouldMultiSend) {

5
src/package-manager.coffee
View file

@ -55,6 +55,11 @@ class PackageManager
@packageActivators = [] @packageActivators = []
@registerPackageActivator(this, ['nylas']) @registerPackageActivator(this, ['nylas'])
pluginIdFor: (pluginName) =>
env = NylasEnv.config.get("env")
return @loadedPackages[pluginName]?.metadata.appId?[env]
### ###
Section: Event Subscription Section: Event Subscription
### ###

2
src/pro

@ -1 +1 @@
Subproject commit b9014953775087f42caf0d2a29b2d7b00506e5ca Subproject commit d2d8de3574117d6990a8144e6c2f6fc661f61a27