checkpoint on the way to clean report before submitting to Mozilla,

fixed "prefs" bug on PennyPostOptions
jonasbits · Feb 18, 2014 · e5294b4 · e5294b4
1 parent dea75ac
commit e5294b4
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 57 deletions.
diff --git a/chrome/content/composeOverlay.js b/chrome/content/composeOverlay.js
@@ -128,18 +128,18 @@ function msSendMsg() {
  * Format is x-stampprotocols: <algo1>/<max-supported-ver>/<min-cost>[/<other-params>][/<params>];<algo2>/<max-supported-ver>/<min-cost>[/<params>][/<other-params>] 
  */
 function getStampProtocolHeader(){
- var mb = 'mbound:'+Services.prefs.getIntPref('ppost.mbound.maxver')+':'+Services.prefs.getIntPref('ppost.mbound.minvalue')+':'+Services.prefs.getIntPref('ppost.mbound.minpath')+':'+Services.prefs.getIntPref('ppost.mbound.maxpath');
- var hc = 'hashcash:'+Services.prefs.getIntPref('ppost.hashcash.maxver')+':'+Services.prefs.getIntPref('ppost.hashcash.minvalue');
+ var mb = 'mbound:'+Services.prefs.getIntPref('extensions.ppost.mbound.maxver')+':'+Services.prefs.getIntPref('extensions.ppost.mbound.minvalue')+':'+Services.prefs.getIntPref('ppost.mbound.minpath')+':'+Services.prefs.getIntPref('ppost.mbound.maxpath');
+ var hc = 'hashcash:'+Services.prefs.getIntPref('extensions.ppost.hashcash.maxver')+':'+Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue');
  var rv='';
  var defalgo=Services.prefs.getCharPref('extensions.ppost.defalgo');
  if(defalgo==gStampTypes.S_HASHCASH){
- if(Services.prefs.getBoolPref('ppost.mbound.enable')){
+ if(Services.prefs.getBoolPref('extensions.ppost.mbound.enable')){
  return 'x-stampprotocols: '+hc+';'+mb+"\r\n";
  }else{
  return 'x-stampprotocols: '+hc+"\r\n";
  }
  }else{
- if(Services.prefs.getBoolPref('ppost.hashcash.enable')){
+ if(Services.prefs.getBoolPref('extensions.ppost.hashcash.enable')){
  return 'x-stampprotocols: '+mb+';'+hc+"\r\n";
  }else{
  return 'x-stampprotocols: '+mb+"\r\n";

diff --git a/chrome/content/messageWindowOverlay.js b/chrome/content/messageWindowOverlay.js
@@ -115,8 +115,8 @@ function displayStampInfo(){
 function verifyStamp()
 {
  //Read all prefs
- var hcminval=Services.prefs.getIntPref('ppost.hashcash.minvalue');
- var mbminval=Services.prefs.getIntPref('ppost.mbound.minvalue');
+ var hcminval=Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue');
+ var mbminval=Services.prefs.getIntPref('extensions.ppost.mbound.minvalue');
  var minpath=Services.prefs.getIntPref('ppost.mbound.minpath');
  var maxpath=Services.prefs.getIntPref('ppost.mbound.maxpath');
 
@@ -261,8 +261,8 @@ function localVerify(sHeaderDate){
  }
 
  //check if stamp values match our preferences
- var hcminval=Services.prefs.getIntPref('ppost.hashcash.minvalue');
- var mbminval=Services.prefs.getIntPref('ppost.mbound.minvalue');
+ var hcminval=Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue');
+ var mbminval=Services.prefs.getIntPref('extensions.ppost.mbound.minvalue');
  var minpath=Services.prefs.getIntPref('ppost.mbound.minpath');
  var maxpath=Services.prefs.getIntPref('ppost.mbound.maxpath');
 
@@ -462,13 +462,13 @@ function updateStamp(){
 
  //try to get the header info
  var aryTokens = getCorrectHeader(gStampTypes.HASHCASH);
- if(aryTokens!=null && aryTokens.length!=0 && Services.prefs.getBoolPref('ppost.hashcash.enable')){
+ if(aryTokens!=null && aryTokens.length!=0 && Services.prefs.getBoolPref('extensions.ppost.hashcash.enable')){
  iStampType=gStampTypes.HASHCASH;
  //for sake of completeness of a gAllStampHeaders
  getCorrectHeader(gStampTypes.MBOUND);
  }else{
  aryTokens = getCorrectHeader(gStampTypes.MBOUND);
- if(aryTokens!=null && aryTokens.length!=0 && Services.prefs.getBoolPref('ppost.mbound.enable')){
+ if(aryTokens!=null && aryTokens.length!=0 && Services.prefs.getBoolPref('extensons.ppost.mbound.enable')){
  iStampType=gStampTypes.MBOUND;
  }
  }

diff --git a/chrome/content/pennyPostOptions.js b/chrome/content/pennyPostOptions.js
@@ -41,12 +41,13 @@ function initDlg() {
 
  dialog.ppost = document.getElementById("extensions.ppost.path.box");
  dialog.javapath = document.getElementById("ppost.javapath.box");
- dialog.hc_enable = document.getElementById("ppost.hashcash.enable");
- dialog.mb_enable = document.getElementById("ppost.mbound.enable");
+ dialog.hc_enable = document.getElementById("extensions.ppost.hashcash.enable");
+ dialog.mb_enable = document.getElementById("extensions.ppost.mbound.enable");
  dialog.def_algo = document.getElementById("extensions.ppost.defalgo");
 
- //prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
- prefs = Services.prefs;
+ prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+ //Services.io and .prefs is not defined because this is a dialog box 
+ //prefs = Services.prefs;
  }catch(ex){
  alert(gStrBundle.getString("windowloadfail") + " - " + ex);
  window.close();
@@ -113,10 +114,17 @@ function onBrowseStampProgram(){
  //ignore
  }
  var rv=filePickerDlg.show();
- if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
- dialog.ppost.value=filePickerDlg.file.path;
- prefs.setCharPref('extensions.ppost.path', dialog.ppost.value);
- }
+ try{ 
+ if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
+ dialog.ppost.value=filePickerDlg.file.path;
+ prefs.setCharPref('extensions.ppost.path', dialog.ppost.value);
+ }
+ }catch(ex){
+ var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
+ .getService(Components.interfaces.nsIConsoleService);
+ consoleService.logStringMessage(ex); 
+ //Components.utils.reportError(ex); doesnt work in a dialog box 
+ } 
 }
 
 /**

diff --git a/chrome/content/pennyPostOptions.xul b/chrome/content/pennyPostOptions.xul
@@ -267,30 +267,30 @@
  <preference id="extensions.ppost.hashcash.minvalue"
  name="extensions.ppost.hashcash.minvalue" type="int">
  </preference>
- <preference id="ppost.hashcash.mintvalue"
- name="ppost.hashcash.mintvalue" type="int">
+ <preference id="extensions.ppost.hashcash.mintvalue"
+ name="extensions.ppost.hashcash.mintvalue" type="int">
  </preference>
- <preference id="ppost.hashcash.mintver"
- name="ppost.hashcash.mintver" type="int">
+ <preference id="extensions.ppost.hashcash.mintver"
+ name="extensions.ppost.hashcash.mintver" type="int">
  </preference>
- <preference id="ppost.hashcash.maxver"
- name="ppost.hashcash.maxver" type="int">
+ <preference id="extensions.ppost.hashcash.maxver"
+ name="extensions.ppost.hashcash.maxver" type="int">
  </preference>
- <preference id="ppost.hashcash.enable"
- name="ppost.hashcash.enable" type="bool">
+ <preference id="extensions.ppost.hashcash.enable"
+ name="extensions.ppost.hashcash.enable" type="bool">
  </preference>
  </preferences>
  <vbox>
- <checkbox id="ppost.hashcash.enable"
- preference="ppost.hashcash.enable" label="&ppost.mb.usehc;"
+ <checkbox id="extensions.ppost.hashcash.enable"
+ preference="extensions.ppost.hashcash.enable" label="&ppost.mb.usehc;"
  accesskey="&ppost.mb.usehc.key;">
  </checkbox>
  <groupbox>
  <caption label="&ppost.opt.stampgen;"></caption>
  <hbox align="center">
  <label value="&ppost.opt.stampvern;:"></label>
  <textbox size="2"
- preference="ppost.hashcash.mintver"
+ preference="extensions.ppost.hashcash.mintver"
  tooltiptext="&ppost.opt.stampvern.note;">
  </textbox>
  </hbox>
@@ -299,7 +299,7 @@
  value="&ppost.opt.stampval; (&ppost.opt.stampval.note;):">
  </label>
  <textbox size="2"
- preference="ppost.hashcash.mintvalue">
+ preference="extensions.ppost.hashcash.mintvalue">
  </textbox>
  </hbox>
  </groupbox>
@@ -309,7 +309,7 @@
  <hbox align="center">
  <label value="&ppost.opt.stampmxver;:"></label>
  <textbox size="2"
- preference="ppost.hashcash.maxver"
+ preference="extensions.ppost.hashcash.maxver"
  tooltiptext="&ppost.opt.stampvern.note;">
  </textbox>
  </hbox>
@@ -344,32 +344,32 @@
  <preference id="ppost.mbound.maxpath"
  name="ppost.mbound.maxpath" type="int">
  </preference>
- <preference id="ppost.mbound.mintvalue"
- name="ppost.mbound.mintvalue" type="int">
+ <preference id="extensions.ppost.mbound.mintvalue"
+ name="extensions.ppost.mbound.mintvalue" type="int">
  </preference>
  <preference id="ppost.mbound.mintpath"
  name="ppost.mbound.mintpath" type="int">
  </preference>
- <preference id="ppost.mbound.mintver"
- name="ppost.mbound.mintver" type="int">
+ <preference id="extensions.ppost.mbound.mintver"
+ name="extensions.ppost.mbound.mintver" type="int">
  </preference>
- <preference id="ppost.mbound.maxver"
- name="ppost.mbound.maxver" type="int">
+ <preference id="extensions.ppost.mbound.maxver"
+ name="extensions.ppost.mbound.maxver" type="int">
  </preference>
- <preference id="ppost.mbound.enable"
- name="ppost.mbound.enable" type="bool">
+ <preference id="extensions.ppost.mbound.enable"
+ name="extensions.ppost.mbound.enable" type="bool">
  </preference>
  </preferences>
  <vbox>
- <checkbox id="ppost.mbound.enable"
- preference="ppost.mbound.enable" label="&ppost.mb.usembound;"
+ <checkbox id="extensions.ppost.mbound.enable"
+ preference="extensions.ppost.mbound.enable" label="&ppost.mb.usembound;"
  accesskey="&ppost.mb.usembound.key;">
  </checkbox>
  <groupbox>
  <caption label="&ppost.opt.stampgen;"></caption>
  <hbox align="center">
  <label value="&ppost.opt.stampvern;:"></label>
- <textbox size="2" preference="ppost.mbound.mintver"
+ <textbox size="2" preference="extensions.ppost.mbound.mintver"
  tooltiptext="&ppost.opt.stampvern.note;">
  </textbox>
  </hbox>
@@ -378,7 +378,7 @@
  value="&ppost.opt.stampval; (&ppost.opt.stampval.note;):">
  </label>
  <textbox size="2"
- preference="ppost.mbound.mintvalue">
+ preference="extensions.ppost.mbound.mintvalue">
  </textbox>
  </hbox>
  <hbox align="center">
@@ -396,7 +396,7 @@
  <hbox align="center">
  <label value="&ppost.opt.stampmxver;:"></label>
  <textbox size="2"
- preference="ppost.mbound.maxver"
+ preference="extensions.ppost.mbound.maxver"
  tooltiptext="&ppost.opt.stampvern.note;">
  </textbox>
  </hbox>

diff --git a/chrome/content/stampProgress.js b/chrome/content/stampProgress.js
@@ -115,9 +115,9 @@ function getMBStamps()
 {
  var status=gStrBundle.getString("genstamp")+': ';
  dialog.status.setAttribute("value", status);
- var mbval=sPrefs.getIntPref('ppost.mbound.mintvalue');
+ var mbval=sPrefs.getIntPref('extensions.ppost.mbound.mintvalue');
  var mbpath=sPrefs.getIntPref('ppost.mbound.mintpath');
- var mbver=sPrefs.getIntPref('ppost.mbound.mintver');
+ var mbver=sPrefs.getIntPref('extensions.ppost.mbound.mintver');
 
  //args to be passed to ex program
  var args=new Array();
@@ -174,8 +174,8 @@ function getHCStamps()
 {
  var status=gStrBundle.getString("genstamp")+': ';
  dialog.status.setAttribute("value", status);
- var hcval=sPrefs.getIntPref('ppost.hashcash.mintvalue');
- var hcver=sPrefs.getIntPref('ppost.hashcash.mintver');
+ var hcval=sPrefs.getIntPref('extensions.ppost.hashcash.mintvalue');
+ var hcver=sPrefs.getIntPref('extensions.ppost.hashcash.mintver');
 
  //args to be passed to ex program
  var args=new Array();
@@ -286,7 +286,7 @@ function StampSend(msgCompFields, iAlgo)
  break; 
  }
 
- if(!sPrefs.getBoolPref('ppost.'+sDefAlgo+'.enable')){
+ if(!sPrefs.getBoolPref('extensions.ppost.'+sDefAlgo+'.enable')){
  throw new Error(gStrBundle.getString("error_nosupport"));
  }
 

diff --git a/defaults/preferences/ppost.js b/defaults/preferences/ppost.js
@@ -1,19 +1,19 @@
 pref('mail.headerScroll.maxheight',0);
 
 pref('extensions.ppost.hashcash.minvalue',17);
-pref('ppost.hashcash.mintvalue',20);
-pref('ppost.hashcash.mintver',1);
-pref('ppost.hashcash.maxver',1);
-pref('ppost.hashcash.enable',true);
+pref('extensions.ppost.hashcash.mintvalue',20);
+pref('extensions.ppost.hashcash.mintver',1);
+pref('extensions.ppost.hashcash.maxver',1);
+pref('extensions.ppost.hashcash.enable',true);
 
-pref('ppost.mbound.enable',true);
+pref('extensions.ppost.mbound.enable',true);
 pref('extensions.ppost.mbound.minvalue',10);
 pref('ppost.mbound.minpath',3000);
 pref('ppost.mbound.maxpath',5000);
-pref('ppost.mbound.mintvalue',12);
+pref('extensions.ppost.mbound.mintvalue',12);
 pref('ppost.mbound.mintpath',3000);
-pref('ppost.mbound.mintver',0);
-pref('ppost.mbound.maxver',0);
+pref('extensions.ppost.mbound.mintver',0);
+pref('extensions.ppost.mbound.maxver',0);
 
 pref('ppost.maxagedays',1);
 pref('extensions.ppost.defalgo','hashcash');