fix: Throwing excpetion when looking for active application only if element is null (#219)

Dan-Maor · mykola-mokhnach · commit 960ab924e778 · 2019-09-18T16:41:10.000+02:00
diff --git a/WebDriverAgentLib/FBApplication.m b/WebDriverAgentLib/FBApplication.m
@@ -81,7 +81,8 @@ + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bun
   }
   if (nil == activeApplicationElement && activeApplicationElements.count > 0) {
     activeApplicationElement = [activeApplicationElements firstObject];
-  } else {
+  }
+  if (nil == activeApplicationElement) {
     NSString *errMsg = @"No applications are currently active";
     @throw [NSException exceptionWithName:FBElementNotVisibleException reason:errMsg userInfo:nil];
   }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bun`
`81`	`81`	`}`
`82`	`82`	`if (nil == activeApplicationElement && activeApplicationElements.count > 0) {`
`83`	`83`	`activeApplicationElement = [activeApplicationElements firstObject];`
`84`		`- } else {`
	`84`	`+ }`
	`85`	`+ if (nil == activeApplicationElement) {`
`85`	`86`	`NSString *errMsg = @"No applications are currently active";`
`86`	`87`	`@throw [NSException exceptionWithName:FBElementNotVisibleException reason:errMsg userInfo:nil];`
`87`	`88`	`}`