diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock
index 34f30cfb..1f90a939 100644
Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.idea/Notes-master1.iml b/src/Notes-master1/.idea/Notes-master1.iml
index a6000a56..8a269ae3 100644
--- a/src/Notes-master1/.idea/Notes-master1.iml
+++ b/src/Notes-master1/.idea/Notes-master1.iml
@@ -1,12 +1,2 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
new file mode 100644
index 00000000..c58e1462
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
@@ -0,0 +1,77 @@
+
+U
+java:S1118&":Add a private constructor to hide the implicit public one.(
+Z
+java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩
+[
+java:S2147m"ECombine this catch with the one at line 107, which has the same body.(暩
+k
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+f
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+t
+java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
+t
+java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
+u
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª
+b
+java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.(
+c
+java:S1192y"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(
+J
+java:S1066"/Merge this if statement with the enclosing one.(䲜
+v
+java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+{
+java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+
+java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+T
+java:S1155-">Use isEmpty() to check whether the collection is empty or not.(
+S
+java:S2589f"8Remove this expression which always evaluates to "false"(Ύ
+S
+java:S2589>"8Remove this expression which always evaluates to "false"(Ύ
+U
+java:S1118&":Add a private constructor to hide the implicit public one.(
+Z
+java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩
+[
+java:S2147m"ECombine this catch with the one at line 107, which has the same body.(暩
+k
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+f
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+t
+java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
+t
+java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
+u
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª
+b
+java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.(
+c
+java:S1192y"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(
+J
+java:S1066"/Merge this if statement with the enclosing one.(䲜
+v
+java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+{
+java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+
+java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+T
+java:S1155-">Use isEmpty() to check whether the collection is empty or not.(
+S
+java:S2589f"8Remove this expression which always evaluates to "false"(Ύ
+S
+java:S2589>"8Remove this expression which always evaluates to "false"(Ύ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
new file mode 100644
index 00000000..add6a432
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
@@ -0,0 +1,23 @@
+
+m
+java:S37766"RRefactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.(
+O
+java:S1874B"9Remove this use of "setTextAppearance"; it is deprecated.(
+O
+java:S1874I"9Remove this use of "setTextAppearance"; it is deprecated.(
+O
+java:S1874S"9Remove this use of "setTextAppearance"; it is deprecated.(
+f java:S117f"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+f java:S117k"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔
+f java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ
+m
+java:S37766"RRefactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.(
+O
+java:S1874B"9Remove this use of "setTextAppearance"; it is deprecated.(
+O
+java:S1874I"9Remove this use of "setTextAppearance"; it is deprecated.(
+O
+java:S1874S"9Remove this use of "setTextAppearance"; it is deprecated.(
+f java:S117f"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+f java:S117k"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔
+f java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd b/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd
new file mode 100644
index 00000000..02404075
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd
@@ -0,0 +1,21 @@
+
+3
+java:S2386A"Make this member "protected".(
+8
+java:S2386K"Make this member "protected".(㳎
+X
+java:S1126"AReplace this if-then-else statement by a single return statement.(
+?
+java:S1125"(Remove the unnecessary boolean literals.(
+F
+java:S1066"/Merge this if statement with the enclosing one.(
+3
+java:S2386A"Make this member "protected".(
+8
+java:S2386K"Make this member "protected".(㳎
+X
+java:S1126"AReplace this if-then-else statement by a single return statement.(
+?
+java:S1125"(Remove the unnecessary boolean literals.(
+F
+java:S1066"/Merge this if statement with the enclosing one.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
new file mode 100644
index 00000000..26116a43
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
@@ -0,0 +1,101 @@
+
+i
+java:S3008^"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+7
+java:S1116d"Remove this empty statement.(
+a
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
+[
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
+n
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(
+2
+java:S3626"Remove this redundant jump.(݅
+2
+java:S3626"Remove this redundant jump.(݅
+2
+java:S3626"Remove this redundant jump.(݅
+P
+java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(
+Z
+java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(
+N
+java:S1135"2Complete the task associated to this TODO comment.(̐
+F
+java:S2093"*Change this "try" to a try-with-resources.(
+o
+java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(
+n
+java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(
+N
+java:S1135"2Complete the task associated to this TODO comment.(
+N
+java:S1135"2Complete the task associated to this TODO comment.(
+\
+java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ8/
+M
+java:S1874"1Remove this use of "getHeight"; it is deprecated.(
+8
+java:S1116"Remove this empty statement.(
+i
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.(
+F
+java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(?
+? java:S108")Either remove or fill this block of code.(ʥ
+a
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ
+K
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
+h
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(#
+N
+java:S1135"2Complete the task associated to this TODO comment.(
+^
+java:S1126"BReplace this if-then-else statement by a single method invocation.(玒
+N
+java:S1135"2Complete the task associated to this TODO comment.(
+M
+java:S2696"6Make the enclosing method "static" or remove this set.(
+M
+java:S2696"6Make the enclosing method "static" or remove this set.(
+M
+java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч
+f
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች
+K
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
+h
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b
+<
+java:S3398"%Move this method into "ModeCallback".(
+A
+java:S3398"%Move this method into "ModeCallback".(
+K
+java:S3398"/Move this method into "BackgroundQueryHandler".(
+G
+java:S3398"0Move this method into "OnListItemClickListener".(
+p
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥
+b
+java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.(
+]
+java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.(
+g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+>
+java:S1604"(Make this anonymous inner class a lambda(̺V
+?
+java:S1604"(Make this anonymous inner class a lambda(ά
+?
+java:S1604"(Make this anonymous inner class a lambda(ܴ
+D
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(۱
+?
+java:S1604"(Make this anonymous inner class a lambda(ά
+g
+java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
+a
+java:S2583"CChange this condition so that it does not always evaluate to "true"(8/
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff
new file mode 100644
index 00000000..d2e7ba01
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff
@@ -0,0 +1,21 @@
+
+s
+java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.(
+>
+java:S1125T"(Remove the unnecessary boolean literals.(
+m
+java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(
+C
+java:S1125q"(Remove the unnecessary boolean literals.(
+>
+java:S1125r"(Remove the unnecessary boolean literals.(
+s
+java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.(
+>
+java:S1125T"(Remove the unnecessary boolean literals.(
+m
+java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(
+C
+java:S1125q"(Remove the unnecessary boolean literals.(
+>
+java:S1125r"(Remove the unnecessary boolean literals.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index bdae16ff..c00ecfa3 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -75,8 +75,6 @@ b
2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
k
;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
f
6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
g
@@ -88,4 +86,16 @@ i
l
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -723,7 +100,7 @@
-
+
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index b42d3161..3785aeee 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -420,7 +420,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
};
private void startAsyncNotesListQuery() {
- if (mOrderBy == 1){
+ if (mOrderBy == 1 && mCurrentFolderId != Notes.ID_TRASH_FOLER){
orderByTime();
}
else{