Skip to content

Commit

Permalink
Updates for my patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@sconix
sconix committed Sep 19, 2011
1 parent a57a8c7 commit dd6d66f
Show file tree
Hide file tree
Showing 18 changed files with 7,347 additions and 3,925 deletions.
627 changes: 311 additions & 316 deletions advanced/advanced-system-menus-device-menu-veer.patch
View file

Large diffs are not rendered by default.

597 changes: 296 additions & 301 deletions advanced/advanced-system-menus-device-menu.patch
View file

Large diffs are not rendered by default.

153 changes: 76 additions & 77 deletions advanced/advanced-system-prefs-email-prefs-veer.patch
View file
Expand Up @@ -96,7 +96,7 @@
}

EmailApp.AccountList.saveAccountOrder(freshList);
+
+
+ EmailApp.prefs.set('defaultAccountId', freshList[0].accountId);
};

Expand Down Expand Up @@ -155,7 +155,7 @@
}
};
-
+*/
+*/
AccountmanagerAssistant.prototype.deletionOptions = {
modelProperty: "confirmDeleteOnSwipe",
trueValue: true,
Expand Down Expand Up @@ -254,7 +254,7 @@
this.accountPrefs.notifications.type = AccountpreferencesAssistant.kNotifyTypeSystem;
}
-
+*/
+*/
// richtextedit doesn't use data model so manually copy the signature
var signature = this.controller.get('signature').innerHTML;
if (signature.length === 0) {
Expand Down Expand Up @@ -299,7 +299,7 @@
// Update the UI now (this calls modelChanged)
this.showNotificationChanged();
-
+*/
+*/
if (this.readyToActivateCallback) {
this.readyToActivateCallback();
this.readyToActivateCallback = null;
Expand Down Expand Up @@ -370,32 +370,33 @@

+ // Send list of localized strings to the service.
+ //ServiceStrings.sendLocalizedStrings();
+
+
// this is used to debounce the launch requests in case the user impatiently
// taps on a banner notification
this.debounceIds = {};
@@ -72,6 +72,10 @@
},
syncronizer.wrap(Mojo.doNothing));

