Skip to content

Commit d32caa8

Browse files
gasparez15gasparez15
committed
Setup resources for new Android App
1 parent 274978d commit d32caa8

File tree

8 files changed

+214
-29
lines changed

8 files changed

+214
-29
lines changed

‎logicaldoc-android/pom.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,24 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>com.logicaldoc</groupId>
37-
<artifactId>logicaldoc-util</artifactId>
37+
<artifactId>logicaldoc-core</artifactId>
3838
<version>${project.version}</version>
39-
<type>jar</type>
40-
<scope>provided</scope>
41-
</dependency>
39+
<scope>compile</scope>
40+
</dependency>
4241
<dependency>
4342
<groupId>com.logicaldoc</groupId>
44-
<artifactId>logicaldoc-i18n</artifactId>
43+
<artifactId>logicaldoc-util</artifactId>
4544
<version>${project.version}</version>
4645
<type>jar</type>
4746
<scope>provided</scope>
4847
</dependency>
48+
<!-- <dependency>-->
49+
<!-- <groupId>com.logicaldoc</groupId>-->
50+
<!-- <artifactId>logicaldoc-i18n</artifactId>-->
51+
<!-- <version>${project.version}</version>-->
52+
<!-- <type>jar</type>-->
53+
<!-- <scope>provided</scope>-->
54+
<!-- </dependency>-->
4955
<dependency>
5056
<groupId>org.springframework</groupId>
5157
<artifactId>spring-core</artifactId>

‎logicaldoc-android/src/main/webapp/android/capabilities.jsp‎

