PR Fixes

Author: Crustack

app/src/main/AndroidManifest.xml

@@ -170,7 +170,7 @@
 
         </receiver>
 
-        <receiver android:name=".presentation.activity.note.reminders.ReminderReceiver" android:enabled="true" android:exported="true" >
+        <receiver android:name=".presentation.activity.note.reminders.ReminderReceiver" android:enabled="true" android:exported="false" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />

app/src/main/java/com/philkes/notallyx/data/imports/evernote/EvernoteImporter.kt

@@ -157,6 +157,7 @@ fun EvernoteNote.mapToBaseNote(): BaseNote {
         audios = audios,
         reminders = mutableListOf(),
         NoteViewMode.EDIT,
+        false,
     )
 }
 

app/src/main/java/com/philkes/notallyx/data/imports/google/GoogleKeepImporter.kt

@@ -164,6 +164,7 @@ class GoogleKeepImporter : ExternalImporter {
             audios = audios,
             reminders = mutableListOf(),
             NoteViewMode.EDIT,
+            false,
         )
     }
 

app/src/main/java/com/philkes/notallyx/data/imports/txt/PlainTextImporter.kt

@@ -88,6 +88,7 @@ class PlainTextImporter : ExternalImporter {
                             audios = listOf(),
                             reminders = listOf(),
                             NoteViewMode.EDIT,
+                            false,
                         )
                     )
                 }

app/src/main/java/com/philkes/notallyx/data/model/BaseNote.kt

@@ -26,7 +26,7 @@ data class BaseNote(
     val audios: List<Audio>,
     val reminders: List<Reminder>,
     val viewMode: NoteViewMode,
-    val isPinnedToStatus: Boolean = false,
+    val isPinnedToStatus: Boolean,
 ) : Item {
 
     companion object {

app/src/main/java/com/philkes/notallyx/data/model/ModelExtensions.kt

@@ -123,6 +123,7 @@ fun String.toBaseNote(): BaseNote {
             ?: COLOR_DEFAULT
     val title = jsonObject.getStringOrDefault("title", "")
     val pinned = jsonObject.getBooleanOrDefault("pinned", false)
+    val pinnedToStatusBar = jsonObject.getBooleanOrDefault("isPinnedToStatus", false)
     val timestamp = jsonObject.getLongOrDefault("timestamp", System.currentTimeMillis())
     val modifiedTimestamp = jsonObject.getLongOrDefault("modifiedTimestamp", timestamp)
     val labels = Converters.jsonToLabels(jsonObject.getArrayOrEmpty("labels"))
@@ -152,6 +153,7 @@ fun String.toBaseNote(): BaseNote {
         audios,
         reminders,
         viewMode,
+        pinnedToStatusBar,
     )
 }
 

app/src/main/java/com/philkes/notallyx/presentation/activity/main/ModelFolderObserver.kt

@@ -233,15 +233,16 @@ class ModelFolderObserver(
         try {
             baseModel.actionMode.loading.value = true
             val folderFrom = baseModel.actionMode.getFirstNote().folder
-            val ids = baseModel.moveBaseNotes(folderTo)
+            val ids =
+                baseModel.moveBaseNotes(folderTo) { baseModel.actionMode.loading.value = false }
             Snackbar.make(
                     activity.findViewById(R.id.DrawerLayout),
                     activity.getQuantityString(folderTo.movedToResId(), ids.size),
                     Snackbar.LENGTH_SHORT,
                 )
                 .apply { setAction(R.string.undo) { baseModel.moveBaseNotes(ids, folderFrom) } }
                 .show()
-        } finally {
+        } catch (_: Exception) {
             baseModel.actionMode.loading.value = false
         }
     }

app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt

@@ -647,15 +647,18 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
         viewModelScope.launch(Dispatchers.IO) { baseNoteDao.updateColor(oldColor, newColor) }
     }
 
-    fun moveBaseNotes(folder: Folder): LongArray {
+    fun moveBaseNotes(folder: Folder, callable: (() -> Unit)? = null): LongArray {
         val ids = actionMode.selectedIds.toLongArray()
         actionMode.close(false)
-        moveBaseNotes(ids, folder)
+        moveBaseNotes(ids, folder, callable)
         return ids
     }
 
-    fun moveBaseNotes(ids: LongArray, folder: Folder) {
-        viewModelScope.launch(Dispatchers.IO) { app.moveBaseNotes(baseNoteDao, ids, folder) }
+    fun moveBaseNotes(ids: LongArray, folder: Folder, callable: (() -> Unit)? = null) {
+        viewModelScope.launch(Dispatchers.IO) {
+            app.moveBaseNotes(baseNoteDao, ids, folder)
+            callable?.invoke()
+        }
     }
 
     fun updateBaseNoteLabels(labels: List<String>, id: Long) {

app/src/main/java/com/philkes/notallyx/utils/AndroidExtensions.kt

@@ -451,7 +451,11 @@ fun Context.getOpenNoteIntent(noteId: Long, noteType: Type): Intent {
         Type.LIST -> Intent(this, EditListActivity::class.java)
     }.apply {
         putExtra(EXTRA_SELECTED_BASE_NOTE, noteId)
-        addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        addFlags(
+            Intent.FLAG_ACTIVITY_NEW_TASK or
+                Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                Intent.FLAG_ACTIVITY_CLEAR_TOP
+        )
     }
 }
 

app/src/main/java/com/philkes/notallyx/utils/backup/ImportExtensions.kt

@@ -320,6 +320,16 @@ private fun Cursor.toBaseNote(sourceDb: SQLiteDatabase): BaseNote {
             else -> throw IllegalArgumentException("pinned must be 0 or 1")
         }
 
+    val isPinnedToStatusColumn = getColumnIndexOrThrow("isPinnedToStatus")
+    val pinnedToStatusBar =
+        if (isPinnedToStatusColumn != -1) {
+            when (getInt(isPinnedToStatusColumn)) {
+                0 -> false
+                1 -> true
+                else -> false
+            }
+        } else false
+
     val type = Type.valueOfOrDefault(typeTmp)
     val folder = Folder.valueOfOrDefault(folderTmp)
 
@@ -374,6 +384,7 @@ private fun Cursor.toBaseNote(sourceDb: SQLiteDatabase): BaseNote {
         audios,
         reminders,
         viewMode,
+        pinnedToStatusBar,
     )
 }