commit 2a0eb2acdc369734e1264c8d8f9955d704508b53
author dujin.cha <dujin.cha@samsung.com> Fri Nov 11 15:03:57 2011 +0900
committer John Wang <johnwang@google.com> Mon Nov 21 16:24:23 2011 -0800
tree c8fbfe0956be37c3b02544f08985dcdc1c2c93f8
parent 60ead5efbc6de95d329332710a26256195acfdfd

Update STK application

1. Add checking for 'https://' url in LaunchBrowser()
2. Add 'Removing idle mode text' in launchIdleText()
   -the Idle text should be deleted while processing 'refresh'

Bug : 5602742
Change-Id: Ifc374966a3fa91af0750dddfc6a8d713fd93bc45
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index cd47716..54698dc 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -657,7 +657,7 @@
         Uri data = null;
         if (settings.url != null) {
             CatLog.d(this, "settings.url = " + settings.url);
-            if (settings.url.startsWith("http://")) {
+            if ((settings.url.startsWith("http://") || (settings.url.startsWith("https://")))) {
                 data = Uri.parse(settings.url);
             } else {
                 String modifiedUrl = "http://" + settings.url;
@@ -714,8 +714,10 @@
 
     private void launchIdleText() {
         TextMessage msg = mCurrentCmd.geTextMessage();
+
         if (msg == null) {
-            CatLog.d(this, "mCurrentCmd.getTextMessage is NULL");
+            CatLog.d(this, "mCurrent.getTextMessage is NULL");
+            mNotificationManager.cancel(STK_NOTIFICATION_ID);
             return;
         }
         if (msg.text == null) {