Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_f...

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / OCFile.java

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index ae2376d..92168ff 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -66,6 +66,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private String mPublicLink;
 
     private String mPermissions;
     private String mPublicLink;
 
     private String mPermissions;

+    private String mRemoteId;

 
 
     /**
 
 
     /**


@@ -107,6 +108,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mShareByLink = source.readInt() == 1;
         mPublicLink = source.readString();
         mPermissions = source.readString();
         mShareByLink = source.readInt() == 1;
         mPublicLink = source.readString();
         mPermissions = source.readString();

+        mRemoteId = source.readString();

     }
 
     @Override
     }
 
     @Override


@@ -128,6 +130,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         dest.writeInt(mShareByLink ? 1 : 0);
         dest.writeString(mPublicLink);
         dest.writeString(mPermissions);
         dest.writeInt(mShareByLink ? 1 : 0);
         dest.writeString(mPublicLink);
         dest.writeString(mPermissions);

+        dest.writeString(mRemoteId);

     }
     
     /**
     }
     
     /**


@@ -339,6 +342,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mShareByLink = false;
         mPublicLink = null;
         mPermissions = null;
         mShareByLink = false;
         mPublicLink = null;
         mPermissions = null;

+        mRemoteId = null;

     }
 
     /**
     }
 
     /**


@@ -531,4 +535,12 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         this.mPermissions = permissions;
     }
 
         this.mPermissions = permissions;
     }
 

+    public String getRemoteId() {
+        return mRemoteId;
+    }
+
+    public void setRemoteId(String remoteId) {
+        this.mRemoteId = remoteId;
+    }
+

 }
 }