@glympse-inc/com.glympse.enroute 2.109.289 → 2.109.291

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@glympse-inc/com.glympse.enroute",
3
- "version": "2.109.289",
3
+ "version": "2.109.291",
4
4
  "description": "Glympse En Route Cordova Plugin",
5
5
  "cordova": {
6
6
  "id": "com.glympse.enroute",
package/plugin.xml CHANGED
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
- <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" id="com.glympse.enroute" version="2.109.289">
2
+ <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" id="com.glympse.enroute" version="2.109.291">
3
3
 
4
4
  <name>Glympse En Route</name>
5
5
 
@@ -236,7 +236,7 @@
236
236
  <source url="https://github.com/CocoaPods/Specs.git"/>
237
237
  </config>
238
238
  <pods use-frameworks="true">
239
- <pod name="EnRouteApi" spec="~> 2.109.289"/>
239
+ <pod name="EnRouteApi" spec="~> 2.109.291"/>
240
240
  </pods>
241
241
  </podspec>
242
242
  <!-- RELEASE END -->
@@ -539,7 +539,20 @@ public class EnRoutePlugin extends CordovaPlugin implements GListener
539
539
  {
540
540
  GEnRouteManager manager = ManagerWrapper.instance().manager();
541
541
  GEnRouteHealthCheck enRouteHealthCheck = manager.getEnRouteHealthCheck();
542
- GCoreHealthCheck coreHealthCheck = manager.getGlympse().getCoreHealthCheck();
542
+ GGlympse glympse = manager.getGlympse();
543
+ if ( null == glympse )
544
+ {
545
+ PluginResult pluginResult = new PluginResult(Status.ERROR, "failed");
546
+ callbackContext.sendPluginResult(pluginResult);
547
+ return;
548
+ }
549
+ GCoreHealthCheck coreHealthCheck = glympse.getCoreHealthCheck();
550
+ if ( null == coreHealthCheck )
551
+ {
552
+ PluginResult pluginResult = new PluginResult(Status.ERROR, "failed");
553
+ callbackContext.sendPluginResult(pluginResult);
554
+ return;
555
+ }
543
556
 
544
557
  GPrimitive result = CoreFactory.createPrimitive(CC.PRIMITIVE_TYPE_OBJECT);
545
558
 
@@ -1121,10 +1134,14 @@ public class EnRoutePlugin extends CordovaPlugin implements GListener
1121
1134
  GPrimitive sessionData = CoreFactory.createPrimitive(CC.PRIMITIVE_TYPE_OBJECT);
1122
1135
  sessionData.put("phase", activeTask.getPhase());
1123
1136
 
1124
- GTicket ticket = activeTask.getOperation().getTicket();
1125
- if ( null != ticket )
1137
+ GOperation operation = activeTask.getOperation();
1138
+ if ( null != operation )
1126
1139
  {
1127
- sessionData.put("ticket", commonObjToPrimitive(ticket, config));
1140
+ GTicket ticket = operation.getTicket();
1141
+ if ( null != ticket )
1142
+ {
1143
+ sessionData.put("ticket", commonObjToPrimitive(ticket, config));
1144
+ }
1128
1145
  }
1129
1146
 
1130
1147
  sessionsPrimitive.put("" + session.getId(), sessionData);
@@ -17,7 +17,7 @@ android {
17
17
  }
18
18
 
19
19
  dependencies {
20
- def GLYMPSE_VERSION = '2.109.289'
20
+ def GLYMPSE_VERSION = '2.109.291'
21
21
  implementation "com.glympse:enrouteapi:$GLYMPSE_VERSION"
22
22
  implementation "com.glympse:glympseapi:$GLYMPSE_VERSION"
23
23
  implementation "com.glympse:glympseapi-push:$GLYMPSE_VERSION"
@@ -157,7 +157,20 @@
157
157
  {
158
158
  Glympse::EnRoute::GEnRouteManager manager = [EnRouteWrapper instance].manager;
159
159
  Glympse::EnRoute::GEnRouteHealthCheck enRouteHealthCheck = manager->getEnRouteHealthCheck();
160
- Glympse::GCoreHealthCheck coreHealthCheck = manager->getGlympse()->getCoreHealthCheck();
160
+ Glympse::GGlympse glympse = manager->getGlympse();
161
+ if ( NULL == glympse )
162
+ {
163
+ CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"failed"];
164
+ [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
165
+ return;
166
+ }
167
+ Glympse::GCoreHealthCheck coreHealthCheck = glympse->getCoreHealthCheck();
168
+ if ( NULL == coreHealthCheck )
169
+ {
170
+ CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"failed"];
171
+ [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
172
+ return;
173
+ }
161
174
 
162
175
  Glympse::GPrimitive result = Glympse::CoreFactory::createPrimitive(Glympse::CC::PRIMITIVE_TYPE_OBJECT);
163
176
 
@@ -604,10 +617,14 @@
604
617
  Glympse::GPrimitive sessionData = Glympse::CoreFactory::createPrimitive(Glympse::CC::PRIMITIVE_TYPE_OBJECT);
605
618
  sessionData->put([GETHelpers toGString:@"phase"], activeTask->getPhase());
606
619
 
607
- Glympse::GTicket ticket = activeTask->getOperation()->getTicket();
608
- if ( NULL != ticket )
620
+ Glympse::EnRoute::GOperation operation = activeTask->getOperation();
621
+ if ( NULL != operation )
609
622
  {
610
- sessionData->put([GETHelpers toGString:@"ticket"], [self commonObjToPrimitive:ticket withConfig:config]);
623
+ Glympse::GTicket ticket = operation->getTicket();
624
+ if ( NULL != ticket )
625
+ {
626
+ sessionData->put([GETHelpers toGString:@"ticket"], [self commonObjToPrimitive:ticket withConfig:config]);
627
+ }
611
628
  }
612
629
 
613
630
  NSString *idString = [NSString stringWithFormat:@"%lld", session->getId()];