Skip to content

Revert "add showing icon on external folders" #130

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
tobiasKaminsky merged 1 commit into from
Feb 21, 2018
Merged

Revert "add showing icon on external folders" #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions src/com/owncloud/android/lib/common/network/WebdavEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
package com.owncloud.android.lib.common.network;

import android.net.Uri;

import com.owncloud.android.lib.common.utils.Log_OC;

import org.apache.jackrabbit.webdav.MultiStatusResponse;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
Expand All @@ -48,7 +46,6 @@ public class WebdavEntry {
public static final String EXTENDED_PROPERTY_NAME_SIZE = "size";
public static final String EXTENDED_PROPERTY_FAVORITE = "favorite";
public static final String EXTENDED_PROPERTY_IS_ENCRYPTED = "is-encrypted";
public static final String EXTENDED_PROPERTY_MOUNT_TYPE = "mount-type";

public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
Expand All @@ -66,12 +63,9 @@ public class WebdavEntry {
private String mRemoteId;
private boolean mIsFavorite;
private boolean mIsEncrypted;
private MountType mMountType;
private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize;
private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes;

public enum MountType {INTERNAL, EXTERNAL}

public WebdavEntry(MultiStatusResponse ms, String splitElement) {
resetData();
if (ms.getStatus().length != 0) {
Expand Down Expand Up @@ -224,19 +218,6 @@ public WebdavEntry(MultiStatusResponse ms, String splitElement) {
mIsEncrypted = false;
}

// NC mount-type property <nc:mount-type>
prop = propSet.get(EXTENDED_PROPERTY_MOUNT_TYPE, Namespace.getNamespace(NAMESPACE_NC));
if (prop != null) {
String mountTypeValue = (String) prop.getValue();
if ("external".equals(mountTypeValue)) {
mMountType = MountType.EXTERNAL;
} else {
mMountType = MountType.INTERNAL;
}
} else {
mMountType = MountType.INTERNAL;
}

} else {
Log_OC.e("WebdavEntry", "General fuckup, no status for webdav response");
}
Expand Down Expand Up @@ -314,10 +295,6 @@ public BigDecimal quotaAvailableBytes() {
return mQuotaAvailableBytes;
}

public MountType getMountType() {
return mMountType;
}

private void resetData() {
mName = mUri = mContentType = mPermissions = null; mRemoteId = null;
mContentLength = mCreateTimestamp = mModifiedTimestamp = 0;
Expand Down
1 change: 0 additions & 1 deletion src/com/owncloud/android/lib/common/network/WebdavUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public static DavPropertyNameSet getAllPropSet(){
propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
propSet.add(WebdavEntry.EXTENDED_PROPERTY_FAVORITE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
propSet.add(WebdavEntry.EXTENDED_PROPERTY_IS_ENCRYPTED, Namespace.getNamespace(WebdavEntry.NAMESPACE_NC));
propSet.add(WebdavEntry.EXTENDED_PROPERTY_MOUNT_TYPE, Namespace.getNamespace(WebdavEntry.NAMESPACE_NC));

return propSet;
}
Expand Down
7 changes: 4 additions & 3 deletions src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {
int status = client.executeMethod(query);

// check and process response
boolean isSuccess = (status == HttpStatus.SC_MULTI_STATUS || status == HttpStatus.SC_OK);

boolean isSuccess = (
status == HttpStatus.SC_MULTI_STATUS ||
status == HttpStatus.SC_OK
);
if (isSuccess) {
// get data from remote folder
MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
Expand Down Expand Up @@ -170,7 +172,6 @@ private RemoteFile fillOCFile(WebdavEntry we) {
file.setSize(we.size());
file.setFavorite(we.isFavorite());
file.setIsEncrypted(we.isEncrypted());
file.setMountType(we.getMountType());
return file;
}
}
12 changes: 0 additions & 12 deletions src/com/owncloud/android/lib/resources/files/RemoteFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class RemoteFile implements Parcelable, Serializable {
private long mSize;
private boolean mIsFavorite;
private boolean mIsEncrypted;
WebdavEntry.MountType mMountType;

/**
* Getters and Setters.
Expand Down Expand Up @@ -148,14 +147,6 @@ public void setSize(long size) {
mSize = size;
}

public WebdavEntry.MountType getMountType() {
return mMountType;
}

public void setMountType(WebdavEntry.MountType mountType) {
this.mMountType = mountType;
}

public RemoteFile() {
resetData();
}
Expand Down Expand Up @@ -186,7 +177,6 @@ public RemoteFile(WebdavEntry we) {
this.setRemoteId(we.remoteId());
this.setSize(we.size());
this.setFavorite(we.isFavorite());
this.setMountType(we.getMountType());
}

/**
Expand Down Expand Up @@ -244,7 +234,6 @@ public void readFromParcel(Parcel source) {
mSize = source.readLong();
mIsFavorite = Boolean.parseBoolean(source.readString());
mIsEncrypted = Boolean.parseBoolean(source.readString());
mMountType = (WebdavEntry.MountType) source.readSerializable();
}

@Override
Expand All @@ -265,6 +254,5 @@ public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(mSize);
dest.writeString(Boolean.toString(mIsFavorite));
dest.writeString(Boolean.toString(mIsEncrypted));
dest.writeSerializable(mMountType);
}
}