Live Photo

app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt

@@ -66,6 +66,16 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             sut.storageManager.saveFile(this)
         }
 
+        OCFile("/live photo.png").apply {
+            mimeType = "image/png"
+            isPreviewAvailable = false
+            fileLength = 3072000
+            modificationTimestamp = 746443755000
+            parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
+            setLivePhoto("/video.mov")
+            sut.storageManager.saveFile(this)
+        }
+
         OCFile("/video.mp4").apply {
             mimeType = "video/mp4"
             isPreviewAvailable = false

app/src/androidTest/java/com/owncloud/android/ui/fragment/UnifiedSearchFragmentIT.kt

@@ -39,7 +39,7 @@ class UnifiedSearchFragmentIT : AbstractIT() {
     @Test
     fun showSearchResult() {
         val activity = testActivityRule.launchActivity(null)
-        val sut = UnifiedSearchFragment.newInstance(null)
+        val sut = UnifiedSearchFragment.newInstance(null, null)
 
         activity.addFragment(sut)
 
@@ -72,7 +72,7 @@ class UnifiedSearchFragmentIT : AbstractIT() {
     @Test
     fun search() {
         val activity = testActivityRule.launchActivity(null) as TestActivity
-        val sut = UnifiedSearchFragment.newInstance(null)
+        val sut = UnifiedSearchFragment.newInstance(null, null)
         val testViewModel = UnifiedSearchViewModel(activity.application)
         testViewModel.setConnectivityService(activity.connectivityServiceMock)
         val localRepository = UnifiedSearchFakeRepository()

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -67,7 +67,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 70, to = 71, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 71, to = 72),
         AutoMigration(from = 72, to = 73),
-        AutoMigration(from = 73, to = 74, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 73, to = 74, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 74, to = 75)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/entity/FileEntity.kt

@@ -78,8 +78,13 @@ data class FileEntity(
     val isDownloading: Int?,
     @ColumnInfo(name = ProviderTableMeta.FILE_FAVORITE)
     val favorite: Int?,
+
+    @ColumnInfo(name = ProviderTableMeta.FILE_HIDDEN)
+    val hidden: Int?,
+
     @ColumnInfo(name = ProviderTableMeta.FILE_IS_ENCRYPTED)
     val isEncrypted: Int?,
+
     @ColumnInfo(name = ProviderTableMeta.FILE_ETAG_IN_CONFLICT)
     val etagInConflict: String?,
     @ColumnInfo(name = ProviderTableMeta.FILE_SHARED_WITH_SHAREE)
@@ -102,6 +107,8 @@ data class FileEntity(
     val richWorkspace: String?,
     @ColumnInfo(name = ProviderTableMeta.FILE_METADATA_SIZE)
     val metadataSize: String?,
+    @ColumnInfo(name = ProviderTableMeta.FILE_METADATA_LIVE_PHOTO)
+    val metadataLivePhoto: String?,
     @ColumnInfo(name = ProviderTableMeta.FILE_LOCKED)
     val locked: Int?,
     @ColumnInfo(name = ProviderTableMeta.FILE_LOCK_TYPE)

app/src/main/java/com/nextcloud/client/media/ExoplayerListener.kt

@@ -32,13 +32,19 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
 
-class ExoplayerListener(private val context: Context, private val playerView: View, private val exoPlayer: ExoPlayer) :
+class ExoplayerListener(
+    private val context: Context,
+    private val playerView: View,
+    private val exoPlayer: ExoPlayer,
+    private val onCompleted: () -> Unit = { }
+) :
     Player.Listener {
 
     override fun onPlaybackStateChanged(playbackState: Int) {
         super.onPlaybackStateChanged(playbackState)
         if (playbackState == Player.STATE_ENDED) {
             onCompletion()
+            onCompleted()
         }
     }
 

app/src/main/java/com/nextcloud/utils/extensions/Extensions.kt

@@ -22,6 +22,7 @@
 
 package com.nextcloud.utils.extensions
 
+import android.os.SystemClock
 import android.text.Selection
 import android.text.Spannable
 import android.text.SpannableString
@@ -35,6 +36,22 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
+fun clickWithDebounce(view: View, debounceTime: Long = 600L, action: () -> Unit) {
+    view.setOnClickListener(object : View.OnClickListener {
+        private var lastClickTime: Long = 0
+
+        override fun onClick(v: View) {
+            if (SystemClock.elapsedRealtime() - lastClickTime < debounceTime) {
+                return
+            } else {
+                action()
+            }
+
+            lastClickTime = SystemClock.elapsedRealtime()
+        }
+    })
+}
+
 fun TextView.makeLinks(vararg links: Pair<String, View.OnClickListener>) {
     val spannableString = SpannableString(this.text)
     var startIndexOfLink = -1

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

@@ -462,6 +462,7 @@ private ContentValues createContentValuesBase(OCFile fileOrFolder) {
         cv.put(ProviderTableMeta.FILE_REMOTE_ID, fileOrFolder.getRemoteId());
         cv.put(ProviderTableMeta.FILE_LOCAL_ID, fileOrFolder.getLocalId());
         cv.put(ProviderTableMeta.FILE_FAVORITE, fileOrFolder.isFavorite());
+        cv.put(ProviderTableMeta.FILE_HIDDEN, fileOrFolder.shouldHide());
         cv.put(ProviderTableMeta.FILE_UNREAD_COMMENTS_COUNT, fileOrFolder.getUnreadCommentsCount());
         cv.put(ProviderTableMeta.FILE_OWNER_ID, fileOrFolder.getOwnerId());
         cv.put(ProviderTableMeta.FILE_OWNER_DISPLAY_NAME, fileOrFolder.getOwnerDisplayName());
@@ -501,6 +502,7 @@ private ContentValues createContentValuesForFile(OCFile file) {
         cv.put(ProviderTableMeta.FILE_LOCKED, file.isLocked());
         final FileLockType lockType = file.getLockType();
         cv.put(ProviderTableMeta.FILE_LOCK_TYPE, lockType != null ? lockType.getValue() : -1);
+        cv.put(ProviderTableMeta.FILE_HIDDEN, file.shouldHide());
         cv.put(ProviderTableMeta.FILE_LOCK_OWNER, file.getLockOwnerId());
         cv.put(ProviderTableMeta.FILE_LOCK_OWNER_DISPLAY_NAME, file.getLockOwnerDisplayName());
         cv.put(ProviderTableMeta.FILE_LOCK_OWNER_EDITOR, file.getLockOwnerEditor());
@@ -510,6 +512,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, file.getLinkedFileIdForLivePhoto());
 
         return cv;
     }
@@ -931,6 +934,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());
@@ -939,6 +943,8 @@ private OCFile createFileInstance(FileEntity fileEntity) {
         ocFile.setLockTimestamp(nullToZero(fileEntity.getLockTimestamp()));
         ocFile.setLockTimeout(nullToZero(fileEntity.getLockTimeout()));
         ocFile.setLockToken(fileEntity.getLockToken());
+        ocFile.setLivePhoto(fileEntity.getMetadataLivePhoto());
+        ocFile.setHidden(nullToZero(fileEntity.getHidden()) == 1);
 
         String sharees = fileEntity.getSharees();
         // Surprisingly JSON deserialization causes significant overhead.
@@ -1752,7 +1758,7 @@ public void saveConflict(OCFile ocFile, String etagInConflict) {
                             ProviderTableMeta.CONTENT_URI_FILE,
                             projection,
                             whereForDescencentsInConflict,
-                            new String[]{user.getAccountName(), parentPath + "%"},
+                            new String[]{user.getAccountName(), parentPath + '%'},
                             null
                         );
                     } else {

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

@@ -52,6 +52,7 @@
 import third_parties.daveKoeller.AlphanumComparator;
 
 public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterface {
+
     private final static String PERMISSION_SHARED_WITH_ME = "S";
     @VisibleForTesting
     public final static String PERMISSION_CAN_RESHARE = "R";
@@ -83,6 +84,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     private long lastSyncDateForProperties;
     private long lastSyncDateForData;
     private boolean previewAvailable;
+    private String livePhoto;
+    public OCFile livePhotoVideo;
     private String etag;
     private String etagOnServer;
     private boolean sharedViaLink;
@@ -94,6 +97,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     private String etagInConflict; // Only saves file etag in the server, when there is a conflict
     private boolean sharedWithSharee;
     private boolean favorite;
+    private boolean hidden;
     private boolean encrypted;
     private WebdavEntry.MountType mountType;
     private int unreadCommentsCount;
@@ -181,6 +185,7 @@ private OCFile(Parcel source) {
         etagInConflict = source.readString();
         sharedWithSharee = source.readInt() == 1;
         favorite = source.readInt() == 1;
+        hidden = source.readInt() == 1;
         encrypted = source.readInt() == 1;
         ownerId = source.readString();
         ownerDisplayName = source.readString();
@@ -196,6 +201,7 @@ private OCFile(Parcel source) {
         lockTimestamp = source.readLong();
         lockTimeout = source.readLong();
         lockToken = source.readString();
+        livePhoto = source.readString();
     }
 
     @Override
@@ -224,6 +230,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(etagInConflict);
         dest.writeInt(sharedWithSharee ? 1 : 0);
         dest.writeInt(favorite ? 1 : 0);
+        dest.writeInt(hidden ? 1 : 0);
         dest.writeInt(encrypted ? 1 : 0);
         dest.writeString(ownerId);
         dest.writeString(ownerDisplayName);
@@ -239,6 +246,15 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(lockTimestamp);
         dest.writeLong(lockTimeout);
         dest.writeString(lockToken);
+        dest.writeString(livePhoto);
+    }
+
+    public String getLinkedFileIdForLivePhoto() {
+        return livePhoto;
+    }
+
+    public void setLivePhoto(String livePhoto) {
+        this.livePhoto = livePhoto;
     }
 
     public void setDecryptedRemotePath(String path) {
@@ -344,11 +360,13 @@ public boolean existsOnDevice() {
         return false;
     }
 
-    public String getFileNameWithExtension(int fileNameLength) {
-        String fileName = getFileName();
-        String shortFileName = fileName.substring(0, Math.min(fileName.length(), fileNameLength));
-        String extension = "." + fileName.substring(fileName.lastIndexOf('.') + 1);
-        return shortFileName + extension;
+    public String getFileNameWithoutExtension(String fileName) {
+        int dotIndex = fileName.lastIndexOf('.');
+        if (dotIndex > 0) {
+            return fileName.substring(0, dotIndex);
+        } else {
+            return fileName;
+        }
     }
 
     /**
@@ -472,12 +490,14 @@ public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changing from " + remotePath);
         if (!TextUtils.isEmpty(name) && !name.contains(PATH_SEPARATOR) && !ROOT_PATH.equals(remotePath)) {
             String parent = new File(this.getRemotePath()).getParent();
-            parent = parent.endsWith(PATH_SEPARATOR) ? parent : parent + PATH_SEPARATOR;
-            remotePath = parent + name;
-            if (isFolder()) {
-                remotePath += PATH_SEPARATOR;
+            if (parent != null) {
+                parent = parent.endsWith(PATH_SEPARATOR) ? parent : parent + PATH_SEPARATOR;
+                remotePath = parent + name;
+                if (isFolder()) {
+                    remotePath += PATH_SEPARATOR;
+                }
+                Log_OC.d(TAG, "OCFile name changed to " + remotePath);
             }
-            Log_OC.d(TAG, "OCFile name changed to " + remotePath);
         }
     }
 
@@ -509,6 +529,7 @@ private void resetData() {
         etagInConflict = null;
         sharedWithSharee = false;
         favorite = false;
+        hidden = false;
         encrypted = false;
         mountType = WebdavEntry.MountType.INTERNAL;
         richWorkspace = "";
@@ -521,7 +542,7 @@ private void resetData() {
         lockTimestamp = 0;
         lockTimeout = 0;
         lockToken = null;
-
+        livePhoto = null;
         imageDimension = null;
     }
 
@@ -532,7 +553,11 @@ private void resetData() {
      */
     public String getParentRemotePath() {
         String parentPath = new File(this.getRemotePath()).getParent();
-        return parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
+        if (parentPath != null) {
+            return parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
+        } else {
+            return null;
+        }
     }
 
     @Override
@@ -776,6 +801,10 @@ public boolean isFavorite() {
         return this.favorite;
     }
 
+    public boolean shouldHide() {
+        return this.hidden;
+    }
+
     public boolean isEncrypted() {
         return this.encrypted;
     }
@@ -888,6 +917,10 @@ public void setFavorite(boolean favorite) {
         this.favorite = favorite;
     }
 
+    public void setHidden(boolean hidden) {
+        this.hidden = hidden;
+    }
+
     public void setEncrypted(boolean encrypted) {
         this.encrypted = encrypted;
     }

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

@@ -201,7 +201,7 @@ private int updateUploadInternal(Cursor c, UploadStatus status, UploadResult res
                     TAG,
                     "Updating " + path + " with status:" + status + " and result:"
                             + (result == null ? "null" : result.toString()) + " (old:"
-                            + upload.toFormattedString() + ")");
+                            + upload.toFormattedString() + ')');
 
             upload.setUploadStatus(status);
             upload.setLastResult(result);

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 = 74;
+    public static final int DB_VERSION = 75;
 
     private ProviderMeta() {
         // No instance
@@ -107,6 +107,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String FILE_IS_DOWNLOADING = "is_downloading";
         public static final String FILE_ETAG_IN_CONFLICT = "etag_in_conflict";
         public static final String FILE_FAVORITE = "favorite";
+        public static final String FILE_HIDDEN = "hidden";
         public static final String FILE_IS_ENCRYPTED = "is_encrypted";
         public static final String FILE_MOUNT_TYPE = "mount_type";
         public static final String FILE_HAS_PREVIEW = "has_preview";
@@ -118,6 +119,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String FILE_RICH_WORKSPACE = "rich_workspace";
         public static final String FILE_METADATA_SIZE = "metadata_size";
         public static final String FILE_METADATA_GPS = "metadata_gps";
+        public static final String FILE_METADATA_LIVE_PHOTO = "metadata_live_photo";
         public static final String FILE_LOCKED = "locked";
         public static final String FILE_LOCK_TYPE = "lock_type";
         public static final String FILE_LOCK_OWNER = "lock_owner";
@@ -156,6 +158,7 @@ static public class ProviderTableMeta implements BaseColumns {
                 FILE_IS_DOWNLOADING,
                 FILE_ETAG_IN_CONFLICT,
                 FILE_FAVORITE,
+                FILE_HIDDEN,
                 FILE_IS_ENCRYPTED,
                 FILE_MOUNT_TYPE,
                 FILE_HAS_PREVIEW,
@@ -174,6 +177,7 @@ static public class ProviderTableMeta implements BaseColumns {
                 FILE_LOCK_TIMEOUT,
                 FILE_LOCK_TOKEN,
                 FILE_METADATA_SIZE,
+                FILE_METADATA_LIVE_PHOTO,
                 FILE_TAGS,
                 FILE_METADATA_GPS));
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME + " collate nocase asc";

app/src/main/java/com/owncloud/android/media/MediaControlView.java

@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -140,7 +141,7 @@ private void disableUnsupportedButtons() {
         }
     }
 
-    private final Handler handler = new Handler() {
+    private final Handler handler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             if (msg.what == SHOW_PROGRESS) {