Merge pull request #102 from thomasvl/background_task_tweaks

Remove direct use of UIApplication from GTLR.
google · Mar 13, 2017 · a630e1b · a630e1b
2 parents ac844a2 + d6c2dc3
commit a630e1b
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/Source/Objects/GTLRService.m b/Source/Objects/GTLRService.m
@@ -2578,7 +2578,22 @@ - (void)cancelTicket {
   id<GTMUIApplicationProtocol> app = [GTMSessionFetcher substituteUIApplication];
   if (app) return app;
 
-  return (id<GTMUIApplicationProtocol>)[UIApplication sharedApplication];
+  static Class applicationClass = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    BOOL isAppExtension = [[[NSBundle mainBundle] bundlePath] hasSuffix:@".appex"];
+    if (!isAppExtension) {
+      Class cls = NSClassFromString(@"UIApplication");
+      if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) {
+        applicationClass = cls;
+      }
+    }
+  });
+
+  if (applicationClass) {
+    app = (id<GTMUIApplicationProtocol>)[applicationClass sharedApplication];
+  }
+  return app;
 }
 #endif //  GTM_BACKGROUND_TASK_FETCHING