Lines changed: 165 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,166 @@
11
<%@ page language="java" contentType="application/json" pageEncoding="UTF-8"%>
2-
<%@ page import="com.logicaldoc.core.*" %>
3-
{"lds":{"meta":{"status":"ok","statuscode":100,"message":null},"data":{"capabilities":{"files":{"versioning":true,"undelete":true,"bigfilechunking":true},"files_sharing":{"public":{"enabled":true,"password":{"enforced":false},"expire_date":{"enabled":false},"send_mail":false},"user":{"send_mail":false},"resharing":true},"core":{"pollinterval":60}},"version":{"major":<%=SystemInfo.get().getMajor()%>,"minor":<%=SystemInfo.get().getMinor()%>,"micro":<%=SystemInfo.get().getMicro()%>,"string":"<%=SystemInfo.get().getRelease()%>","edition":""}}}}
2+
<%@ page import="com.logicaldoc.core.SystemInfo" %>
3+
<%@ include file="setcookie.jsp" %>
4+
{
5+
"lds":{
6+
"meta":{
7+
"status":"ok",
8+
"statuscode":200,
9+
"message":"OK",
10+
"totalitems":"",
11+
"itemsperpage":""
12+
},
13+
"data":{
14+
"version":{
15+
"major":<%=SystemInfo.get().getMajor()%>,
16+
"minor":<%=SystemInfo.get().getMinor()%>,
17+
"micro":0,
18+
"string":"<%=SystemInfo.get().getRelease()%>",
19+
"edition":"",
20+
"product":"LogicalDOC"
21+
},
22+
"capabilities":{
23+
"core":{
24+
"pollinterval":30000,
25+
"webdav-root":"\/webdav\/store",
26+
"status":{
27+
"installed":true,
28+
"maintenance":false,
29+
"needsDbUpgrade":false,
30+
"version":"<%=SystemInfo.get().getRelease()%>",
31+
"versionstring":"<%=SystemInfo.get().getRelease()%>",
32+
"edition":"",
33+
"productname":"LogicalDOC",
34+
"product":"LogicalDOC",
35+
"hostname":"3ca5b260b28b"
36+
},
37+
"support-url-signing":true
38+
},
39+
"files":{
40+
"app_providers":[
41+
{
42+
"enabled":false,
43+
"version":"1.1.0",
44+
"apps_url":"\/app\/list",
45+
"open_web_url":"\/app\/open-with-web",
46+
"new_url":"\/app\/new"
47+
}
48+
],
49+
"privateLinks":false,
50+
"privateLinksDetailsParam":false,
51+
"bigfilechunking":true,
52+
"blacklisted_files":[
53+
".htaccess"
54+
],
55+
"blacklisted_files_regex":"\\.(part|filepart)$",
56+
"favorites":true,
57+
"file_locking_support":true,
58+
"file_locking_enable_file_action":false,
59+
"undelete":true,
60+
"versioning":true
61+
},
62+
"checksums":{
63+
"supportedTypes":[
64+
"SHA1"
65+
],
66+
"preferredUploadType":"SHA1"
67+
},
68+
"dav":{
69+
"chunking":"1.0",
70+
"reports":[
71+
"search-files"
72+
],
73+
"propfind":{
74+
"depth_infinity":false
75+
},
76+
"trashbin":"1.0"
77+
},
78+
"files_sharing":{
79+
"api_enabled":false,
80+
"public":{
81+
"enabled":false,
82+
"password":{
83+
"enforced_for":{
84+
"read_only":false,
85+
"read_write":false,
86+
"upload_only":false,
87+
"read_write_delete":false
88+
},
89+
"enforced":false
90+
},
91+
"roles_api":false,
92+
"can_create_public_link":false,
93+
"expire_date":{
94+
"enabled":false
95+
},
96+
"send_mail":false,
97+
"social_share":false,
98+
"upload":true,
99+
"multiple":true,
100+
"supports_upload_only":true,
101+
"defaultPublicLinkShareName":"Public link"
102+
},
103+
"user":{
104+
"send_mail":false,
105+
"profile_picture":true,
106+
"expire_date":{
107+
"enabled":false
108+
}
109+
},
110+
"group":{
111+
"expire_date":{
112+
"enabled":false
113+
}
114+
},
115+
"remote":{
116+
"expire_date":{
117+
"enabled":false
118+
}
119+
},
120+
"resharing":false,
121+
"group_sharing":false,
122+
"auto_accept_share":false,
123+
"share_with_group_members_only":false,
124+
"share_with_membership_groups_only":false,
125+
"can_share":false,
126+
"user_enumeration":{
127+
"enabled":false,
128+
"group_members_only":false
129+
},
130+
"default_permissions":31,
131+
"providers_capabilities":{
132+
"ocinternal":{
133+
"user":[
134+
"shareExpiration"
135+
],
136+
"group":[
137+
"shareExpiration"
138+
],
139+
"link":[
140+
"shareExpiration",
141+
"passwordProtected"
142+
]
143+
},
144+
"ocFederatedSharing":{
145+
"remote":[
146+
"shareExpiration"
147+
]
148+
}
149+
},
150+
"federation":{
151+
"outgoing":true,
152+
"incoming":true
153+
},
154+
"search_min_length":2
155+
},
156+
"notifications":{
157+
"ocs-endpoints":[
158+
"list",
159+
"get",
160+
"delete"
161+
]
162+
}
163+
}
164+
}
165+
}
166+
}

‎logicaldoc-android/src/main/webapp/android/setcookie.jsp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<%@ page language="java" pageEncoding="UTF-8"%>
2+
<%@ page import="com.logicaldoc.core.security.SessionManager"%>
3+
<%!
4+
public void setCookie(HttpServletRequest request, HttpServletResponse response) {
5+
try {
6+
String sid = SessionManager.get().getSessionId(request);
7+
if (sid != null) {
8+
Cookie sidCookie = new Cookie("ldoc-sid", sid);
9+
response.addCookie(sidCookie);
10+
}
11+
} catch (Throwable t) {
12+
t.printStackTrace();
13+
}
14+
}
15+
%>
16+
<% setCookie(request, response); %>

‎logicaldoc-android/src/main/webapp/android/status.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<%@ page language="java" contentType="application/json" pageEncoding="UTF-8"%>
2-
<%@ page import="com.logicaldoc.core.*" %>
2+
<%@ page import="com.logicaldoc.core.SystemInfo" %>
33
{"installed":true,"maintenance":false,"version":"<%=SystemInfo.get().getRelease()%>.0","versionstring":"<%=SystemInfo.get().getRelease()%>","edition":""}

