Fixed for app crash if push configured

(cherry picked from commit aff0794)
rhomobile · Jan 11, 2016 · 4f89e04 · 4f89e04
1 parent 030753a
commit 4f89e04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/commonAPI/coreapi/ext/shared/PushImpl.cpp b/lib/commonAPI/coreapi/ext/shared/PushImpl.cpp
@@ -37,7 +37,14 @@ namespace push {
 //----------------------------------------------------------------------------------------------------------------------
 CPushManager* CPushManager::getInstance()
 {
-    return reinterpret_cast<CPushManager*>(CPushFactoryBase::getInstance()->getModuleSingleton());
+    CPushFactoryBase* pInstance = CPushFactoryBase::getInstance();
+    if (pInstance){
+        LOG(TRACE) + "Returning CPushManager Instance";
+        return reinterpret_cast<CPushManager*>(pInstance->getModuleSingleton());
+    }else{
+        LOG(TRACE) + "CPushFactoryBase::getInstance is empty. Returning 0";
+        return 0;
+    }
 }
 
 //----------------------------------------------------------------------------------------------------------------------

diff --git a/platform/android/Rhodes/jni/src/rhodesapp.cpp b/platform/android/Rhodes/jni/src/rhodesapp.cpp
@@ -332,7 +332,12 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_setPushRegistrat
     std::string strType = jType ? rho_cast<std::string>(env, jType) : "";
     std::string deviceId = rho_cast<std::string>(env, jId);
 
-    rho::push::CPushManager::getInstance()->setDeviceId(strType, deviceId);
+    rho::push::CPushManager* pInstance = rho::push::CPushManager::getInstance();
+    if (pInstance){
+        pInstance->setDeviceId(strType, deviceId);
+    }else{
+        RAWTRACE("rho::push::CPushManager::getInstance is empty");
+    }
 }
 
 RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_callPushCallback