Bug 826547 - STK proactive command Launch Browser does nothing

Preventing urls that are not matching the web activity to be launched
dscravag · Jan 9, 2013 · 7c0cbed · 7c0cbed
1 parent a069d55
commit 7c0cbed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/apps/settings/js/icc.js b/apps/settings/js/icc.js
@@ -212,8 +212,19 @@
         responseSTKCommand({
           resultCode: icc.STK_RESULT_OK
         });
-        if (!options.confirmMessage || confirm(options.confirmMessage)) {
+        var url = options.url;
-          openLink(options.url);
+        if (url !== null && url.length !== 0) {
+          if (!options.confirmMessage || confirm(options.confirmMessage)) {
+            // Sanitise url just in case it doesn't start with http or https
+            // the web activity won't work, so add by default the http protocol
+            if (url.search("^https?://") == -1) {
+              // Our url doesn't contains the protocol
+              url = 'http://' + url;
+            }
+            openLink(url);
+          }
+        } else {
+          alert(_('operatorService-invalid-url'));
         }
         break;
 

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -530,3 +530,4 @@ user-guide=User guide
 operatorServices=Operator Services
 operatorServices-help=Help
 operatorServices-helpmenu=Help menu
+operatorService-invalid-url=Cannot access the URL