Skip to content

Commit 39fe9dd

Browse files
author
Itgel G
committed
builder bug fixes
1 parent 32d4493 commit 39fe9dd

File tree

1 file changed

+21
-17
lines changed
  • erxeslibrary/src/main/java/com/newmedia/erxeslibrary/configuration

1 file changed

+21
-17
lines changed

erxeslibrary/src/main/java/com/newmedia/erxeslibrary/configuration/Config.java

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -420,28 +420,32 @@ public Builder(@NonNull String brand) {
420420
}
421421

422422
public Builder setApiHost(String apiHost) {
423-
if (apiHost.contains("://")) {
424-
this.protocal = apiHost.substring(0, apiHost.indexOf("://"));
425-
this.apiHost = apiHost.substring(apiHost.indexOf("://") + 3);
426-
} else {
427-
this.apiHost = apiHost;
428-
}
429-
430-
if (this.apiHost.contains("/") && String.valueOf(this.apiHost.charAt(this.apiHost.length() - 1)).equals("/")) {
431-
this.apiHost = this.apiHost.substring(0, this.apiHost.length() - 1);
423+
if(apiHost != null) {
424+
if (apiHost.contains("://")) {
425+
this.protocal = apiHost.substring(0, apiHost.indexOf("://"));
426+
this.apiHost = apiHost.substring(apiHost.indexOf("://") + 3);
427+
} else {
428+
this.apiHost = apiHost;
429+
}
430+
431+
if (this.apiHost.contains("/") && String.valueOf(this.apiHost.charAt(this.apiHost.length() - 1)).equals("/")) {
432+
this.apiHost = this.apiHost.substring(0, this.apiHost.length() - 1);
433+
}
434+
435+
setGqlApiHost();
436+
setSubscriptionHost();
437+
setUploadHost();
432438
}
433-
434-
setGqlApiHost();
435-
setSubscriptionHost();
436-
setUploadHost();
437439
return this;
438440
}
439441

440442
public Builder setOrganizationName(String organizationName) {
441-
this.apiHost = organizationName + ".app.erxes.io/api";
442-
setGqlApiHost();
443-
setSubscriptionHost();
444-
setUploadHost();
443+
if(organizationName != null) {
444+
this.apiHost = organizationName + ".app.erxes.io/api";
445+
setGqlApiHost();
446+
setSubscriptionHost();
447+
setUploadHost();
448+
}
445449
return this;
446450
}
447451

0 commit comments

Comments
 (0)