From 0238e51903d94a120ac5d56cf0adf68d0860eec3 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 3 Nov 2015 16:46:44 +0100 Subject: [PATCH] Prevent null values in OCShare members --- .../android/lib/resources/shares/OCShare.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/shares/OCShare.java b/src/com/owncloud/android/lib/resources/shares/OCShare.java index 644955cc..9135978e 100644 --- a/src/com/owncloud/android/lib/resources/shares/OCShare.java +++ b/src/com/owncloud/android/lib/resources/shares/OCShare.java @@ -86,17 +86,17 @@ public class OCShare implements Parcelable, Serializable { mFileSource = 0; mItemSource = 0; mShareType = ShareType.NO_SHARED; - mShareWith = null; - mPath = null; + mShareWith = ""; + mPath = ""; mPermissions = -1; mSharedDate = 0; mExpirationDate = 0; - mToken = null; - mSharedWithDisplayName = null; + mToken = ""; + mSharedWithDisplayName = ""; mIsFolder = false; mUserId = -1; mIdRemoteShared = -1; - mShareLink = null; + mShareLink = ""; } /// Getters and Setters @@ -138,7 +138,7 @@ public class OCShare implements Parcelable, Serializable { } public void setShareWith(String shareWith) { - this.mShareWith = shareWith; + this.mShareWith = (shareWith != null) ? shareWith : ""; } public String getPath() { @@ -146,7 +146,7 @@ public class OCShare implements Parcelable, Serializable { } public void setPath(String path) { - this.mPath = path; + this.mPath = (path != null) ? path : ""; } public int getPermissions() { @@ -178,7 +178,7 @@ public class OCShare implements Parcelable, Serializable { } public void setToken(String token) { - this.mToken = token; + this.mToken = (token != null) ? token : ""; } public String getSharedWithDisplayName() { @@ -186,7 +186,7 @@ public class OCShare implements Parcelable, Serializable { } public void setSharedWithDisplayName(String sharedWithDisplayName) { - this.mSharedWithDisplayName = sharedWithDisplayName; + this.mSharedWithDisplayName = (sharedWithDisplayName != null) ? sharedWithDisplayName : ""; } public boolean isFolder() { @@ -218,7 +218,7 @@ public class OCShare implements Parcelable, Serializable { } public void setShareLink(String shareLink) { - this.mShareLink = shareLink; + this.mShareLink = (shareLink != null) ? shareLink : ""; } /**