Skip to content

Removed unused capabilities and update tests #2874

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

Merged
abelgardep merged 2 commits into from
May 15, 2020
Merged

Removed unused capabilities and update tests #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff16db9
Removed unused capabilities and update tests
abelgardep Apr 30, 2020
ae40401
Update library reference after rebase
abelgardep May 6, 2020
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
2 changes: 1 addition & 1 deletion owncloud-android-library
Open in desktop
Submodule owncloud-android-library updated 1 files
+0 −2 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt
20 changes: 2 additions & 18 deletions owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ class FileDataStorageManager {
sortOrder = "$FILE_PATH ASC "
)
} catch (e: RemoteException) {
Timber.e(e.message)
Timber.e(e)
null
}

Expand Down Expand Up @@ -923,7 +923,7 @@ class FileDataStorageManager {
sortOrder = null
)
} catch (e: RemoteException) {
Timber.e(e.message)
Timber.e(e)
return ret
}

Expand Down Expand Up @@ -1246,11 +1246,9 @@ class FileDataStorageManager {
put(CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED, capability.filesSharingPublicExpireDateEnabled.value)
put(CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS, capability.filesSharingPublicExpireDateDays)
put(CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED, capability.filesSharingPublicExpireDateEnforced.value)
put(CAPABILITIES_SHARING_PUBLIC_SEND_MAIL, capability.filesSharingPublicSendMail.value)
put(CAPABILITIES_SHARING_PUBLIC_UPLOAD, capability.filesSharingPublicUpload.value)
put(CAPABILITIES_SHARING_PUBLIC_MULTIPLE, capability.filesSharingPublicMultiple.value)
put(CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY, capability.filesSharingPublicSupportsUploadOnly.value)
put(CAPABILITIES_SHARING_USER_SEND_MAIL, capability.filesSharingUserSendMail.value)
put(CAPABILITIES_SHARING_RESHARING, capability.filesSharingResharing.value)
put(CAPABILITIES_SHARING_FEDERATION_OUTGOING, capability.filesSharingFederationOutgoing.value)
put(CAPABILITIES_SHARING_FEDERATION_INCOMING, capability.filesSharingFederationIncoming.value)
Expand Down Expand Up @@ -1396,13 +1394,6 @@ class FileDataStorageManager {
)
)
),
filesSharingPublicSendMail = CapabilityBooleanType.fromValue(
c.getInt(
c.getColumnIndex(
CAPABILITIES_SHARING_PUBLIC_SEND_MAIL
)
)
),
filesSharingPublicUpload = CapabilityBooleanType.fromValue(
c.getInt(
c.getColumnIndex(
Expand All @@ -1424,13 +1415,6 @@ class FileDataStorageManager {
)
)
),
filesSharingUserSendMail = CapabilityBooleanType.fromValue(
c.getInt(
c.getColumnIndex(
CAPABILITIES_SHARING_USER_SEND_MAIL
)
)
),
filesSharingResharing = CapabilityBooleanType.fromValue(
c.getInt(
c.getColumnIndex(
Expand Down
2 changes: 0 additions & 2 deletions owncloudApp/src/main/java/com/owncloud/android/db/ProviderMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,9 @@ static public class ProviderTableMeta implements BaseColumns {
"sharing_public_expire_date_days";
public static final String CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED =
"sharing_public_expire_date_enforced";
public static final String CAPABILITIES_SHARING_PUBLIC_SEND_MAIL = "sharing_public_send_mail";
public static final String CAPABILITIES_SHARING_PUBLIC_UPLOAD = "sharing_public_upload";
public static final String CAPABILITIES_SHARING_PUBLIC_MULTIPLE = "sharing_public_multiple";
public static final String CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY = "supports_upload_only";
public static final String CAPABILITIES_SHARING_USER_SEND_MAIL = "sharing_user_send_mail";
public static final String CAPABILITIES_SHARING_RESHARING = "sharing_resharing";
public static final String CAPABILITIES_SHARING_FEDERATION_OUTGOING = "sharing_federation_outgoing";
public static final String CAPABILITIES_SHARING_FEDERATION_INCOMING = "sharing_federation_incoming";
Expand Down
6 changes: 0 additions & 6 deletions owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,11 +1091,9 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENABLED + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS + " INTEGER, "
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SEND_MAIL + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_UPLOAD + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_MULTIPLE + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_USER_SEND_MAIL + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_RESHARING + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_OUTGOING + " INTEGER, " // boolean
+ ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING + " INTEGER, " // boolean
Expand Down Expand Up @@ -1434,16 +1432,12 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_DAYS
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED] =
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_EXPIRE_DATE_ENFORCED
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SEND_MAIL] =
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SEND_MAIL
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_UPLOAD] =
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_UPLOAD
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_MULTIPLE] =
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_MULTIPLE
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY] =
ProviderTableMeta.CAPABILITIES_SHARING_PUBLIC_SUPPORTS_UPLOAD_ONLY
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_USER_SEND_MAIL] =
ProviderTableMeta.CAPABILITIES_SHARING_USER_SEND_MAIL
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_RESHARING] =
ProviderTableMeta.CAPABILITIES_SHARING_RESHARING
capabilityProjectionMap[ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_OUTGOING] =
Expand Down
Loading