Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
nextcloud-android-lib
Commits
a70b8fe9
Commit
a70b8fe9
authored
Mar 06, 2019
by
vince-bourgmayer
Browse files
port commit c884d1f1d844c8df2ce2c347f5a1381ff1043aff from nextcloudAndroidProject
parent
c6b717a0
Changes
4
Hide whitespace changes
Inline
Side-by-side
build.gradle
View file @
a70b8fe9
...
...
@@ -4,7 +4,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
2.1
'
classpath
'com.android.tools.build:gradle:3.
3.2
'
classpath
'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
a70b8fe9
#T
hu Oct 25 12:00:00
CET 201
8
#T
ue Mar 05 13:55:31
CET 201
9
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
6
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
10.1
-all.zip
src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
View file @
a70b8fe9
...
...
@@ -134,7 +134,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
private
static
final
String
NODE_RICHDOCUMENTS
=
"richdocuments"
;
private
static
final
String
NODE_MIMETYPES
=
"mimetypes"
;
private
static
final
String
NODE_RICHDOCUMENTS_DIRECT_EDITING
=
"direct_editing"
;
private
static
final
String
NODE_RICHDOCUMENTS_TEMPLATES
=
"templates"
;
// activity
private
static
final
String
NODE_ACTIVITY
=
"activity"
;
...
...
@@ -403,10 +403,10 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
}
if
(
respCapabilities
.
has
(
NODE_RICHDOCUMENTS
))
{
JSONObject
richDocumentsCapability
=
respCapabilities
.
getJSONObject
(
NODE_RICHDOCUMENTS
);
capability
.
setRichDocuments
(
CapabilityBooleanType
.
TRUE
);
JSONArray
mimeTypesArray
=
respCapabilities
.
getJSONObject
(
NODE_RICHDOCUMENTS
)
.
getJSONArray
(
NODE_MIMETYPES
);
JSONArray
mimeTypesArray
=
richDocumentsCapability
.
getJSONArray
(
NODE_MIMETYPES
);
ArrayList
<
String
>
mimeTypes
=
new
ArrayList
<>();
...
...
@@ -416,11 +416,25 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
capability
.
setRichDocumentsMimeTypeList
(
mimeTypes
);
if
(
respCapabilities
.
has
(
NODE_RICHDOCUMENTS_DIRECT_EDITING
))
{
capability
.
setRichDocumentsDirectEditing
(
CapabilityBooleanType
.
TRUE
);
if
(
richDocumentsCapability
.
has
(
NODE_RICHDOCUMENTS_DIRECT_EDITING
))
{
if
(
richDocumentsCapability
.
getBoolean
(
NODE_RICHDOCUMENTS_DIRECT_EDITING
))
{
capability
.
setRichDocumentsDirectEditing
(
CapabilityBooleanType
.
TRUE
);
}
else
{
capability
.
setRichDocumentsDirectEditing
(
CapabilityBooleanType
.
FALSE
);
}
}
else
{
capability
.
setRichDocumentsDirectEditing
(
CapabilityBooleanType
.
FALSE
);
}
if
(
richDocumentsCapability
.
has
(
NODE_RICHDOCUMENTS_TEMPLATES
))
{
if
(
richDocumentsCapability
.
getBoolean
(
NODE_RICHDOCUMENTS_TEMPLATES
))
{
capability
.
setRichdocumentsTemplatesAvailable
(
CapabilityBooleanType
.
TRUE
);
}
else
{
capability
.
setRichdocumentsTemplatesAvailable
(
CapabilityBooleanType
.
FALSE
);
}
}
else
{
capability
.
setRichdocumentsTemplatesAvailable
(
CapabilityBooleanType
.
FALSE
);
}
}
else
{
capability
.
setRichDocuments
(
CapabilityBooleanType
.
FALSE
);
}
...
...
src/com/owncloud/android/lib/resources/status/OCCapability.java
View file @
a70b8fe9
...
...
@@ -91,6 +91,7 @@ public class OCCapability {
// Richdocuments
private
CapabilityBooleanType
richdocuments
;
private
CapabilityBooleanType
richdocumentsDirectEditing
;
private
CapabilityBooleanType
richdocumentsTemplatesAvailable
;
private
List
<
String
>
richdocumentsMimeTypeList
;
private
CapabilityBooleanType
activity
;
...
...
@@ -145,6 +146,7 @@ public class OCCapability {
richdocuments
=
CapabilityBooleanType
.
UNKNOWN
;
richdocumentsMimeTypeList
=
new
ArrayList
<>();
richdocumentsDirectEditing
=
CapabilityBooleanType
.
FALSE
;
richdocumentsTemplatesAvailable
=
CapabilityBooleanType
.
FALSE
;
}
...
...
@@ -496,4 +498,13 @@ public class OCCapability {
public
CapabilityBooleanType
getRichDocumentsDirectEditing
()
{
return
richdocumentsDirectEditing
;
}
public
CapabilityBooleanType
getRichdocumentsTemplatesAvailable
()
{
return
richdocumentsTemplatesAvailable
;
}
public
void
setRichdocumentsTemplatesAvailable
(
CapabilityBooleanType
richdocumentsTemplatesAvailable
)
{
this
.
richdocumentsTemplatesAvailable
=
richdocumentsTemplatesAvailable
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment