From 73579c56b9887c83e11d470ff1b5c698201d8faf Mon Sep 17 00:00:00 2001 From: William Van Woensel Date: Fri, 9 Oct 2020 09:54:14 -0300 Subject: [PATCH] use configured callback url for non-production servers --- .../youngandroid/YoungAndroidProjectService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/appinventor/appengine/src/com/google/appinventor/server/project/youngandroid/YoungAndroidProjectService.java b/appinventor/appengine/src/com/google/appinventor/server/project/youngandroid/YoungAndroidProjectService.java index 9937bd9ea..83f277929 100644 --- a/appinventor/appengine/src/com/google/appinventor/server/project/youngandroid/YoungAndroidProjectService.java +++ b/appinventor/appengine/src/com/google/appinventor/server/project/youngandroid/YoungAndroidProjectService.java @@ -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() @@ -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() { @@ -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(); } }