+
+
+ // Load contacts.
+ EmailApp.emails = new EmailApp.Util.MojoDBEmails('com.palm.person:1', syncronizer.wrap(Mojo.doNothing));
+
// Configure initial carrier defaults, and load/reload them from the db as needed:
this.kDefaultCarrierDefaults = {
defaultSignature: EmailAccount.addStylingToSig(ServiceStrings.stringsNeededByService.defaultSignature)
@@ -463,6 +467,9 @@
@@ -463,6 +467,10 @@

LaunchHandler.prototype.handleLaunch = function() {
var params = this.launchParameters;
+
+ this.notificationAssistant.removePlayNotificationSoundTasks();
+
+ if(!params.playNotificationSound)
+ this.notificationAssistant.removePlayNotificationSoundTasks();
+
if (params.securityPolicyError) {
this.handleSecurityPolicyError(params);
} else if (params.certificateError) {
@@ -481,11 +488,21 @@
@@ -481,11 +489,21 @@
this.handleEditAccount();
} else if (params.reminderPersonId) {
this.handleContact(params);
Expand All @@ -410,10 +411,10 @@

+ LaunchHandler.prototype.playNotificationSound = function(accountId) {
+ this.notificationAssistant.playNotificationSound(accountId);
+
+
+ this.notificationAssistant.schedulePlayNotificationSoundTasks(accountId);
+ };
+
+
LaunchHandler.prototype.handleCompose = function() {
var params = this.launchParameters;
var mailToURL = params.uri || params.target;
Expand Down Expand Up @@ -457,7 +458,7 @@
this.errorDashboards = {};
+ this.notificationsData = {};
+ this.newEmails = [];
+
+
+ this.notifyTimeout = null;

this.windowActivate = this.windowActivate.bind(this);
Expand Down Expand Up @@ -489,7 +490,7 @@
+ this.notifyTimeout = setTimeout(this._processNewEmails.bind(this), 5000);
+}
+
+NotificationAssistant.prototype._processNewEmails = function() {
+NotificationAssistant.prototype._processNewEmails = function() {
+ var emails = this.newEmails.slice(0);

+ this.newEmails = [];
Expand All @@ -508,36 +509,36 @@
- // Make our dashboards reflect the data.
- this._updateDirtyDashboards();
+ var allUnknown = true;
+
+
+ var notifications = {};

+ emails.forEach(function(email) {
+ if(EmailApp.emails.check(email.from.addr))
+ allUnknown = false;
+
+
+ notifications[email.accountId] = true;
+ }, this);
+ }, this);
+
+ if(allUnknown) {
+ if(this.contactPrefs)
+ delete this.contactPrefs;
+
+
+ this.contactPrefs = new window.Contacts.AppPrefs(function() {
+ var prefs = this.contactPrefs.get(Contacts.AppPrefs.Pref.unknownContacts);
+
+ if((!prefs) || (!prefs.emailAlert) || (prefs.emailAlert == "default"))
+ _.map(_.keys(notifications), this._doNotificationForAccount, this);
+ else
+ this._doNotificationForUnknown(prefs.emailAlert, prefs.emailRingtonePath);
+
+
+ // Make our dashboards reflect the data.
+ this._updateDirtyDashboards();
+ }.bind(this));
+ }
+ else {
+ _.map(_.keys(notifications), this._doNotificationForAccount, this);
+
+ // Make our dashboards reflect the data.
+ // Make our dashboards reflect the data.
+ this._updateDirtyDashboards();
+ }
};
Expand Down Expand Up @@ -585,7 +586,7 @@
} else {
Mojo.Log.info("Creating dashboard for account %s, %d messages.", accountId, messages.length);
db = this.appController.createDashboard(NotificationAssistant.kNewEmailDashboardStageName+accountId, messages, {
+ onSuccess: function(sceneController){
+ onSuccess: function(sceneController) {
+ if(this.blinkNotify)
+ sceneController.stageController.indicateNewContent(true);
+ }.bind(this),
Expand Down Expand Up @@ -624,7 +625,7 @@
// No need to check for AccountpreferencesAssistant.kNotifyTypeMute, since mute is what happens if we don't do anything.

+ this.schedulePlayNotificationSoundTasks(accountId);
+
+
return;
};

Expand All @@ -644,84 +645,83 @@
// Others use account icon

+ var stageName = NotificationAssistant.kErrorDashboardStageName+accountId;
+
+
if(!db) {
Mojo.Log.error("Creating error dashboard for account %s: %s, %s", accountId, details.title, details.text);
tapHandler = this._errorTapper.bind(this, accountId);
- db = this.appController.createDashboard(NotificationAssistant.kErrorDashboardStageName+accountId, [details], {
+ db = this.appController.createDashboard(stageName, [details], {
mainTapHandler: tapHandler,
- iconTapHandler: tapHandler
+ iconTapHandler: tapHandler,
+ onSuccess: function(accountId, sceneController){
+ onSuccess: function(sceneController){
+ sceneController.stageController.indicateNewContent(true);
+ }.bind(this, accountId)
+ }.bind(this),
mainTapHandler: tapHandler,
iconTapHandler: tapHandler
});
this.errorDashboards[accountId] = db;
} else {
db.pushContent(details);
+
+
+ var stageController = this.appController.getStageController(stageName);
+
+
+ if(stageController)
+ stageController.indicateNewContent(true);
}
-
};

// Generic tap handler for all error dashboards. Bound to handle both iconTap and mainTap.
@@ -768,8 +867,76 @@
@@ -768,8 +867,75 @@
}
};

+NotificationAssistant.prototype.schedulePlayNotificationSoundTasks = function(accountId) {
+ var repeatDelay = 0;
+ var currentTime = new Date();
+
+ if(this.notificationsData[accountId] == undefined)
+ this.notificationsData[accountId] = 0;

+ for(var accountId in this.notificationsData) {
+ var accData = EmailApp.accounts.mailAccounts[accountId];
+
+ if((!accData) || (!accData.notifications) || (accData.notifications.enabled == false)) {
+ var accData = EmailApp.accounts.mailAccounts[accountId];
+
+ if((!accData) || (!accData.notifications) || (accData.notifications.enabled == false) ||
+ (accData.notifications.type == "mute") || (accData.notifications.repeatInterval == 0))
+ {
+ delete this.notificationsData[accountId];
+ }
+ else {
+ var repeatLimitation = parseInt(accData.notifications.repeatLimit);
+
+ if(this.notificationsData[accountId]++ >= repeatLimitation) {
+ delete this.notificationsData[accountId];
+ }
+ else if((accData.notifications.type != "mute") && (accData.notifications.repeatInterval != 0))
+ {
+ if(this.notificationsData[accountId]++ >= accData.notifications.repeatLimit) {
+ delete this.notificationsData[accountId];
+ }
+ else {
+ var repeatInterval = accData.notifications.repeatInterval;
+
+ var playSoundTime = new Date(currentTime.getTime() + (parseInt(repeatInterval) * 1000) + (repeatDelay++ * 10));
+
+ var month = playSoundTime.getUTCMonth()+1;
+ if(month < 10) month = "0" + month;
+ var day = playSoundTime.getUTCDate();
+ if(day < 10) day = "0" + day;
+ var year = playSoundTime.getUTCFullYear();
+
+ var hours = playSoundTime.getUTCHours();
+ if(hours < 10) hours = "0" + hours;
+ var minutes = playSoundTime.getUTCMinutes();
+ if(minutes < 10) minutes = "0" + minutes;
+ var seconds = playSoundTime.getUTCSeconds();
+ if(seconds < 10) seconds = "0" + seconds;
+
+ var scheduledTimeStr = month + "/" + day + "/" + year + " " + hours + ":" + minutes + ":" + seconds;
+
+ this.updateTimeoutRequest = new Mojo.Service.Request('palm://com.palm.power/timeout/', {
+ 'method': "set", 'parameters': { 'key': 'emailPlayNotificationSound-' + accountId,
+ 'wakeup': true, 'at': scheduledTimeStr, 'uri': "palm://com.palm.applicationManager/open",
+ 'params': {'id': 'com.palm.app.email', 'params': {'accountId': accountId,
+ 'playNotificationSound': this.notificationsData[accountId]}}} });
+ }
+ else {
+ var repeatInterval = parseInt(accData.notifications.repeatInterval);
+
+ var playSoundTime = new Date(currentTime.getTime() + (repeatInterval * 1000));
+
+ var month = playSoundTime.getUTCMonth()+1;
+ if(month < 10) month = "0" + month;
+ var day = playSoundTime.getUTCDate();
+ if(day < 10) day = "0" + day;
+ var year = playSoundTime.getUTCFullYear();
+
+ var hours = playSoundTime.getUTCHours();
+ if(hours < 10) hours = "0" + hours;
+ var minutes = playSoundTime.getUTCMinutes();
+ if(minutes < 10) minutes = "0" + minutes;
+ var seconds = playSoundTime.getUTCSeconds();
+ if(seconds < 10) seconds = "0" + seconds;
+
+ var scheduledTimeStr = month + "/" + day + "/" + year + " " + hours + ":" + minutes + ":" + seconds;
+
+ this.updateTimeoutRequest = new Mojo.Service.Request('palm://com.palm.power/timeout/', {
+ 'method': "set", 'parameters': { 'key': 'emailPlayNotificationSound-' + accountId,
+ 'wakeup': true, 'at': scheduledTimeStr, 'uri': "palm://com.palm.applicationManager/open",
+ 'params': {'id': 'com.palm.app.email', 'params': {'accountId': accountId,
+ 'playNotificationSound': this.notificationsData[accountId]}}} });
+ }
+ }
+};
+
+
+NotificationAssistant.prototype.removePlayNotificationSoundTasks = function() {
+ for(var accountId in this.notificationsData) {
+ if(this.notificationsData[accountId] > 0) {
Expand All @@ -730,10 +730,10 @@
+ }
+ }
+};
+
+NotificationAssistant.prototype.playNotificationSound = function(accountId) {
+ var accData = EmailApp.accounts.mailAccounts[accountId];
+
+ if((accData) && (accData.notifications) && (accData.notifications.enabled == true)) {
+ if(accData.notifications.type === AccountpreferencesAssistant.kNotifyTypeRingtone)
+ this.appController.playSoundNotification("notifications", accData.notifications.ringtonePath);
Expand All @@ -743,7 +743,6 @@
+ this.appController.playSoundNotification("vibrate");
+ }
+};
+

/*
NotificationAssistant.prototype.handleNewEmailNotification = function(list) {
Expand All @@ -767,7 +766,7 @@

+/******************************************************************************
+ Loads and manages changes to a persons email objects, stored in MojoDB.
+
+
+ The object's "ready" property will be true once initialization is complete.
+ ******************************************************************************/
+EmailApp.Util.MojoDBEmails = function(kind, onReady) {
Expand All @@ -777,7 +776,7 @@
+ this._onReady = onReady;
+
+ this._handleResult = this._handleResult.bind(this);
+
+
+ this._doQuery();
+};
+
Expand All @@ -793,7 +792,7 @@
+ }
+ else {
+ var emails = [];
+
+
+ for(var i = 0; i < result.results.length; i++) {
+ if(result.results[i].emails) {
+ for(var j = 0; j < result.results[i].emails.length; j++) {
Expand All @@ -805,9 +804,9 @@
+
+ this._emails = emails;
+ this.ready = true;
+
+
+ Mojo.Log.info("MojoDBEmails: Emails loaded for ", this._kind);
+
+
+ if(this._onReady) {
+ this._onReady();
+ this._onReady = undefined;
Expand Down

0 comments on commit dd6d66f

Please sign in to comment.