‎logicaldoc-android/src/main/webapp/android/user.jsp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
<%@ page language="java" contentType="application/json" pageEncoding="UTF-8"%>
2-
<%@ page import="javax.servlet.*" %>
3-
<%@ page import="javax.servlet.http.*" %>
4-
<%@ page import="java.util.*" %>
5-
<%@ page import="java.io.*" %>
6-
<%@ page import="com.logicaldoc.core.security.user.*" %>
7-
<%@ page import="com.logicaldoc.util.*" %>
8-
2+
<%@ page import="java.util.Base64" %>
3+
<%@ page import="com.logicaldoc.core.security.user.UserDAO" %>
4+
<%@ page import="com.logicaldoc.core.security.user.User" %>
5+
<%@ page import="com.logicaldoc.util.Context" %>
96
<%
10-
String username="admin";
11-
String displayName="admin";
12-
String email="";
7+
String username = "admin";
8+
String displayName = "admin";
9+
String email = "";
1310
1411
try{
1512
String authorization = request.getHeader("authorization");
16-
if(authorization!=null){
13+
if (authorization != null){
1714
authorization = authorization.substring(authorization.indexOf(" ")).trim();
1815
byte[] decodedBytes = Base64.getDecoder().decode(authorization);
1916
String decodedString = new String(decodedBytes);
@@ -28,4 +25,5 @@
2825
}catch(Throwable t){
2926
}
3027
%>
31-
{"lds":{"meta":{"status":"ok","statuscode":100,"message":"OK","totalitems":"","itemsperpage":""},"data":{"id":"<%=username%>","display-name":"<%=displayName%>","email":"<%=email%>"}}}
28+
<%@ include file="setcookie.jsp" %>
29+
{"lds":{"meta":{"status":"ok","statuscode":200,"message":"OK","totalitems":"","itemsperpage":""},"data":{"id":"<%=username%>","display-name":"<%=displayName%>","email":"<%=email%>","language":"en"}}}

‎logicaldoc-android/src/main/webapp/androidstatus.jsp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<%@ page language="java" contentType="application/json" pageEncoding="UTF-8"%>
2+
<%@ page import="com.logicaldoc.core.SystemInfo" %>
3+
<%@ include file="android/setcookie.jsp" %>
4+
{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"<%=SystemInfo.get().getRelease()%>","versionstring":"<%=SystemInfo.get().getRelease()%>.0","productname":"LogicalDOC","product":"LogicalDOC"}

‎logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/AbstractWebdavServlet.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ public void service(HttpServletRequest request, HttpServletResponse response) {
123123
log.debug("method {} {}", request.getMethod(), methodCode);
124124

125125
Session session = SessionManager.get().getSession(request);
126-
if (session == null)
127-
throw new DavException(HttpServletResponse.SC_FORBIDDEN);
126+
if (session == null)
127+
throw new DavException(HttpServletResponse.SC_UNAUTHORIZED);
128128

129129
SessionManager.get().renew(session.getSid());
130130

@@ -193,12 +193,10 @@ private void handleException(HttpServletRequest request, int methodCode, Throwab
193193

194194
private void handleDavException(WebdavResponse webdavResponse, DavException e) {
195195
log.error(e.getMessage(), e);
196-
if (e.getErrorCode() != HttpServletResponse.SC_UNAUTHORIZED) {
197-
try {
198-
webdavResponse.sendError(e);
199-
} catch (Exception t) {
200-
// Nothing to do
201-
}
196+
try {
197+
webdavResponse.sendError(e);
198+
} catch (Exception t) {
199+
// Nothing to do
202200
}
203201
}
204202

‎logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/endpoint/RestDocumentService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ public Response getThumbnail(@PathParam("type")
972972
Date expdate = cal.getTime();
973973
ZonedDateTime date = ZonedDateTime.ofInstant(expdate.toInstant(), ZoneId.systemDefault());
974974

975-
resp.getHeaders().add("Expires", date.format(DateTimeFormatter.RFC_1123_DATE_TIME));
975+
resp.getHeaders().add("Expires", date.format(DateTimeFormatter.RFC_1123_DATE_TIME));
976976

977977
return resp;
978978
}

0 commit comments

Comments
 (0)