Merge pull request #142 from HelloVolla/dev

Fix for sorting thread collection
HelloVolla · May 10, 2023 · 4edf29f · 4edf29f
2 parents 7603fee + c6cc669
commit 4edf29f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/Collections.qml b/Collections.qml
@@ -115,6 +115,19 @@ Page {
         }
     }
 
+    function sortListModel() {
+        var n;
+        var i;
+        for (n = 0; n < currentCollectionModel.count; n++) {
+            for (i=n+1; i < currentCollectionModel.count; i++) {
+                if (currentCollectionModel.get(n).c_TSTAMP < currentCollectionModel.get(i).c_TSTAMP) {
+                    currentCollectionModel.move(i, n, 1);
+                    n = 0;
+                }
+            }
+        }
+    }
+
     function loadThreads(filter) {
         console.log("Collections | Will load threads")
         collectionPage.threads = new Array
@@ -909,6 +922,7 @@ Page {
                 }
 
                 cThread.c_STEXT = mainView.parseTime(Number(thread["date"])) + " • " + qsTr(kind)
+                cThread.c_TSTAMP = Number(thread["date"])
 
                 modelArr.push(cThread)
             })
@@ -967,6 +981,8 @@ Page {
                     append(filteredModelDict[modelItemName])
                 }
             }
+
+            collectionPage.sortListModel()
         }
 
         function executeSelection(item, type) {
@@ -1396,9 +1412,9 @@ Page {
                         || currentCollectionMode === mainView.collectionMode.Threads) {
                     message["messages"].forEach(function (aThread, index) {
                         aThread["isSignal"] = true
-                        for (const [aThreadKey, aThreadValue] of Object.entries(aThread)) {
-                            console.log("Collections | * " + aThreadKey + ": " + aThreadValue)
-                        }
+//                        for (const [aThreadKey, aThreadValue] of Object.entries(aThread)) {
+//                            console.log("Collections | * " + aThreadKey + ": " + aThreadValue)
+//                        }
                     })
                     collectionPage.threads = collectionPage.threads.concat(message["messages"])
                     collectionPage.updateListModel()

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.3" android:versionCode="272" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.4" android:versionCode="273" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.