flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Rename remoteId parameter to id within RemoteShare

Browse Source
This commit is contained in:
davigonz 2019-04-16 16:42:50 +02:00
parent 8fa7439492
commit 688a978b1e
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt
View File

@ -146,7 +146,7 @@ class CreateRemoteShareOperation
// retrieve more info - POST only returns the index of the new share // retrieve more info - POST only returns the index of the new share
val emptyShare = result.data.shares[0] val emptyShare = result.data.shares[0]
val getInfo = GetRemoteShareOperation( val getInfo = GetRemoteShareOperation(
emptyShare.remoteId emptyShare.id
) )
result = getInfo.execute(client) result = getInfo.execute(client)
} }

8
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
View File

@ -38,6 +38,7 @@ import java.io.Serializable
* @author David González Verdugo * @author David González Verdugo
*/ */
class RemoteShare : Parcelable, Serializable { class RemoteShare : Parcelable, Serializable {
var id: Long = 0
var shareWith: String = "" var shareWith: String = ""
var path: String = "" var path: String = ""
var token: String = "" var token: String = ""
@ -53,7 +54,6 @@ class RemoteShare : Parcelable, Serializable {
var expirationDate: Long = INIT_EXPIRATION_DATE_IN_MILLIS var expirationDate: Long = INIT_EXPIRATION_DATE_IN_MILLIS
var isFolder: Boolean = false var isFolder: Boolean = false
var userId: Long = 0 var userId: Long = 0
var remoteId: Long = 0
val isPasswordProtected: Boolean val isPasswordProtected: Boolean
get() = ShareType.PUBLIC_LINK == shareType && shareWith.isNotEmpty() get() = ShareType.PUBLIC_LINK == shareType && shareWith.isNotEmpty()
@ -75,6 +75,7 @@ class RemoteShare : Parcelable, Serializable {
* Used internally. Reset all file properties * Used internally. Reset all file properties
*/ */
private fun resetData() { private fun resetData() {
id = -1
shareWith = "" shareWith = ""
path = "" path = ""
token = "" token = ""
@ -91,7 +92,6 @@ class RemoteShare : Parcelable, Serializable {
sharedWithAdditionalInfo = "" sharedWithAdditionalInfo = ""
isFolder = false isFolder = false
userId = -1 userId = -1
remoteId = -1
} }
/** /**
@ -104,6 +104,7 @@ class RemoteShare : Parcelable, Serializable {
} }
fun readFromParcel(source: Parcel) { fun readFromParcel(source: Parcel) {
id = source.readLong()
shareWith = source.readString() shareWith = source.readString()
path = source.readString() path = source.readString()
token = source.readString() token = source.readString()
@ -123,12 +124,12 @@ class RemoteShare : Parcelable, Serializable {
expirationDate = source.readLong() expirationDate = source.readLong()
isFolder = source.readInt() == 0 isFolder = source.readInt() == 0
userId = source.readLong() userId = source.readLong()
remoteId = source.readLong()
} }
override fun describeContents(): Int = this.hashCode() override fun describeContents(): Int = this.hashCode()
override fun writeToParcel(dest: Parcel, flags: Int) { override fun writeToParcel(dest: Parcel, flags: Int) {
dest.writeLong(id)
dest.writeString(shareWith) dest.writeString(shareWith)
dest.writeString(path) dest.writeString(path)
dest.writeString(token) dest.writeString(token)
@ -144,7 +145,6 @@ class RemoteShare : Parcelable, Serializable {
dest.writeLong(expirationDate) dest.writeLong(expirationDate)
dest.writeInt(if (isFolder) 1 else 0) dest.writeInt(if (isFolder) 1 else 0)
dest.writeLong(userId) dest.writeLong(userId)
dest.writeLong(remoteId)
} }
companion object { companion object {

42
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
View File

@ -179,7 +179,7 @@ class ShareXMLParser {
} else if (name.equals(NODE_ID, ignoreCase = true)) {// Parse Create XML Response } else if (name.equals(NODE_ID, ignoreCase = true)) {// Parse Create XML Response
share = RemoteShare() share = RemoteShare()
val value = readNode(parser, NODE_ID) val value = readNode(parser, NODE_ID)
share.remoteId = Integer.parseInt(value).toLong() share.id = Integer.parseInt(value).toLong()
} else if (name.equals(NODE_URL, ignoreCase = true)) { } else if (name.equals(NODE_URL, ignoreCase = true)) {
// NOTE: this field is received in all the public shares from OC 9.0.0 // NOTE: this field is received in all the public shares from OC 9.0.0
@ -218,7 +218,7 @@ class ShareXMLParser {
private fun readElement(parser: XmlPullParser, shares: ArrayList<RemoteShare>) { private fun readElement(parser: XmlPullParser, shares: ArrayList<RemoteShare>) {
parser.require(XmlPullParser.START_TAG, ns, NODE_ELEMENT) parser.require(XmlPullParser.START_TAG, ns, NODE_ELEMENT)
val share = RemoteShare() val remoteShare = RemoteShare()
//Log_OC.d(TAG, "---- NODE ELEMENT ---"); //Log_OC.d(TAG, "---- NODE ELEMENT ---");
while (parser.next() != XmlPullParser.END_TAG) { while (parser.next() != XmlPullParser.END_TAG) {
@ -235,46 +235,46 @@ class ShareXMLParser {
readElement(parser, shares) readElement(parser, shares)
} else if (name.equals(NODE_ID, ignoreCase = true)) { } else if (name.equals(NODE_ID, ignoreCase = true)) {
share.remoteId = Integer.parseInt(readNode(parser, NODE_ID)).toLong() remoteShare.id = Integer.parseInt(readNode(parser, NODE_ID)).toLong()
} else if (name.equals(NODE_ITEM_TYPE, ignoreCase = true)) { } else if (name.equals(NODE_ITEM_TYPE, ignoreCase = true)) {
share.isFolder = readNode(parser, NODE_ITEM_TYPE).equals(TYPE_FOLDER, ignoreCase = true) remoteShare.isFolder = readNode(parser, NODE_ITEM_TYPE).equals(TYPE_FOLDER, ignoreCase = true)
fixPathForFolder(share) fixPathForFolder(remoteShare)
} else if (name.equals(NODE_ITEM_SOURCE, ignoreCase = true)) { } else if (name.equals(NODE_ITEM_SOURCE, ignoreCase = true)) {
share.itemSource = java.lang.Long.parseLong(readNode(parser, NODE_ITEM_SOURCE)) remoteShare.itemSource = java.lang.Long.parseLong(readNode(parser, NODE_ITEM_SOURCE))
} else if (name.equals(NODE_PARENT, ignoreCase = true)) { } else if (name.equals(NODE_PARENT, ignoreCase = true)) {
readNode(parser, NODE_PARENT) readNode(parser, NODE_PARENT)
} else if (name.equals(NODE_SHARE_TYPE, ignoreCase = true)) { } else if (name.equals(NODE_SHARE_TYPE, ignoreCase = true)) {
val value = Integer.parseInt(readNode(parser, NODE_SHARE_TYPE)) val value = Integer.parseInt(readNode(parser, NODE_SHARE_TYPE))
share.shareType = ShareType.fromValue(value) remoteShare.shareType = ShareType.fromValue(value)
} else if (name.equals(NODE_SHARE_WITH, ignoreCase = true)) { } else if (name.equals(NODE_SHARE_WITH, ignoreCase = true)) {
share.shareWith = readNode(parser, NODE_SHARE_WITH) remoteShare.shareWith = readNode(parser, NODE_SHARE_WITH)
} else if (name.equals(NODE_FILE_SOURCE, ignoreCase = true)) { } else if (name.equals(NODE_FILE_SOURCE, ignoreCase = true)) {
share.fileSource = java.lang.Long.parseLong(readNode(parser, NODE_FILE_SOURCE)) remoteShare.fileSource = java.lang.Long.parseLong(readNode(parser, NODE_FILE_SOURCE))
} else if (name.equals(NODE_PATH, ignoreCase = true)) { } else if (name.equals(NODE_PATH, ignoreCase = true)) {
share.path = readNode(parser, NODE_PATH) remoteShare.path = readNode(parser, NODE_PATH)
fixPathForFolder(share) fixPathForFolder(remoteShare)
} else if (name.equals(NODE_PERMISSIONS, ignoreCase = true)) { } else if (name.equals(NODE_PERMISSIONS, ignoreCase = true)) {
share.permissions = Integer.parseInt(readNode(parser, NODE_PERMISSIONS)) remoteShare.permissions = Integer.parseInt(readNode(parser, NODE_PERMISSIONS))
} else if (name.equals(NODE_STIME, ignoreCase = true)) { } else if (name.equals(NODE_STIME, ignoreCase = true)) {
share.sharedDate = java.lang.Long.parseLong(readNode(parser, NODE_STIME)) remoteShare.sharedDate = java.lang.Long.parseLong(readNode(parser, NODE_STIME))
} else if (name.equals(NODE_EXPIRATION, ignoreCase = true)) { } else if (name.equals(NODE_EXPIRATION, ignoreCase = true)) {
val value = readNode(parser, NODE_EXPIRATION) val value = readNode(parser, NODE_EXPIRATION)
if (value.length != 0) { if (value.length != 0) {
share.expirationDate = WebdavUtils.parseResponseDate(value)!!.time remoteShare.expirationDate = WebdavUtils.parseResponseDate(value)!!.time
} }
} else if (name.equals(NODE_TOKEN, ignoreCase = true)) { } else if (name.equals(NODE_TOKEN, ignoreCase = true)) {
share.token = readNode(parser, NODE_TOKEN) remoteShare.token = readNode(parser, NODE_TOKEN)
} else if (name.equals(NODE_STORAGE, ignoreCase = true)) { } else if (name.equals(NODE_STORAGE, ignoreCase = true)) {
readNode(parser, NODE_STORAGE) readNode(parser, NODE_STORAGE)
@ -282,27 +282,27 @@ class ShareXMLParser {
readNode(parser, NODE_MAIL_SEND) readNode(parser, NODE_MAIL_SEND)
} else if (name.equals(NODE_SHARE_WITH_DISPLAY_NAME, ignoreCase = true)) { } else if (name.equals(NODE_SHARE_WITH_DISPLAY_NAME, ignoreCase = true)) {
share.sharedWithDisplayName = readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME) remoteShare.sharedWithDisplayName = readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME)
} else if (name.equals(NODE_URL, ignoreCase = true)) { } else if (name.equals(NODE_URL, ignoreCase = true)) {
val value = readNode(parser, NODE_URL) val value = readNode(parser, NODE_URL)
share.shareLink = value remoteShare.shareLink = value
} else if (name.equals(NODE_NAME, ignoreCase = true)) { } else if (name.equals(NODE_NAME, ignoreCase = true)) {
share.name = readNode(parser, NODE_NAME) remoteShare.name = readNode(parser, NODE_NAME)
} else { } else {
skip(parser) skip(parser)
} }
} }
if (isValidShare(share)) { if (isValidShare(remoteShare)) {
shares.add(share) shares.add(remoteShare)
} }
} }
private fun isValidShare(share: RemoteShare): Boolean { private fun isValidShare(share: RemoteShare): Boolean {
return share.remoteId > -1 return share.id > -1
} }
private fun fixPathForFolder(share: RemoteShare) { private fun fixPathForFolder(share: RemoteShare) {