Merge branch 'develop'

Author: hej2010

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "se.arctosoft.vault"
         minSdk 28
         targetSdk 32
-        versionCode 5
-        versionName "1.2.1"
+        versionCode 6
+        versionName "1.2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/se/arctosoft/vault/data/CursorFile.java

@@ -14,10 +14,10 @@ public class CursorFile implements Comparable<CursorFile> {
     public CursorFile(String name, Uri uri, long lastModified, String mimeType, long size) {
         this.name = name;
         this.uri = uri;
-        this.lastModified = lastModified;
         this.mimeType = mimeType;
         this.size = size;
         this.isDirectory = DocumentsContract.Document.MIME_TYPE_DIR.equals(mimeType);
+        this.lastModified = isDirectory ? System.currentTimeMillis() : lastModified;
     }
 
     public void setUnencryptedName(String unencryptedName) {
@@ -54,9 +54,6 @@ public String getMimeType() {
 
     @Override
     public int compareTo(CursorFile o) {
-        if (o.isDirectory) {
-            return 1;
-        }
         return Long.compare(o.lastModified, this.lastModified);
     }
 }