Live Photo

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -37,6 +37,7 @@
 import android.os.RemoteException;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -510,7 +511,7 @@ private ContentValues createContentValuesForFile(OCFile file) {
         cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp());
         cv.put(ProviderTableMeta.FILE_METADATA_SIZE, gson.toJson(file.getImageDimension()));
         cv.put(ProviderTableMeta.FILE_METADATA_GPS, gson.toJson(file.getGeoLocation()));
-        cv.put(ProviderTableMeta.FILE_METADATA_LIVE_PHOTO, gson.toJson(file.isLivePhoto()));
+        cv.put(ProviderTableMeta.FILE_METADATA_LIVE_PHOTO, gson.toJson(file.getLivePhoto()));
 
         return cv;
     }
@@ -932,6 +933,7 @@ private OCFile createFileInstance(FileEntity fileEntity) {
         ocFile.setNote(fileEntity.getNote());
         ocFile.setRichWorkspace(fileEntity.getRichWorkspace());
         ocFile.setLocked(nullToZero(fileEntity.getLocked()) == 1);
+
         final int lockTypeInt = nullToZero(fileEntity.getLockType()); // TODO - what value should be used for NULL???
         ocFile.setLockType(lockTypeInt != -1 ? FileLockType.fromValue(lockTypeInt) : null);
         ocFile.setLockOwnerId(fileEntity.getLockOwner());
@@ -940,7 +942,7 @@ private OCFile createFileInstance(FileEntity fileEntity) {
         ocFile.setLockTimestamp(nullToZero(fileEntity.getLockTimestamp()));
         ocFile.setLockTimeout(nullToZero(fileEntity.getLockTimeout()));
         ocFile.setLockToken(fileEntity.getLockToken());
-        ocFile.setLivePhotoAvailable(fileEntity.getMetadataLivePhoto() == "TODO");
+        ocFile.setLivePhoto(fileEntity.getMetadataLivePhoto());
 
         String sharees = fileEntity.getSharees();
         // Surprisingly JSON deserialization causes significant overhead.

app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -28,6 +28,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.WebdavEntry;
@@ -83,7 +84,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     private long lastSyncDateForProperties;
     private long lastSyncDateForData;
     private boolean previewAvailable;
-    private boolean livePhotoAvailable;
+    private String livePhoto;
     private String etag;
     private String etagOnServer;
     private boolean sharedViaLink;
@@ -197,6 +198,7 @@ private OCFile(Parcel source) {
         lockTimestamp = source.readLong();
         lockTimeout = source.readLong();
         lockToken = source.readString();
+        livePhoto = source.readString();
     }
 
     @Override
@@ -240,11 +242,11 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(lockTimestamp);
         dest.writeLong(lockTimeout);
         dest.writeString(lockToken);
-        // TODO add live photo availability
+        dest.writeString(livePhoto);
     }
 
-    public Boolean isLivePhoto() {
-        return livePhotoAvailable;
+    public String getLivePhoto() {
+        return livePhoto;
     }
 
     public void setDecryptedRemotePath(String path) {
@@ -527,7 +529,7 @@ private void resetData() {
         lockTimestamp = 0;
         lockTimeout = 0;
         lockToken = null;
-
+        livePhoto = null;
         imageDimension = null;
     }
 
@@ -918,8 +920,8 @@ public void setNote(String note) {
         this.note = note;
     }
 
-    public void setLivePhotoAvailable(Boolean livePhotoAvailable) {
-        this.livePhotoAvailable = livePhotoAvailable;
+    public void setLivePhoto(String livePhoto) {
+        this.livePhoto = livePhoto;
     }
 
     public void setSharees(List<ShareeUser> sharees) {

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -35,7 +35,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 73;
+    public static final int DB_VERSION = 75;
 
     private ProviderMeta() {
         // No instance

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -389,11 +389,12 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
     }
 
     private void checkLivePhotoAvailability(ListGridImageViewHolder holder, OCFile file) {
-        holder.getLivePhotoIndicator().setVisibility((file.isLivePhoto()) ? (View.VISIBLE) : (View.GONE));
+        boolean isLivePhoto = file.getLivePhoto() != null;
+        holder.getLivePhotoIndicator().setVisibility(isLivePhoto ? (View.VISIBLE) : (View.GONE));
 
         // FIXME Interface segregation principle violation
         // Not needed for Grid mode unfortunately ListGridImageViewHolder interface used for List and Grid mode
-        holder.getLivePhotoIndicatorSeparator().setVisibility((file.isLivePhoto()) ? (View.VISIBLE) : (View.GONE));
+        holder.getLivePhotoIndicatorSeparator().setVisibility(isLivePhoto ? (View.VISIBLE) : (View.GONE));
     }
 
     private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -198,7 +198,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         binding.image.setOnClickListener(v -> togglePreviewImageFullScreen());
 
-        if (getFile().isLivePhoto()) {
+        if (getFile().getLivePhoto() != null) {
             binding.image.setOnLongClickListener(v -> {
                 playLivePhoto();
                 return true;

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        androidPluginVersion = '8.1.1'
+        androidPluginVersion = '8.1.2'
         appCompatVersion = '1.6.1'
         jacoco_version = '0.8.10'
         kotlin_version = '1.8.22'