Skip to content

GitLab

A
appinventor-sources
Commit 9ec3c326 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey I. Schiller
Browse files
Options

Remove Android servlet 

Change-Id: I3ff45bf0aca0163b7a2532388914e0cf8aa18152
parent 1e6b6f4b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 147 deletions
appinventor/appengine/src/com/google/appinventor/server/AndroidServlet.java deleted 100644 → 0
View file @ 1e6b6f4b
// -*- mode: java; c-basic-offset: 2; -*-
// Copyright 2009-2011 Google, All Rights reserved
// Copyright 2011-2019 MIT, All rights reserved
// Released under the Apache License, Version 2.0
// http://www.apache.org/licenses/LICENSE-2.0
package com.google.appinventor.server;
import com.google.appinventor.server.storage.StorageIo;
import com.google.appinventor.server.storage.StorageIoInstanceHolder;
import com.google.appinventor.server.util.CacheHeaders;
import com.google.appinventor.server.util.CacheHeadersImpl;
import com.google.appinventor.shared.rpc.ServerLayout;
import com.google.appinventor.shared.rpc.project.youngandroid.YoungAndroidProjectNode;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Servlet for creating a page for downloading project output on an Android
* device.
*
*/
public class AndroidServlet extends OdeServlet {
// Object used to safely set cache headers in responses
private static final CacheHeaders CACHE_HEADERS = new CacheHeadersImpl();
// Content type for response header (to avoid security vulnerabilities)
private static final String CONTENT_TYPE = "text/html; charset=utf-8";
private final StorageIo storageIo = StorageIoInstanceHolder.getInstance();
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
setDefaultHeader(resp);
PrintWriter out = resp.getWriter();
String logo = "/images/logo_ya.png";
StringBuilder htmlString = new StringBuilder();
htmlString
.append("<html>\n")
.append("<head>\n")
.append("<title>App Inventor for Android Downloads</title>\n")
.append("<link type=\"text/css\" rel=\"stylesheet\" href=\"/Ya.css\">\n")
.append("</head>\n")
.append("<body>\n")
.append("<table width=\"100%\"><tr><td height=\"16\" align=\"left\">\n")
.append("<img src=\"\n")
.append(logo)
.append("\"></td>\n")
.append("<td class=\"ode-Android-banner\">Downloads</td>\n")
.append("</tr></table><hr>\n")
.append("<table width=\"100%\"><tr><td height=\"16\" align=\"left\">\n")
.append("<div class=\"ode-Android-header\">\n")
.append("<b>\n")
.append(userInfoProvider.getUserEmail())
.append("</b> | <a href='\n")
.append(ServerLayout.ODE_LOGOUT_URL)
.append("'>Sign Out</a>\n")
.append("</div>\n")
.append("</td></tr></table>\n")
.append("<table width=\"100%\"><tr><td height=\"16\" align=\"left\">\n")
.append("<div class=\"ode-Android-caption\">\n")
.append("Projects\n")
.append("</div>\n")
.append("</td></tr></table>\n");
out.println(htmlString.toString());
out.println("<table class=\"ode-Android-body\">");
String userId = userInfoProvider.getUserId();
List<Long> projectIds = storageIo.getProjects(userId);
for (long projectId : projectIds) {
String projectType = storageIo.getProjectType(userId, projectId);
String projectName = storageIo.getProjectName(userId, projectId);
if (projectType.equals(YoungAndroidProjectNode.YOUNG_ANDROID_PROJECT_TYPE)) {
String target = YoungAndroidProjectNode.YOUNG_ANDROID_TARGET_ANDROID;
// TODO(lizlooney) - we need a 16x16 image for young android.
String icon = "/images/logo_16.png";
if (containsAndroidTarget(storageIo.getProjectOutputFiles(userId, projectId), target)) {
out.println(makeAndroidTargetRow(projectId, projectName, target, icon));
}
}
}
out.println("</table>");
out.println("<table width=\"100%\"><tr><td height=\"12\" align=\"left\">" +
"<div class=\"ode-Android-footer\">" +
"</div>" +
"</td></tr></table>" +
"</body>" +
"</html>");
}
/*
* Indicates whether the project contains any project output files for Android.
*/
private static boolean containsAndroidTarget(List<String> outputFiles, String target) {
for (String outputFile : outputFiles) {
if (outputFile.startsWith("build/" + target + '/')) {
return true;
}
}
return false;
}
private static String makeAndroidTargetRow(long projectId, String projectName,
String target, String image) {
String projectUrl = ServerLayout.genFullDownloadPath(projectId, target);
return "<tr><td><img src=\"" + image + "\" width=16 height=16> <a href=\"" + projectUrl + "\">" +
projectName + "</a></td></tr>";
}
/*
* Set a default http header to avoid security vulnerabilities.
*/
private static void setDefaultHeader(HttpServletResponse resp) {
CACHE_HEADERS.setNotCacheable(resp);
resp.setContentType(CONTENT_TYPE);
}
}
appinventor/appengine/src/com/google/appinventor/shared/rpc/ServerLayout.java
View file @ 9ec3c326
...@@ -62,13 +62,6 @@ public class ServerLayout { ...@@ -62,13 +62,6 @@ public class ServerLayout {
*/ */
public static final String GALLERY_SERVLET = "gallery_servlet"; public static final String GALLERY_SERVLET = "gallery_servlet";
/**
* Relative path of the {@link com.google.appinventor.server.AndroidServlet}
* within the ODE GWT module.
*/
public static final String ANDROID_SERVLET = "android";
/** /**
* Relative path of the * Relative path of the
* {@link com.google.appinventor.shared.rpc.user.UserInfoService} within the * {@link com.google.appinventor.shared.rpc.user.UserInfoService} within the
......
appinventor/appengine/war/WEB-INF/appengine-web.xml
View file @ 9ec3c326
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
<include path="/ode/**.nocache.*" expiration="0s" /> <include path="/ode/**.nocache.*" expiration="0s" />
<include path="/blocklyframe.html" expiration="0s" /> <include path="/blocklyframe.html" expiration="0s" />
<include path="/index.html" expiration="0s" /> <include path="/index.html" expiration="0s" />
<include path="/android" expiration="0s" />
<include path="/JSONGenerator/*" expiration="0s" /> <include path="/JSONGenerator/*" expiration="0s" />
<include path="/ode/**.cache.*" expiration="365d" /> <include path="/ode/**.cache.*" expiration="365d" />
......
appinventor/appengine/war/WEB-INF/web.xml
View file @ 9ec3c326
...@@ -221,20 +221,6 @@ ...@@ -221,20 +221,6 @@
<servlet-name>cloudDBAuthService</servlet-name> <servlet-name>cloudDBAuthService</servlet-name>
</filter-mapping> </filter-mapping>
<!-- android -->
<servlet>
<servlet-name>androidServlet</servlet-name>
<servlet-class>com.google.appinventor.server.AndroidServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>androidServlet</servlet-name>
<url-pattern>/android/*</url-pattern>
</servlet-mapping>
<filter-mapping>
<filter-name>odeAuthFilter</filter-name>
<servlet-name>androidServlet</servlet-name>
</filter-mapping>
<!-- accept tos --> <!-- accept tos -->
<servlet> <servlet>
<servlet-name>tosServlet</servlet-name> <servlet-name>tosServlet</servlet-name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment