Fixed Nabi Issues 49466,55718,55225,52332

[apps/osp/Internet.git] / src / IntSharePopup.cpp

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index b92e1d0..b6cfe70 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -196,6 +196,14 @@ SharePopup::OnTimerExpired(Timer& timer)
 {
        Popup::SetShowState(false);
        Popup::Show();
+       Frame* pCurrentFrame = null;
+       pCurrentFrame = Application::GetInstance()->GetAppFrame()->GetFrame();
+
+       if (pCurrentFrame != null)
+       {
+               pCurrentFrame->SetEnabled(true);
+               pCurrentFrame->Invalidate(true);
+       }
 }
 
 void
@@ -367,8 +375,10 @@ SharePopup::GetItemCount(void)
        for(int pos = 0; pos < count; pos++)
        {
                AppControl * pControl = dynamic_cast<AppControl*>(__pAppControlList->GetAt(pos));
-               if(pControl->GetAppName().Equals(L"Messages",false) == true || pControl->GetAppName().Equals(L"Email",false) == true )
+               AppLog("pControl->GetAppName() %ls",pControl->GetAppName().GetPointer());
+               if( (pControl->GetAppName().Equals(L"Messages",false) == true && pControl->GetAppId().Equals(L"8r4r5ddzzn.Messages",false) == true)  || (pControl->GetAppName().Equals(L"Email",false) == true && pControl->GetAppId().Equals(L"vxqbrefica.Email",false) == true) )
                {
+                       AppLog("Removed pControl->GetAppName %ls pControl->GetAppId() %ls",pControl->GetAppName().GetPointer(),pControl->GetAppId().GetPointer());
                        __pAppControlList->RemoveAt(pos,true);
                        pos--;
                        count --;
@@ -377,7 +387,9 @@ SharePopup::GetItemCount(void)
        }
 
        AppLog("removeCount %d",removeCount);
-       return count+removeCount;
+       if(count+removeCount >=2)
+               return count+removeCount;
+       return 2;
 
 }
 
@@ -398,9 +410,6 @@ void SharePopup::RemoveAllShareInfo()
        __pShareList->RemoveAll();
 }
 
-
-
-
 void
 SharePopup::StartAppControl(int index)
 {