Skip to content

use configured callback url for non-production servers #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
william-vw wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

use configured callback url for non-production servers #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...ne/src/com/google/appinventor/server/project/youngandroid/YoungAndroidProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,8 @@ String buildErrorMsg(String exceptionName, URL buildURL, String userId, long pro
private String getBuildServerUrlStr(String userName, String userId,
long projectId, boolean secondBuildserver, String fileName)
throws UnsupportedEncodingException, EncryptionException {
return "http://" + (secondBuildserver ? buildServerHost2.get() : buildServerHost.get()) +

String url = "http://" + (secondBuildserver ? buildServerHost2.get() : buildServerHost.get()) +
"/buildserver/build-all-from-zip-async"
+ "?uname=" + URLEncoder.encode(userName, "UTF-8")
+ (sendGitVersion.get()
Expand All @@ -1240,6 +1241,9 @@ private String getBuildServerUrlStr(String userName, String userId,
+ Security.encryptUserAndProjectId(userId, projectId)
+ "/" + fileName,
"UTF-8");

LOG.info("Build server URL: " + url);
return url;
}

private String getCurrentHost() {
Expand All @@ -1252,8 +1256,10 @@ private String getCurrentHost() {
return appengineHost.get();
}
} else {
// TODO(user): Figure out how to make this more generic
return "localhost:8888";
if (StringUtils.isNullOrEmpty(appengineHost.get()))
return "localhost:8888";
else
return appengineHost.get();
}
}

Expand Down